SQLite
Check-in [2648966f]
Not logged in
Overview
SHA1 Hash:2648966f17bc1b783ef6d3b2368c613f6e02945e
Date: 2013-04-26 14:04:28
User: dan
Comment:Merge another trunk change.
Tags And Properties
Context
2013-04-26
14:13
[49d23ef6] Rebalance FTS expressions after parsing to limit recursion during evaluation. Avoid recursion when deleting FTS expression trees. Enforce a limit (currently 12) on the depth of an expression tree. (user: dan, tags: trunk)
14:04
[2648966f] Closed-Leaf: Merge another trunk change. (user: dan, tags: fts3-expr-rebalance)
13:14
[3c78af8c] Fix harmless compiler warnings in the FTS expression parser. (user: drh, tags: fts3-expr-rebalance)
12:08
[460752b8] Reduce the default SQLITE_MAX_MMAP_SIZE slightly so that it fits in a signed 32-bit integer. (user: drh, tags: trunk)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/sqliteInt.h.

559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
# endif
#endif
#ifndef SQLITE_MAX_MMAP_SIZE
# if defined(__linux__) \
  || defined(_WIN32) \
  || (defined(__APPLE__) && defined(__MACH__)) \
  || defined(__sun)
#   define SQLITE_MAX_MMAP_SIZE 2147483648
# else
#   define SQLITE_MAX_MMAP_SIZE 0
# endif
# define SQLITE_MAX_MMAP_SIZE_xc 1 /* exclude from ctime.c */
#endif

/*







|







559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
# endif
#endif
#ifndef SQLITE_MAX_MMAP_SIZE
# if defined(__linux__) \
  || defined(_WIN32) \
  || (defined(__APPLE__) && defined(__MACH__)) \
  || defined(__sun)
#   define SQLITE_MAX_MMAP_SIZE 0x7fff0000  /* 2147418112 */
# else
#   define SQLITE_MAX_MMAP_SIZE 0
# endif
# define SQLITE_MAX_MMAP_SIZE_xc 1 /* exclude from ctime.c */
#endif

/*