Merge changes for version 3.10.0.

FossilOrigin-Name: fa4705c91f9650ecd7ec967dbbf0028aabd8a98c
This commit is contained in:
drh
2016-01-06 15:14:53 +00:00
8 changed files with 46 additions and 45 deletions
+1 -1
View File
@@ -468,7 +468,7 @@ TESTOPTS = --verbose=file --output=test-out.txt
#
SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1
FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.