/ Check-in [2648966f]
Login
Overview
Comment:Merge another trunk change.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | fts3-expr-rebalance
Files: files | file ages | folders
SHA1:2648966f17bc1b783ef6d3b2368c613f6e02945e
User & Date: dan 2013-04-26 14:04:28
Context
2013-04-26
14:13
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. check-in: 49d23ef6 user: dan tags: trunk
14:04
Merge another trunk change. Closed-Leaf check-in: 2648966f user: dan tags: fts3-expr-rebalance
13:14
Fix harmless compiler warnings in the FTS expression parser. check-in: 3c78af8c user: drh tags: fts3-expr-rebalance
12:08
Reduce the default SQLITE_MAX_MMAP_SIZE slightly so that it fits in a signed 32-bit integer. check-in: 460752b8 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

/*