Fix the build for compilation using separate files rather than the amalgamation.

FossilOrigin-Name: 1e0f4869dedabec03b6eafeffa5ed3e43b70f2ca5b27816bb8a56dba7b5fd94f
Make the sha3 extension part of the amalgamation, enabled using
2019-08-12 15:37:28 +00:00 · 2019-08-12 15:19:24 +00:00
341 changed files with 5563 additions and 23714 deletions
@@ -186,12 +186,11 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
         notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
         pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
         random.lo resolve.lo rowset.lo rtree.lo \
-         sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
+         sqlite3session.lo select.lo shathree.lo sqlite3rbu.lo status.lo stmt.lo \
         table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
         update.lo userauth.lo upsert.lo util.lo vacuum.lo \
         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
-         vdbetrace.lo vdbevtab.lo \
-         wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
+         vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
         window.lo utf.lo vtab.lo

 # Object files for the amalgamation.
@@ -297,7 +296,6 @@ SRC = \
  $(TOP)/src/vdbemem.c \
  $(TOP)/src/vdbesort.c \
  $(TOP)/src/vdbetrace.c \
-  $(TOP)/src/vdbevtab.c \
  $(TOP)/src/vdbeInt.h \
  $(TOP)/src/vtab.c \
  $(TOP)/src/vxworks.h \
@@ -366,6 +364,7 @@ SRC += \
  $(TOP)/ext/rbu/sqlite3rbu.c
 SRC += \
  $(TOP)/ext/misc/json1.c \
+  $(TOP)/ext/misc/shathree.c \
  $(TOP)/ext/misc/stmt.c

 # Generated source code files
@@ -504,7 +503,6 @@ TESTSRC2 = \
  $(TOP)/src/vdbe.c \
  $(TOP)/src/vdbemem.c \
  $(TOP)/src/vdbetrace.c \
-  $(TOP)/src/vdbevtab.c \
  $(TOP)/src/where.c \
  $(TOP)/src/wherecode.c \
  $(TOP)/src/whereexpr.c \
@@ -603,6 +601,7 @@ TESTOPTS = --verbose=file --output=test-out.txt
 # Extra compiler options for various shell tools
 #
 SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
+SHELL_OPT += -DSQLITE_ENABLE_SHA3
 #SHELL_OPT += -DSQLITE_ENABLE_FTS5
 SHELL_OPT += -DSQLITE_ENABLE_RTREE
 SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
@@ -610,11 +609,12 @@ SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
 SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
 SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
-SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
 SHELL_OPT += -DSQLITE_ENABLE_DESERIALIZE
-FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
+SHELL_OPT += -DSQLITE_INTROSPECTION_PRAGMAS
+FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_SHA3
 FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
+FUZZCHECK_OPT += -DSQLITE_ENABLE_SHA3
 FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
 FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
 FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
@@ -623,7 +623,6 @@ FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
 FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
 FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
 FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
-FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 FUZZCHECK_SRC = $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c
 DBFUZZ_OPT =

@@ -693,7 +692,6 @@ DBFUZZ2_OPTS = \
  -DSQLITE_ENABLE_DESERIALIZE \
  -DSQLITE_DEBUG \
  -DSQLITE_ENABLE_DBSTAT_VTAB \
-  -DSQLITE_ENABLE_BYTECODE_VTAB \
  -DSQLITE_ENABLE_RTREE \
  -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS5
@@ -1010,9 +1008,6 @@ vdbesort.lo:	$(TOP)/src/vdbesort.c $(HDR)
 vdbetrace.lo:	$(TOP)/src/vdbetrace.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbetrace.c

-vdbevtab.lo:	$(TOP)/src/vdbevtab.c $(HDR)
-	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vdbevtab.c
-
 vtab.lo:	$(TOP)/src/vtab.c $(HDR)
 	$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/vtab.c

@@ -1061,7 +1056,7 @@ parse.h:	parse.c

 parse.c:	$(TOP)/src/parse.y lemon$(BEXE)
 	cp $(TOP)/src/parse.y .
-	./lemon$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y
+	./lemon$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) parse.y

 sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid$(BEXE) $(TOP)/VERSION
 	$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
@@ -1078,7 +1073,6 @@ SHELL_SRC = \
 	$(TOP)/ext/misc/fileio.c \
 	$(TOP)/ext/misc/completion.c \
 	$(TOP)/ext/misc/sqlar.c \
-        $(TOP)/ext/misc/uint.c \
 	$(TOP)/ext/expert/sqlite3expert.c \
 	$(TOP)/ext/expert/sqlite3expert.h \
 	$(TOP)/ext/misc/zipfile.c \
@@ -1165,6 +1159,9 @@ sqlite3session.lo:	$(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
 json1.lo:	$(TOP)/ext/misc/json1.c
 	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c

+shathree.lo:	$(TOP)/ext/misc/shathree.c
+	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/shathree.c
+
 stmt.lo:	$(TOP)/ext/misc/stmt.c
 	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/stmt.c

@@ -1187,10 +1184,10 @@ FTS5_SRC = \
   $(TOP)/ext/fts5/fts5_varint.c \
   $(TOP)/ext/fts5/fts5_vocab.c  \

-fts5parse.c:	$(TOP)/ext/fts5/fts5parse.y lemon$(BEXE)
+fts5parse.c:	$(TOP)/ext/fts5/fts5parse.y lemon
 	cp $(TOP)/ext/fts5/fts5parse.y .
 	rm -f fts5parse.h
-	./lemon$(BEXE) $(OPTS) -S fts5parse.y
+	./lemon$(BEXE) $(OPTS) fts5parse.y

 fts5parse.h: fts5parse.c

@@ -1220,7 +1217,6 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
 TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
-TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE

 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
@@ -1253,6 +1249,10 @@ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuz
 	./fuzzcheck$(TEXE) $(FUZZDATA)
 	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db

+fastfuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
+	./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
+	./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
+
 valgrindfuzz:	fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuzz-data1.db
 	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
 	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db
@@ -1270,7 +1270,7 @@ quicktest:	./testfixture$(TEXE)
 # This is the common case.  Run many tests that do not take too long,
 # including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
 #
-test:	fuzztest sourcetest $(TESTPROGS) tcltest
+test:	fastfuzztest sourcetest $(TESTPROGS) tcltest

 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.
@@ -19,7 +19,7 @@ TOP = ../sqlite
 #### C Compiler and options for use in building executables that
 #    will run on the platform that is doing the build.
 #
-BCC = gcc -g -O0
+BCC = gcc -g -O2
 #BCC = /opt/ancic/bin/c89 -0

 #### If the target operating system supports the "usleep()" system
@@ -38,8 +38,8 @@ THREADSAFE = -DTHREADSAFE=0
 #### Specify any extra linker options needed to make the library
 #    thread safe
 #
-THREADLIB = -lpthread -lm -ldl
-#THREADLIB = 
+#THREADLIB = -lpthread
+THREADLIB = 

 #### Specify any extra libraries needed to access required functions.
 #
@@ -54,9 +54,11 @@ TLIBS =
 #    You can make the library go almost twice as fast if you compile
 #    with -DNDEBUG=1
 #
-OPTS += -DSQLITE_DEBUG=1
-OPTS += -DSQLITE_ENABLE_WHERETRACE
-OPTS += -DSQLITE_ENABLE_SELECTTRACE
+#OPTS = -DSQLITE_DEBUG=2
+#OPTS = -DSQLITE_DEBUG=1
+#OPTS = 
+OPTS = -DNDEBUG=1
+OPTS += -DHAVE_FDATASYNC=1

 #### The suffix to add to executable files.  ".exe" for windows.
 #    Nothing for unix.
@@ -68,7 +70,7 @@ EXE =
 #    will run on the target platform.  This is usually the same
 #    as BCC, unless you are cross-compiling.
 #
-TCC = gcc -O0
+TCC = gcc -O6
 #TCC = gcc -g -O0 -Wall
 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
 #TCC = /opt/mingw/bin/i386-mingw32-gcc -O6
@@ -89,12 +91,18 @@ SHPREFIX = lib

 #### Extra compiler options needed for programs that use the TCL library.
 #
-TCL_FLAGS = -I/home/drh/tcl/include/tcl8.6
+#TCL_FLAGS =
+#TCL_FLAGS = -DSTATIC_BUILD=1
+TCL_FLAGS = -I/home/drh/tcltk/8.5linux
+#TCL_FLAGS = -I/home/drh/tcltk/8.5win -DSTATIC_BUILD=1
+#TCL_FLAGS = -I/home/drh/tcltk/8.3hpux

 #### Linker options needed to link against the TCL library.
 #
 #LIBTCL = -ltcl -lm -ldl
-LIBTCL = /home/drh/tcl/lib/libtcl8.6.a -lm -lpthread -ldl -lz
+LIBTCL = /home/drh/tcltk/8.5linux/libtcl8.5g.a -lm -ldl
+#LIBTCL = /home/drh/tcltk/8.5win/libtcl85s.a -lmsvcrt
+#LIBTCL = /home/drh/tcltk/8.3hpux/libtcl8.3.a -ldld -lm -lc

 #### Additional objects for SQLite library when TCL support is enabled.
 #TCLOBJ =
@@ -248,12 +248,6 @@ OPTIMIZATIONS = 2
 SESSION = 0
 !ENDIF

-# Set this to non-0 to enable support for the rbu extension.
-#
-!IFNDEF RBU
-RBU = 0
-!ENDIF
-
 # Set the source code file to be used by executables and libraries when
 # they need the amalgamation.
 #
@@ -354,10 +348,11 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
+OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SHA3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
+OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
 !ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -371,13 +366,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
 !ENDIF

-# Should the rbu extension be enabled?  If so, add compilation options
-# to enable it.
-#
-!IF $(RBU)!=0
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RBU=1
-!ENDIF
-
 # These are the "extended" SQLite compilation options used when compiling for
 # the Windows 10 platform.
 #
@@ -1243,7 +1231,7 @@ LIBOBJS0 = vdbe.lo parse.lo alter.lo analyze.lo attach.lo auth.lo \
         notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
         pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
         random.lo resolve.lo rowset.lo rtree.lo \
-         sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
+         sqlite3session.lo select.lo shathree.lo sqlite3rbu.lo status.lo stmt.lo \
         table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
         update.lo upsert.lo util.lo vacuum.lo \
         vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
@@ -1354,7 +1342,6 @@ SRC01 = \
  $(TOP)\src\vdbemem.c \
  $(TOP)\src\vdbesort.c \
  $(TOP)\src\vdbetrace.c \
-  $(TOP)\src\vdbevtab.c \
  $(TOP)\src\vtab.c \
  $(TOP)\src\wal.c \
  $(TOP)\src\walker.c \
@@ -1433,6 +1420,7 @@ SRC07 = \
  $(TOP)\ext\session\sqlite3session.c \
  $(TOP)\ext\rbu\sqlite3rbu.c \
  $(TOP)\ext\misc\json1.c \
+  $(TOP)\ext\misc\shathree.c \
  $(TOP)\ext\misc\stmt.c

 # Extension header files, part 1.
@@ -1679,14 +1667,14 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
 # Extra compiler options for various test tools.
 #
 MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
-FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
+FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_SHA3
 FUZZCHECK_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ -DSQLITE_MAX_MEMORY=50000000 -DSQLITE_PRINTF_PRECISION_LIMIT=1000
+FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_SHA3
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DESERIALIZE
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DBSTAT_VTAB
-FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_BYTECODE_VTAB

 FUZZCHECK_SRC = $(TOP)\test\fuzzcheck.c $(TOP)\test\ossfuzz.c
 OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
@@ -1758,7 +1746,7 @@ $(SQLITE3DLL):	$(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
 sqlite3.def:	libsqlite3.lib
 	echo EXPORTS > sqlite3.def
 	dumpbin /all libsqlite3.lib \
-		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3(?:session|changeset|changegroup|rebaser|rbu)?_[^@]*)(?:@\d+)?$$" \1 \
+		| $(TCLSH_CMD) $(TOP)\tool\replace.tcl include "^\s+1 _?(sqlite3(?:session|changeset|changegroup|rebaser)?_[^@]*)(?:@\d+)?$$" \1 \
 		| sort >> sqlite3.def
 # <</block2>>

@@ -2112,9 +2100,6 @@ vdbesort.lo:	$(TOP)\src\vdbesort.c $(HDR)
 vdbetrace.lo:	$(TOP)\src\vdbetrace.c $(HDR)
 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbetrace.c

-vdbevtab.lo:	$(TOP)\src\vdbevtab.c $(HDR)
-	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vdbevtab.c
-
 vtab.lo:	$(TOP)\src\vtab.c $(HDR)
 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) -c $(TOP)\src\vtab.c

@@ -2160,7 +2145,7 @@ parse.h:	parse.c
 parse.c:	$(TOP)\src\parse.y lemon.exe
 	del /Q parse.y parse.h parse.h.temp 2>NUL
 	copy $(TOP)\src\parse.y .
-	.\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S parse.y
+	.\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) parse.y

 $(SQLITE3H):	$(TOP)\src\sqlite.h.in $(TOP)\manifest mksourceid.exe $(TOP)\VERSION
 	$(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP:\=/) > $(SQLITE3H) $(MKSQLITE3H_ARGS)
@@ -2188,7 +2173,6 @@ SHELL_SRC = \
 	$(TOP)\ext\misc\shathree.c \
 	$(TOP)\ext\misc\fileio.c \
 	$(TOP)\ext\misc\completion.c \
-        $(TOP)\ext\misc\uint.c \
 	$(TOP)\ext\expert\sqlite3expert.c \
 	$(TOP)\ext\expert\sqlite3expert.h \
 	$(TOP)\ext\misc\memtrace.c \
@@ -2272,6 +2256,9 @@ fts3_write.lo:	$(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
 json1.lo:	$(TOP)\ext\misc\json1.c $(HDR) $(EXTHDR)
 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\json1.c

+shathree.lo:	$(TOP)\ext\misc\shathree.c $(HDR) $(EXTHDR)
+	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\shathree.c
+
 stmt.lo:	$(TOP)\ext\misc\stmt.c $(HDR) $(EXTHDR)
 	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\stmt.c

@@ -2321,7 +2308,7 @@ LSM1_SRC = \
 fts5parse.c:	$(TOP)\ext\fts5\fts5parse.y lemon.exe
 	copy $(TOP)\ext\fts5\fts5parse.y .
 	del /Q fts5parse.h 2>NUL
-	.\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) -S fts5parse.y
+	.\lemon.exe $(REQ_FEATURE_FLAGS) $(OPT_FEATURE_FLAGS) $(EXT_FEATURE_FLAGS) $(OPTS) fts5parse.y

 fts5parse.h:	fts5parse.c

@@ -2359,8 +2346,8 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
-TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
+TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_SHA3=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)

@@ -2425,6 +2412,9 @@ queryplantest:	testfixture.exe shell
 fuzztest:	fuzzcheck.exe
 	.\fuzzcheck.exe $(FUZZDATA)

+fastfuzztest:	fuzzcheck.exe
+	.\fuzzcheck.exe --limit-mem 100M $(FUZZDATA)
+
 # Minimal testing that runs in less than 3 minutes (on a fast machine)
 #
 quicktest:	testfixture.exe sourcetest
@@ -2434,7 +2424,7 @@ quicktest:	testfixture.exe sourcetest
 # This is the common case.  Run many tests that do not take too long,
 # including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
 #
-test:	$(TESTPROGS) sourcetest fuzztest
+test:	$(TESTPROGS) sourcetest fastfuzztest
 	@set PATH=$(LIBTCLPATH);$(PATH)
 	.\testfixture.exe $(TOP)\test\veryquick.test $(TESTOPTS)

@@ -1 +1 @@
-3.32.0
+3.30.0
@@ -210,12 +210,6 @@ OPTIMIZATIONS = 2
 SESSION = 0
 !ENDIF

-# Set this to non-0 to enable support for the rbu extension.
-#
-!IFNDEF RBU
-RBU = 0
-!ENDIF
-
 # Set the source code file to be used by executables and libraries when
 # they need the amalgamation.
 #
@@ -288,6 +282,7 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
+OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
 !ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
@@ -301,13 +296,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
 !ENDIF

-# Should the rbu extension be enabled?  If so, add compilation options
-# to enable it.
-#
-!IF $(RBU)!=0
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RBU=1
-!ENDIF
-
 # These are the "extended" SQLite compilation options used when compiling for
 # the Windows 10 platform.
 #
@@ -990,7 +978,7 @@ Replace.exe:
 sqlite3.def:	Replace.exe $(LIBOBJ)
 	echo EXPORTS > sqlite3.def
 	dumpbin /all $(LIBOBJ) \
-		| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup|rebaser|rbu)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
+		| .\Replace.exe "^\s+/EXPORT:_?(sqlite3(?:session|changeset|changegroup|rebaser)?_[^@,]*)(?:@\d+|,DATA)?$$" $$1 true \
 		| sort >> sqlite3.def

 $(SQLITE3EXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
@@ -161,7 +161,7 @@ AC_ARG_ENABLE(rtree, [AS_HELP_STRING(
  [--enable-rtree], [include rtree support [default=yes]])], 
  [], [enable_rtree=yes])
 if test x"$enable_rtree" = "xyes"; then
-  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY"
+  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE"
 fi
 #-----------------------------------------------------------------------

@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------

-AC_INIT([sqlite], [3.32.0])
+AC_INIT([sqlite], [3.7.4])

 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
@@ -153,7 +153,7 @@ Please `cd` to its location first.
 #
 #-------------------------------------------------------------------------

-PROJECT = tclsqlite3
+PROJECT = sqlite3
 !include "rules.vc"

 # nmakehelp -V <file> <tag> will search the file for tag, skips until a
@@ -162,15 +162,18 @@ PROJECT = tclsqlite3

 !if [echo REM = This file is generated from Makefile.vc > versions.vc]
 !endif
-# get project version from row "AC_INIT([sqlite], [3.x.y])"
+# get project version from row "AC_INIT([sqlite], [3.7.14])"
 !if [echo DOTVERSION = \>> versions.vc] \
-   && [nmakehlp -V ..\configure.ac AC_INIT >> versions.vc]
+   && [nmakehlp -V ..\configure.in AC_INIT >> versions.vc]
 !endif
 !include "versions.vc"

 VERSION         = $(DOTVERSION:.=)
 STUBPREFIX      = $(PROJECT)stub

+DLLOBJS = \
+	$(TMP_DIR)\tclsqlite3.obj
+
 #-------------------------------------------------------------------------
 # Target names and paths ( shouldn't need changing )
 #-------------------------------------------------------------------------
@@ -179,7 +182,7 @@ BINROOT		= .
 ROOT            = ..

 PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
-PRJLIBNAME	= $(PROJECT).$(EXT)
+PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
 PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)

 PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
@@ -201,17 +204,6 @@ DOCDIR		= $(ROOT)\doc
 TOOLSDIR	= $(ROOT)\tools
 COMPATDIR	= $(ROOT)\compat

-### Figure out where the primary source code file(s) is/are.
-!if exist("$(ROOT)\..\..\sqlite3.c") && exist("$(ROOT)\..\..\src\tclsqlite.c")
-SQL_INCLUDES = -I"$(ROOT)\..\.."
-SQLITE_SRCDIR = $(ROOT)\..\..
-TCLSQLITE_SRCDIR = $(ROOT)\..\..\src
-DLLOBJS = $(TMP_DIR)\sqlite3.obj $(TMP_DIR)\tclsqlite.obj
-!else
-TCLSQLITE_SRCDIR = $(ROOT)\generic
-DLLOBJS = $(TMP_DIR)\tclsqlite3.obj
-!endif
-
 #---------------------------------------------------------------------
 # Compile flags
 #---------------------------------------------------------------------
@@ -231,7 +223,7 @@ cdebug	= -Z7 -WX -Od -GZ
 !endif

 ### Declarations common to all compiler options
-cflags = -nologo -c -W3 -D_CRT_SECURE_NO_WARNINGS -YX -Fp$(TMP_DIR)^\
+cflags = -nologo -c -W3 -YX -Fp$(TMP_DIR)^\

 !if $(MSVCRT)
 !if $(DEBUG)
@@ -247,8 +239,8 @@ crt = -MT
 !endif
 !endif

-INCLUDES	= $(SQL_INCLUDES) $(TCL_INCLUDES) -I"$(WINDIR)" \
-                  -I"$(GENERICDIR)" -I"$(ROOT)\.."
+INCLUDES	= $(TCL_INCLUDES) -I"$(WINDIR)" -I"$(GENERICDIR)" \
+                  -I"$(ROOT)\.."
 BASE_CLFAGS	= $(cflags) $(cdebug) $(crt) $(INCLUDES) \
                  -DSQLITE_3_SUFFIX_ONLY=1 -DSQLITE_ENABLE_RTREE=1 \
                  -DSQLITE_ENABLE_FTS3=1 -DSQLITE_OMIT_DEPRECATED=1
@@ -349,17 +341,20 @@ $(PRJSTUBLIB): $(PRJSTUBOBJS)
 # Implicit rules
 #---------------------------------------------------------------------

-$(TMP_DIR)\sqlite3.obj:		$(SQLITE_SRCDIR)\sqlite3.c
-	$(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ \
-		-c $(SQLITE_SRCDIR)\sqlite3.c
+{$(WINDIR)}.c{$(TMP_DIR)}.obj::
+    $(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ @<<
+$<
+<<

-$(TMP_DIR)\tclsqlite.obj:	$(TCLSQLITE_SRCDIR)\tclsqlite.c
-	$(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ \
-		-c $(TCLSQLITE_SRCDIR)\tclsqlite.c
+{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
+    $(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ @<<
+$<
+<<

-$(TMP_DIR)\tclsqlite3.obj:	$(TCLSQLITE_SRCDIR)\tclsqlite3.c
-	$(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ \
-		-c $(TCLSQLITE_SRCDIR)\tclsqlite3.c
+{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::
+    $(cc32) $(TCL_CFLAGS) -DBUILD_$(PROJECT) -Fo$(TMP_DIR)\ @<<
+$<
+<<

 {$(WINDIR)}.rc{$(TMP_DIR)}.res:
 	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -D__WIN32__ \
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.32.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.30.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.32.0'
-PACKAGE_STRING='sqlite 3.32.0'
+PACKAGE_VERSION='3.30.0'
+PACKAGE_STRING='sqlite 3.30.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''

@@ -906,7 +906,6 @@ enable_amalgamation
 enable_load_extension
 enable_memsys5
 enable_memsys3
-enable_all
 enable_fts3
 enable_fts4
 enable_fts5
@@ -1467,7 +1466,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures sqlite 3.32.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.30.0 to adapt to many kinds of systems.

 Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1532,7 +1531,7 @@ fi

 if test -n "$ac_init_help"; then
  case $ac_init_help in
-     short | recursive ) echo "Configuration of sqlite 3.32.0:";;
+     short | recursive ) echo "Configuration of sqlite 3.30.0:";;
   esac
  cat <<\_ACEOF

@@ -1560,7 +1559,6 @@ Optional Features:
                          Disable loading of external extensions
  --enable-memsys5        Enable MEMSYS5
  --enable-memsys3        Enable MEMSYS3
-  --enable-all            Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions
  --enable-fts3           Enable the FTS3 extension
  --enable-fts4           Enable the FTS4 extension
  --enable-fts5           Enable the FTS5 extension
@@ -1659,7 +1657,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-sqlite configure 3.32.0
+sqlite configure 3.30.0
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2078,7 +2076,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.

-It was created by sqlite $as_me 3.32.0, which was
+It was created by sqlite $as_me 3.30.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -3936,13 +3934,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
  lt_cv_nm_interface="BSD nm"
  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3939: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3937: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3942: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3940: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3945: output\"" >&5)
+  (eval echo "\"\$as_me:3943: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -5148,7 +5146,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 5151 "configure"' > conftest.$ac_ext
+  echo '#line 5149 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -6673,11 +6671,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6676: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6674: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:6680: \$? = $ac_status" >&5
+   echo "$as_me:6678: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -7012,11 +7010,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7015: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7013: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7019: \$? = $ac_status" >&5
+   echo "$as_me:7017: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -7117,11 +7115,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7120: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7118: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7124: \$? = $ac_status" >&5
+   echo "$as_me:7122: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -7172,11 +7170,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7175: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7173: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7179: \$? = $ac_status" >&5
+   echo "$as_me:7177: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -9552,7 +9550,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 9555 "configure"
+#line 9553 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -9648,7 +9646,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 9651 "configure"
+#line 9649 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@@ -11452,15 +11450,6 @@ else
 $as_echo "no" >&6; }
 fi

-########
-# The --enable-extensions argument is short-hand to enable
-# multiple extensions.
-# Check whether --enable-all was given.
-if test "${enable_all+set}" = set; then :
-  enableval=$enable_all;
-fi
-
-
 #########
 # See whether we should enable Full Text Search extensions
 # Check whether --enable-fts3 was given.
@@ -11476,7 +11465,7 @@ if test "${enable_fts4+set}" = set; then :
  enableval=$enable_fts4;
 fi

-if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_fts4}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4"
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
 $as_echo_n "checking for library containing log... " >&6; }
@@ -11540,7 +11529,7 @@ if test "${enable_fts5+set}" = set; then :
  enableval=$enable_fts5;
 fi

-if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_fts5}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5"
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing log" >&5
 $as_echo_n "checking for library containing log... " >&6; }
@@ -11607,7 +11596,7 @@ if test "${enable_json1+set}" = set; then :
  enableval=$enable_json1;
 fi

-if test "${enable_json1}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_json1}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
 fi

@@ -11632,7 +11621,7 @@ else
  enable_geopoly=no
 fi

-if test "${enable_geopoly}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_geopoly}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_GEOPOLY"
  enable_rtree=yes
 fi
@@ -11655,7 +11644,7 @@ if test "${enable_session+set}" = set; then :
  enableval=$enable_session;
 fi

-if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_session}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
 fi
@@ -12243,7 +12232,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.32.0, which was
+This file was extended by sqlite $as_me 3.30.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -12309,7 +12298,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-sqlite config.status 3.32.0
+sqlite config.status 3.30.0
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

@@ -613,12 +613,6 @@ else
  AC_MSG_RESULT([no])
 fi

-########
-# The --enable-extensions argument is short-hand to enable
-# multiple extensions.
-AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all],
-      [Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions]))
-
 #########
 # See whether we should enable Full Text Search extensions
 AC_ARG_ENABLE(fts3, AC_HELP_STRING([--enable-fts3],
@@ -628,13 +622,13 @@ if test "${enable_fts3}" = "yes" ; then
 fi
 AC_ARG_ENABLE(fts4, AC_HELP_STRING([--enable-fts4],
      [Enable the FTS4 extension]))
-if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_fts4}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4"
  AC_SEARCH_LIBS([log],[m])
 fi
 AC_ARG_ENABLE(fts5, AC_HELP_STRING([--enable-fts5],
      [Enable the FTS5 extension]))
-if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_fts5}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5"
  AC_SEARCH_LIBS([log],[m])
 fi
@@ -642,7 +636,7 @@ fi
 #########
 # See whether we should enable JSON1
 AC_ARG_ENABLE(json1, AC_HELP_STRING([--enable-json1],[Enable the JSON1 extension]))
-if test "${enable_json1}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_json1}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
 fi

@@ -660,7 +654,7 @@ fi
 AC_ARG_ENABLE(geopoly, AC_HELP_STRING([--enable-geopoly],
      [Enable the GEOPOLY extension]),
      [enable_geopoly=yes],[enable_geopoly=no])
-if test "${enable_geopoly}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_geopoly}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_GEOPOLY"
  enable_rtree=yes
 fi
@@ -677,7 +671,7 @@ fi
 # See whether we should enable the SESSION extension
 AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session],
      [Enable the SESSION extension]))
-if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then
+if test "${enable_session}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
 fi
@@ -123,7 +123,7 @@ Suppress generation of the report file.
 <li><b>-r</b>
 Do not sort or renumber the parser states as part of optimization.
 <li><b>-s</b>
-Show parser statistics before exiting.
+Show parser statistics before existing.
 <li><b>-T<i>file</i></b>
 Use <i>file</i> as the template for the generated C-code parser implementation.
 <li><b>-x</b>
@@ -488,7 +488,7 @@ is an error.</p>
 The precedence of a grammar rule is equal to the precedence of the
 left-most terminal symbol in the rule for which a precedence is
 defined.  This is normally what you want, but in those cases where
-you want the precedence of a grammar rule to be something different,
+you want to precedence of a grammar rule to be something different,
 you can specify an alternative precedence symbol by putting the
 symbol in square braces after the period at the end of the rule and
 before any C-code.  For example:</p>
@@ -689,7 +689,7 @@ on Parse().
 <a name='extractx'></a>
 <h4>The <tt>%extra_context</tt> directive</h4>

-The <tt>%extra_context</tt> directive instructs Lemon to add a 2nd parameter
+The <tt>%extra_context</tt> directive instructs Lemon to add a 2th parameter
 to the parameter list of the ParseAlloc() and ParseInif() functions.  Lemon
 doesn't do anything itself with these extra argument, but it does
 store the value make it available to C-code action routines, destructors,
@@ -699,9 +699,9 @@ and so forth.  For example, if the grammar file contains:</p>
    %extra_context { MyStruct *pAbc }
 </pre></p>

-<p>Then the ParseAlloc() and ParseInit() functions will have an 2nd parameter
+<p>Then the ParseAlloc() and ParseInit() functions will have an 2th parameter
 of type "MyStruct*" and all action routines will have access to
-a variable named "pAbc" that is the value of that 2nd parameter.</p>
+a variable named "pAbc" that is the value of that 2th parameter.</p>

 <p>The <tt>%extra_argument</tt> directive works the same except that it
 is passed in on the Parse() routine instead of on ParseAlloc()/ParseInit().
@@ -996,7 +996,7 @@ on the parser's stack associated with terminal and non-terminal
 symbols.  The values of all terminal symbols must be of the same
 type.  This turns out to be the same data type as the 3rd parameter
 to the Parse() function generated by Lemon.  Typically, you will
-make the value of a terminal symbol be a pointer to some kind of
+make the value of a terminal symbol by a pointer to some kind of
 token structure.  Like this:</p>

 <p><pre>
@@ -1,142 +0,0 @@
-# The new-security-options branch
-
-## The problem that the [new-security-options](/timeline?r=new-security-options) branch tries to solve
-
-An attacker might modify the schema of an SQLite database by adding
-structures that cause code to run when some other application opens and
-reads the database.  For example, the attacker might replace a table
-definition with a view.  Or the attacker might add triggers to tables
-or views, or add new CHECK constraints or generated columns or indexes
-with expressions in the index list or in the WHERE clause.  If the
-added features invoke SQL functions or virtual tables with side effects,
-that might cause harm to the system if run by a high-privilege victim.
-Or, the added features might exfiltrate information if the database is
-read by a high-privilege victim.
-
-The changes in this branch strive to make it easier for high-privilege
-applications to safely read SQLite database files that might have been
-maliciously corrupted by an attacker.
-
-## Overview of changes in [new-security-options](/timeline?r=new-security-options)
-
-The basic idea is to tag every SQL function and virtual table with one
-of three risk levels:
-
-  1.  Innocuous
-  2.  Normal
-  3.  Direct-Only
-
-Innocuous functions/vtabs are safe and can be used at any time.
-Direct-only elements, in contrast, might have cause side-effects and
-should only be used from top-level SQL, not from within triggers or views nor
-in elements of the schema such as CHECK constraint, DEFAULT values, 
-generated columns, index expressions, or in the WHERE clause of a 
-partial index that are potentially under the control of an attacker.
-Normal elements behave like Innocuous if TRUSTED\_SCHEMA=on
-and behave like direct-only if TRUSTED\_SCHEMA=off.
-
-Application-defined functions and virtual tables go in as Normal unless
-the application takes deliberate steps to change the risk level.
-
-For backwards compatibility, the default is TRUSTED\_SCHEMA=on.  Documentation
-will be updated to recommend applications turn TRUSTED\_SCHEMA to off.
-
-An innocuous function or virtual table is one that can only read content
-from the database file in which it resides, and can only alter the database
-in which it resides.  Most SQL functions are innocuous.  For example, there
-is no harm in an attacker running the abs() function.
-
-Direct-only elements that have side-effects that go outside the database file
-in which it lives, or return information from outside of the database file.
-Examples of direct-only elements include:
-
-  1.  The fts3\_tokenizer() function
-  2.  The writefile() function
-  3.  The readfile() function
-  4.  The zipvfs virtual table
-  5.  The csv virtual table
-
-We do not want an attacker to be able to add these kinds of things to
-the database schema and possibly trick a high-privilege application 
-from performing any of these actions.  Therefore, functions and vtabs
-with side-effects are marked as Direct-Only.
-
-Legacy applications might add other risky functions or vtabs.  Those will
-go in as "Normal" by default.  For optimal security, we want those risky
-app-defined functions and vtabs to be direct-only, but making that the
-default might break some legacy applications.  Hence, all app-defined
-functions and vtabs go in as Normal, but the application can switch them
-over to "Direct-Only" behavior using a single pragma.
-
-The restrictions on the use of functions and virtual tables do not apply
-to TEMP.  A TEMP VIEW or a TEMP TRIGGER can use any valid SQL function
-or virtual table.  The idea is that TEMP views and triggers must be
-directly created by the application and are thus under the control of the
-application.  TEMP views and triggers cannot be created by an attacker who
-corrupts the schema of a persistent database file.  Hence TEMP views and
-triggers are safe.
-
-## Specific changes
-
-  1.  New sqlite3\_db\_config() option SQLITE\_DBCONFIG\_TRUSTED\_SCHEMA for
-      turning TRUSTED\_SCHEMA on and off.  It defaults to ON.
-
-  2.  Compile-time option -DSQLITE\_TRUSTED\_SCHEMA=0 causes the default
-      TRUSTED\_SCHEMA setting to be off.
-
-  3.  New pragma "PRAGMA trusted\_schema=(ON\|OFF);".  This provides access
-      to the TRUSTED_SCHEMA setting for application coded using scripting
-      languages or other secondary languages where they are unable to make
-      calls to sqlite3\_db\_config().
-
-  4.  New options for the "enc" parameter to sqlite3\_create\_function() and
-      its kin:
-      <ol type="a">
-      <li>  _SQLITE\_INNOCUOUS_  &rarr; tags the new functions as Innocuous
-      <li>  _SQLITE\_DIRECTONLY_ &rarr; tags the new functions as Direct-Only
-      </ol>
-
-  5.  New options to sqlite3\_vtab\_config():
-      <ol type="a">
-      <li>  _SQLITE\_VTAB\_INNOCUOUS_   &rarr; tags the vtab as Innocuous
-      <li>  _SQLITE\_VTAB\_DIRECTONLY_  &rarr; tags the vtab as Direct-Only
-      </ol>
-
-  6.  Change many of the functions and virtual tables in the SQLite source
-      tree to use one of the tags above.
-
-  7.  Enhanced PRAGMA function\_list and virtual-table "pragma\_function\_list"
-      with additional columns.  The columns now are:
-      <ul>
-      <li> _name_      &rarr;  Name of the function
-      <li> _builtin_   &rarr;  1 for built-in functions.  0 otherwise.
-      <li> _type_      &rarr;  's'=Scalar, 'a'=Aggregate, 'w'=Window
-      <li> _enc_       &rarr;  'utf8', 'utf16le', or 'utf16be'
-      <li> _narg_      &rarr;  number of argument
-      <li> _flags_     &rarr;  Bitmask of SQLITE\_INNOCUOUS, SQLITE\_DIRECTONLY,
-                               SQLITE\_DETERMINISTIC, SQLITE\_SUBTYPE, and
-                               SQLITE\_FUNC\_INTERNAL flags.
-      </ul>
-      <p>The last four columns are new.
-
-  8.  The function\_list PRAGMA now also shows all entries for each function.
-      So, for example, if a function can take either 2 or 3 arguments,
-      there are separate rows for the 2-argument and 3-argument versions of
-      the function.
-
-## Additional Notes
-
-The function_list enhancements allow the application to query the set
-of SQL functions that meet various criteria.  For example, to see all
-SQL functions that are never allowed to be used in the schema or in
-trigger or views:
-
-~~~
-    SELECT DISTINCT name FROM pragma_function_list
-     WHERE (flags & 0x80000)!=0
-     ORDER BY name;
-~~~
-
-Doing the same is not possible for virtual tables, as a virtual table
-might be Innocuous, Normal, or Direct-Only depending on the arguments
-passed into the xConnect method.
@@ -37,9 +37,6 @@ proc squish {txt} {

 proc do_setup_rec_test {tn setup sql res} {
  reset_db
-  if {[info exists ::set_main_db_name]} {
-    dbconfig_maindbname_icecube db
-  }
  db eval $setup
  uplevel [list do_rec_test $tn $sql $res]
 }
@@ -79,10 +76,6 @@ foreach {tn setup} {
    }
  }
  3 {
-    if {[info commands sqlite3_expert_new]==""} { continue }
-    set ::set_main_db_name 1
-  }
-  4 {
    if {![file executable $CLI]} { continue }

    proc do_rec_test {tn sql res} {
@@ -141,7 +134,6 @@ do_setup_rec_test $tn.5 {
  SEARCH TABLE t1 USING COVERING INDEX t1_idx_000123a7 (a=?)
 }

-if 0 {
 do_setup_rec_test $tn.6 {
  CREATE TABLE t1(a, b, c);
 } {
@@ -150,7 +142,6 @@ do_setup_rec_test $tn.6 {
  CREATE INDEX t1_idx_00000061 ON t1(a);
  SEARCH TABLE t1 USING COVERING INDEX t1_idx_00000061
 }
-}

 do_setup_rec_test $tn.7 {
  CREATE TABLE t1(a, b, c);
@@ -343,7 +334,7 @@ proc do_candidates_test {tn sql res} {


 reset_db
-do_execsql_test 5.0 {
+do_execsql_test 4.0 {
  CREATE TABLE t1(a, b);
  CREATE TABLE t2(c, d);

@@ -353,7 +344,7 @@ do_execsql_test 5.0 {
  WITH s(i) AS ( VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<100)
  INSERT INTO t2 SELECT (i-1)/20, (i-1)/5 FROM s;
 }
-do_candidates_test 5.1 {
+do_candidates_test 4.1 {
  SELECT * FROM t1,t2 WHERE (b=? OR a=?) AND (c=? OR d=?)
 } {
  CREATE INDEX t1_idx_00000062 ON t1(b); -- stat1: 100 20 
@@ -362,14 +353,14 @@ do_candidates_test 5.1 {
  CREATE INDEX t2_idx_00000064 ON t2(d); -- stat1: 100 5
 }

-do_candidates_test 5.2 {
+do_candidates_test 4.2 {
  SELECT * FROM t1,t2 WHERE a=? AND b=? AND c=? AND d=?
 } {
  CREATE INDEX t1_idx_000123a7 ON t1(a, b); -- stat1: 100 50 17
  CREATE INDEX t2_idx_0001295b ON t2(c, d); -- stat1: 100 20 5
 }

-do_execsql_test 5.3 {
+do_execsql_test 4.3 {
  CREATE INDEX t1_idx_00000061 ON t1(a); -- stat1: 100 50 
  CREATE INDEX t1_idx_00000062 ON t1(b); -- stat1: 100 20 
  CREATE INDEX t1_idx_000123a7 ON t1(a, b); -- stat1: 100 50 16
@@ -10,8 +10,8 @@
 **
 *************************************************************************
 */
-#if !defined(SQLITEEXPERT_H)
-#define SQLITEEXPERT_H 1
+
+
 #include "sqlite3.h"

 typedef struct sqlite3expert sqlite3expert;
@@ -165,4 +165,4 @@ const char *sqlite3_expert_report(sqlite3expert*, int iStmt, int eReport);
 */
 void sqlite3_expert_destroy(sqlite3expert*);

-#endif  /* !defined(SQLITEEXPERT_H) */
+
@@ -352,7 +352,12 @@ int sqlite3Fts3PutVarint(char *p, sqlite_int64 v){
  v = (*ptr++);                                               \
  if( (v & mask2)==0 ){ var = v; return ret; }

-int sqlite3Fts3GetVarintU(const char *pBuf, sqlite_uint64 *v){
+/* 
+** Read a 64-bit variable-length integer from memory starting at p[0].
+** Return the number of bytes read, or 0 on error.
+** The value is stored in *v.
+*/
+int sqlite3Fts3GetVarint(const char *pBuf, sqlite_int64 *v){
  const unsigned char *p = (const unsigned char*)pBuf;
  const unsigned char *pStart = p;
  u32 a;
@@ -374,41 +379,6 @@ int sqlite3Fts3GetVarintU(const char *pBuf, sqlite_uint64 *v){
  return (int)(p - pStart);
 }

-/* 
-** Read a 64-bit variable-length integer from memory starting at p[0].
-** Return the number of bytes read, or 0 on error.
-** The value is stored in *v.
-*/
-int sqlite3Fts3GetVarint(const char *pBuf, sqlite_int64 *v){
-  return sqlite3Fts3GetVarintU(pBuf, (sqlite3_uint64*)v);
-}
-
-/* 
-** Read a 64-bit variable-length integer from memory starting at p[0] and
-** not extending past pEnd[-1].
-** Return the number of bytes read, or 0 on error.
-** The value is stored in *v.
-*/
-int sqlite3Fts3GetVarintBounded(
-  const char *pBuf,
-  const char *pEnd,
-  sqlite_int64 *v
-){
-  const unsigned char *p = (const unsigned char*)pBuf;
-  const unsigned char *pStart = p;
-  const unsigned char *pX = (const unsigned char*)pEnd;
-  u64 b = 0;
-  int shift;
-  for(shift=0; shift<=63; shift+=7){
-    u64 c = p<pX ? *p : 0;
-    p++;
-    b += (c&0x7F) << shift;
-    if( (c & 0x80)==0 ) break;
-  }
-  *v = b;
-  return (int)(p - pStart);
-}
-
 /*
 ** Similar to sqlite3Fts3GetVarint(), except that the output is truncated to 
 ** a non-negative 32-bit integer before it is returned.
@@ -962,22 +932,6 @@ static char *fts3WriteExprList(Fts3Table *p, const char *zFunc, int *pRc){
  return zRet;
 }

-/*
-** Buffer z contains a positive integer value encoded as utf-8 text.
-** Decode this value and store it in *pnOut, returning the number of bytes
-** consumed. If an overflow error occurs return a negative value.
-*/
-int sqlite3Fts3ReadInt(const char *z, int *pnOut){
-  u64 iVal = 0;
-  int i;
-  for(i=0; z[i]>='0' && z[i]<='9'; i++){
-    iVal = iVal*10 + (z[i] - '0');
-    if( iVal>0x7FFFFFFF ) return -1;
-  }
-  *pnOut = (int)iVal;
-  return i;
-}
-
 /*
 ** This function interprets the string at (*pp) as a non-negative integer
 ** value. It reads the integer and sets *pnOut to the value read, then 
@@ -993,17 +947,19 @@ int sqlite3Fts3ReadInt(const char *z, int *pnOut){
 */
 static int fts3GobbleInt(const char **pp, int *pnOut){
  const int MAX_NPREFIX = 10000000;
+  const char *p;                  /* Iterator pointer */
  int nInt = 0;                   /* Output value */
-  int nByte;
-  nByte = sqlite3Fts3ReadInt(*pp, &nInt);
-  if( nInt>MAX_NPREFIX ){
-    nInt = 0;
-  }
-  if( nByte==0 ){
-    return SQLITE_ERROR;
+
+  for(p=*pp; p[0]>='0' && p[0]<='9'; p++){
+    nInt = nInt * 10 + (p[0] - '0');
+    if( nInt>MAX_NPREFIX ){
+      nInt = 0;
+      break;
+    }
  }
+  if( p==*pp ) return SQLITE_ERROR;
  *pnOut = nInt;
-  *pp += nByte;
+  *pp = p;
  return SQLITE_OK;
 }

@@ -1518,10 +1474,6 @@ static int fts3InitVtab(
  fts3DatabasePageSize(&rc, p);
  p->nNodeSize = p->nPgsz-35;

-#if defined(SQLITE_DEBUG)||defined(SQLITE_TEST)
-  p->nMergeCount = FTS3_MERGE_COUNT;
-#endif
-
  /* Declare the table schema to SQLite. */
  fts3DeclareVtab(&rc, p);

@@ -1617,10 +1569,6 @@ static int fts3BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
  int iDocidLe = -1;              /* Index of docid<=x constraint, if present */
  int iIdx;

-  if( p->bLock ){
-    return SQLITE_ERROR;
-  }
-
  /* By default use a full table scan. This is an expensive option,
  ** so search through the constraints to see if a more efficient 
  ** strategy is possible.
@@ -1819,11 +1767,7 @@ static int fts3CursorSeekStmt(Fts3Cursor *pCsr){
    }else{
      zSql = sqlite3_mprintf("SELECT %s WHERE rowid = ?", p->zReadExprlist);
      if( !zSql ) return SQLITE_NOMEM;
-      p->bLock++;
-      rc = sqlite3_prepare_v3(
-          p->db, zSql,-1,SQLITE_PREPARE_PERSISTENT,&pCsr->pStmt,0
-      );
-      p->bLock--;
+      rc = sqlite3_prepare_v3(p->db, zSql,-1,SQLITE_PREPARE_PERSISTENT,&pCsr->pStmt,0);
      sqlite3_free(zSql);
    }
    if( rc==SQLITE_OK ) pCsr->bSeekStmt = 1;
@@ -1841,15 +1785,11 @@ static int fts3CursorSeek(sqlite3_context *pContext, Fts3Cursor *pCsr){
  if( pCsr->isRequireSeek ){
    rc = fts3CursorSeekStmt(pCsr);
    if( rc==SQLITE_OK ){
-      Fts3Table *pTab = (Fts3Table*)pCsr->base.pVtab;
-      pTab->bLock++;
      sqlite3_bind_int64(pCsr->pStmt, 1, pCsr->iPrevId);
      pCsr->isRequireSeek = 0;
      if( SQLITE_ROW==sqlite3_step(pCsr->pStmt) ){
-        pTab->bLock--;
        return SQLITE_OK;
      }else{
-        pTab->bLock--;
        rc = sqlite3_reset(pCsr->pStmt);
        if( rc==SQLITE_OK && ((Fts3Table *)pCsr->base.pVtab)->zContentTbl==0 ){
          /* If no row was found and no error has occurred, then the %_content
@@ -1898,7 +1838,6 @@ static int fts3ScanInteriorNode(
  i64 nAlloc = 0;                 /* Size of allocated buffer */
  int isFirstTerm = 1;            /* True when processing first term on page */
  sqlite3_int64 iChild;           /* Block id of child node to descend to */
-  int nBuffer = 0;                /* Total term size */

  /* Skip over the 'height' varint that occurs at the start of every 
  ** interior node. Then load the blockid of the left-child of the b-tree
@@ -1923,15 +1862,12 @@ static int fts3ScanInteriorNode(
    int cmp;                      /* memcmp() result */
    int nSuffix;                  /* Size of term suffix */
    int nPrefix = 0;              /* Size of term prefix */
+    int nBuffer;                  /* Total term size */
  
    /* Load the next term on the node into zBuffer. Use realloc() to expand
    ** the size of zBuffer if required.  */
    if( !isFirstTerm ){
      zCsr += fts3GetVarint32(zCsr, &nPrefix);
-      if( nPrefix>nBuffer ){
-        rc = FTS_CORRUPT_VTAB;
-        goto finish_scan;
-      }
    }
    isFirstTerm = 0;
    zCsr += fts3GetVarint32(zCsr, &nSuffix);
@@ -2025,7 +1961,7 @@ static int fts3SelectLeaf(

  fts3GetVarint32(zNode, &iHeight);
  rc = fts3ScanInteriorNode(zTerm, nTerm, zNode, nNode, piLeaf, piLeaf2);
-  assert_fts3_nc( !piLeaf2 || !piLeaf || rc!=SQLITE_OK || (*piLeaf<=*piLeaf2) );
+  assert( !piLeaf2 || !piLeaf || rc!=SQLITE_OK || (*piLeaf<=*piLeaf2) );

  if( rc==SQLITE_OK && iHeight>1 ){
    char *zBlob = 0;              /* Blob read from %_segments table */
@@ -2045,13 +1981,7 @@ static int fts3SelectLeaf(
      rc = sqlite3Fts3ReadBlock(p, piLeaf?*piLeaf:*piLeaf2, &zBlob, &nBlob, 0);
    }
    if( rc==SQLITE_OK ){
-      int iNewHeight = 0;
-      fts3GetVarint32(zBlob, &iNewHeight);
-      if( iNewHeight>=iHeight ){
-        rc = FTS_CORRUPT_VTAB;
-      }else{
-        rc = fts3SelectLeaf(p, zTerm, nTerm, zBlob, nBlob, piLeaf, piLeaf2);
-      }
+      rc = fts3SelectLeaf(p, zTerm, nTerm, zBlob, nBlob, piLeaf, piLeaf2);
    }
    sqlite3_free(zBlob);
  }
@@ -2156,11 +2086,10 @@ static void fts3ColumnlistCopy(char **pp, char **ppPoslist){
 }

 /*
-** Value used to signify the end of an position-list. This must be
-** as large or larger than any value that might appear on the
-** position-list, even a position list that has been corrupted.
+** Value used to signify the end of an position-list. This is safe because
+** it is not possible to have a document with 2^31 terms.
 */
-#define POSITION_LIST_END LARGEST_INT64
+#define POSITION_LIST_END 0x7fffffff

 /*
 ** This function is used to help parse position-lists. When this function is
@@ -2236,14 +2165,14 @@ static int fts3PoslistMerge(
      fts3GetVarint32(&p1[1], &iCol1);
      if( iCol1==0 ) return FTS_CORRUPT_VTAB;
    }
-    else if( *p1==POS_END ) iCol1 = 0x7fffffff;
+    else if( *p1==POS_END ) iCol1 = POSITION_LIST_END;
    else iCol1 = 0;

    if( *p2==POS_COLUMN ){
      fts3GetVarint32(&p2[1], &iCol2);
      if( iCol2==0 ) return FTS_CORRUPT_VTAB;
    }
-    else if( *p2==POS_END ) iCol2 = 0x7fffffff;
+    else if( *p2==POS_END ) iCol2 = POSITION_LIST_END;
    else iCol2 = 0;

    if( iCol1==iCol2 ){
@@ -2506,12 +2435,12 @@ static void fts3GetDeltaVarint3(
  if( *pp>=pEnd ){
    *pp = 0;
  }else{
-    u64 iVal;
-    *pp += sqlite3Fts3GetVarintU(*pp, &iVal);
+    sqlite3_int64 iVal;
+    *pp += sqlite3Fts3GetVarint(*pp, &iVal);
    if( bDescIdx ){
-      *pVal = (i64)((u64)*pVal - iVal);
+      *pVal -= iVal;
    }else{
-      *pVal = (i64)((u64)*pVal + iVal);
+      *pVal += iVal;
    }
  }
 }
@@ -2538,16 +2467,14 @@ static void fts3PutDeltaVarint3(
  int *pbFirst,                   /* IN/OUT: True after first int written */
  sqlite3_int64 iVal              /* Write this value to the list */
 ){
-  sqlite3_uint64 iWrite;
+  sqlite3_int64 iWrite;
  if( bDescIdx==0 || *pbFirst==0 ){
-    assert_fts3_nc( *pbFirst==0 || iVal>=*piPrev );
-    iWrite = (u64)iVal - (u64)*piPrev;
+    iWrite = iVal - *piPrev;
  }else{
-    assert_fts3_nc( *piPrev>=iVal );
-    iWrite = (u64)*piPrev - (u64)iVal;
+    iWrite = *piPrev - iVal;
  }
  assert( *pbFirst || *piPrev==0 );
-  assert_fts3_nc( *pbFirst==0 || iWrite>0 );
+  assert( *pbFirst==0 || iWrite>0 );
  *pp += sqlite3Fts3PutVarint(*pp, iWrite);
  *piPrev = iVal;
  *pbFirst = 1;
@@ -2563,8 +2490,7 @@ static void fts3PutDeltaVarint3(
 ** Using this makes it easier to write code that can merge doclists that are
 ** sorted in either ascending or descending order.
 */
-/* #define DOCID_CMP(i1, i2) ((bDescDoclist?-1:1) * (i64)((u64)i1-i2)) */
-#define DOCID_CMP(i1, i2) ((bDescDoclist?-1:1) * (i1>i2?1:((i1==i2)?0:-1)))
+#define DOCID_CMP(i1, i2) ((bDescDoclist?-1:1) * (i1-i2))

 /*
 ** This function does an "OR" merge of two doclists (output contains all
@@ -2654,8 +2580,6 @@ static int fts3DoclistOrMerge(
      fts3PoslistCopy(&p, &p2);
      fts3GetDeltaVarint3(&p2, pEnd2, bDescDoclist, &i2);
    }
-    
-    assert( (p-aOut)<=((p1?(p1-a1):n1)+(p2?(p2-a2):n2)+FTS3_VARINT_MAX-1) );
  }

  if( rc!=SQLITE_OK ){
@@ -2978,7 +2902,7 @@ static int fts3SegReaderCursor(
  ** Fts3SegReaderPending might segfault, as the data structures used by 
  ** fts4aux are not completely populated. So it's easiest to filter these
  ** calls out here.  */
-  if( iLevel<0 && p->aIndex && p->iPrevLangid==iLangid ){
+  if( iLevel<0 && p->aIndex ){
    Fts3SegReader *pSeg = 0;
    rc = sqlite3Fts3SegReaderPending(p, iIndex, zTerm, nTerm, isPrefix||isScan, &pSeg);
    if( rc==SQLITE_OK && pSeg ){
@@ -3241,8 +3165,6 @@ static int fts3NextMethod(sqlite3_vtab_cursor *pCursor){
  int rc;
  Fts3Cursor *pCsr = (Fts3Cursor *)pCursor;
  if( pCsr->eSearch==FTS3_DOCID_SEARCH || pCsr->eSearch==FTS3_FULLSCAN_SEARCH ){
-    Fts3Table *pTab = (Fts3Table*)pCursor->pVtab;
-    pTab->bLock++;
    if( SQLITE_ROW!=sqlite3_step(pCsr->pStmt) ){
      pCsr->isEof = 1;
      rc = sqlite3_reset(pCsr->pStmt);
@@ -3250,7 +3172,6 @@ static int fts3NextMethod(sqlite3_vtab_cursor *pCursor){
      pCsr->iPrevId = sqlite3_column_int64(pCsr->pStmt, 0);
      rc = SQLITE_OK;
    }
-    pTab->bLock--;
  }else{
    rc = fts3EvalNext((Fts3Cursor *)pCursor);
  }
@@ -3258,6 +3179,18 @@ static int fts3NextMethod(sqlite3_vtab_cursor *pCursor){
  return rc;
 }

+/*
+** The following are copied from sqliteInt.h.
+**
+** Constants for the largest and smallest possible 64-bit signed integers.
+** These macros are designed to work correctly on both 32-bit and 64-bit
+** compilers.
+*/
+#ifndef SQLITE_AMALGAMATION
+# define LARGEST_INT64  (0xffffffff|(((sqlite3_int64)0x7fffffff)<<32))
+# define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64)
+#endif
+
 /*
 ** If the numeric type of argument pVal is "integer", then return it
 ** converted to a 64-bit signed integer. Otherwise, return a copy of
@@ -3311,10 +3244,6 @@ static int fts3FilterMethod(
  UNUSED_PARAMETER(idxStr);
  UNUSED_PARAMETER(nVal);

-  if( p->bLock ){
-    return SQLITE_ERROR;
-  }
-
  eSearch = (idxNum & 0x0000FFFF);
  assert( eSearch>=0 && eSearch<=(FTS3_FULLTEXT_SEARCH+p->nColumn) );
  assert( p->pSegments==0 );
@@ -3386,11 +3315,7 @@ static int fts3FilterMethod(
      );
    }
    if( zSql ){
-      p->bLock++;
-      rc = sqlite3_prepare_v3(
-          p->db,zSql,-1,SQLITE_PREPARE_PERSISTENT,&pCsr->pStmt,0
-      );
-      p->bLock--;
+      rc = sqlite3_prepare_v3(p->db,zSql,-1,SQLITE_PREPARE_PERSISTENT,&pCsr->pStmt,0);
      sqlite3_free(zSql);
    }else{
      rc = SQLITE_NOMEM;
@@ -4407,7 +4332,7 @@ static int fts3EvalPhraseStart(Fts3Cursor *pCsr, int bOptOk, Fts3Phrase *p){
  int bIncrOk = (bOptOk 
   && pCsr->bDesc==pTab->bDescIdx 
   && p->nToken<=MAX_INCR_PHRASE_TOKENS && p->nToken>0
-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
+#ifdef SQLITE_TEST
   && pTab->bNoIncrDoclist==0
 #endif
  );
@@ -4549,16 +4474,15 @@ static void fts3EvalDlPhraseNext(
  u8 *pbEof
 ){
  char *pIter;                            /* Used to iterate through aAll */
-  char *pEnd;                             /* 1 byte past end of aAll */
+  char *pEnd = &pDL->aAll[pDL->nAll];     /* 1 byte past end of aAll */
 
  if( pDL->pNextDocid ){
    pIter = pDL->pNextDocid;
-    assert( pDL->aAll!=0 || pIter==0 );
  }else{
    pIter = pDL->aAll;
  }

-  if( pIter==0 || pIter>=(pEnd = pDL->aAll + pDL->nAll) ){
+  if( pIter>=pEnd ){
    /* We have already reached the end of this doclist. EOF. */
    *pbEof = 1;
  }else{
@@ -4930,13 +4854,12 @@ static int fts3EvalAverageDocsize(Fts3Cursor *pCsr, int *pnPage){
    rc = sqlite3Fts3SelectDoctotal(p, &pStmt);
    if( rc!=SQLITE_OK ) return rc;
    a = sqlite3_column_blob(pStmt, 0);
-    testcase( a==0 );  /* If %_stat.value set to X'' */
-    if( a ){
-      pEnd = &a[sqlite3_column_bytes(pStmt, 0)];
-      a += sqlite3Fts3GetVarintBounded(a, pEnd, &nDoc);
-      while( a<pEnd ){
-        a += sqlite3Fts3GetVarintBounded(a, pEnd, &nByte);
-      }
+    assert( a );
+
+    pEnd = &a[sqlite3_column_bytes(pStmt, 0)];
+    a += sqlite3Fts3GetVarint(a, &nDoc);
+    while( a<pEnd ){
+      a += sqlite3Fts3GetVarint(a, &nByte);
    }
    if( nDoc==0 || nByte==0 ){
      sqlite3_reset(pStmt);
@@ -196,9 +196,6 @@ typedef sqlite3_int64 i64;        /* 8-byte signed integer */
 # define TESTONLY(X)
 #endif

-#define LARGEST_INT64  (0xffffffff|(((i64)0x7fffffff)<<32))
-#define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64)
-
 #endif /* SQLITE_AMALGAMATION */

 #ifdef SQLITE_DEBUG
@@ -242,7 +239,6 @@ struct Fts3Table {
  char *zLanguageid;              /* languageid=xxx option, or NULL */
  int nAutoincrmerge;             /* Value configured by 'automerge' */
  u32 nLeafAdd;                   /* Number of leaf blocks added this trans */
-  int bLock;                      /* Used to prevent recursive content= tbls */

  /* Precompiled statements used by the implementation. Each of these 
  ** statements is run and reset within a single virtual table API call. 
@@ -301,23 +297,13 @@ struct Fts3Table {
  int mxSavepoint;       /* Largest valid xSavepoint integer */
 #endif

-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
+#ifdef SQLITE_TEST
  /* True to disable the incremental doclist optimization. This is controled
  ** by special insert command 'test-no-incr-doclist'.  */
  int bNoIncrDoclist;
-
-  /* Number of segments in a level */
-  int nMergeCount;
 #endif
 };

-/* Macro to find the number of segments to merge */
-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
-# define MergeCount(P) ((P)->nMergeCount)
-#else
-# define MergeCount(P) FTS3_MERGE_COUNT
-#endif
-
 /*
 ** When the core wants to read from the virtual table, it creates a
 ** virtual table cursor (an instance of the following structure) using
@@ -581,8 +567,6 @@ int sqlite3Fts3Incrmerge(Fts3Table*,int,int);
 void sqlite3Fts3ErrMsg(char**,const char*,...);
 int sqlite3Fts3PutVarint(char *, sqlite3_int64);
 int sqlite3Fts3GetVarint(const char *, sqlite_int64 *);
-int sqlite3Fts3GetVarintU(const char *, sqlite_uint64 *);
-int sqlite3Fts3GetVarintBounded(const char*,const char*,sqlite3_int64*);
 int sqlite3Fts3GetVarint32(const char *, int *);
 int sqlite3Fts3VarintLen(sqlite3_uint64);
 void sqlite3Fts3Dequote(char *);
@@ -591,7 +575,6 @@ int sqlite3Fts3EvalPhraseStats(Fts3Cursor *, Fts3Expr *, u32 *);
 int sqlite3Fts3FirstFilter(sqlite3_int64, char *, int, char *);
 void sqlite3Fts3CreateStatTable(int*, Fts3Table*);
 int sqlite3Fts3EvalTestDeferred(Fts3Cursor *pCsr, int *pRc);
-int sqlite3Fts3ReadInt(const char *z, int *pnOut);

 /* fts3_tokenizer.c */
 const char *sqlite3Fts3NextToken(const char *, int *);
@@ -446,7 +446,10 @@ static int getNextNode(
      if( pKey->eType==FTSQUERY_NEAR ){
        assert( nKey==4 );
        if( zInput[4]=='/' && zInput[5]>='0' && zInput[5]<='9' ){
-          nKey += 1+sqlite3Fts3ReadInt(&zInput[nKey+1], &nNear);
+          nNear = 0;
+          for(nKey=5; zInput[nKey]>='0' && zInput[nKey]<='9'; nKey++){
+            nNear = nNear * 10 + (zInput[nKey] - '0');
+          }
        }
      }

@@ -433,10 +433,10 @@ static void fts3SnippetDetails(

      while( iCsr<(iStart+pIter->nSnippet) && iCsr>=iStart ){
        int j;
-        u64 mPhrase = (u64)1 << (i%64);
+        u64 mPhrase = (u64)1 << i;
        u64 mPos = (u64)1 << (iCsr - iStart);
        assert( iCsr>=iStart && (iCsr - iStart)<=64 );
-        assert( i>=0 );
+        assert( i>=0 && i<=64 );
        if( (mCover|mCovered)&mPhrase ){
          iScore++;
        }else{
@@ -560,7 +560,7 @@ static int fts3BestSnippet(
    /* Set the *pmSeen output variable. */
    for(i=0; i<nList; i++){
      if( sIter.aPhrase[i].pHead ){
-        *pmSeen |= (u64)1 << (i%64);
+        *pmSeen |= (u64)1 << i;
      }
    }

@@ -1038,15 +1038,11 @@ static int fts3MatchinfoSelectDoctotal(
  Fts3Table *pTab,
  sqlite3_stmt **ppStmt,
  sqlite3_int64 *pnDoc,
-  const char **paLen,
-  const char **ppEnd
+  const char **paLen
 ){
  sqlite3_stmt *pStmt;
  const char *a;
-  const char *pEnd;
  sqlite3_int64 nDoc;
-  int n;
-

  if( !*ppStmt ){
    int rc = sqlite3Fts3SelectDoctotal(pTab, ppStmt);
@@ -1055,20 +1051,12 @@ static int fts3MatchinfoSelectDoctotal(
  pStmt = *ppStmt;
  assert( sqlite3_data_count(pStmt)==1 );

-  n = sqlite3_column_bytes(pStmt, 0);
  a = sqlite3_column_blob(pStmt, 0);
-  if( a==0 ){
-    return FTS_CORRUPT_VTAB;
-  }
-  pEnd = a + n;
-  a += sqlite3Fts3GetVarintBounded(a, pEnd, &nDoc);
-  if( nDoc<=0 || a>pEnd ){
-    return FTS_CORRUPT_VTAB;
-  }
-  *pnDoc = nDoc;
+  a += sqlite3Fts3GetVarint(a, &nDoc);
+  if( nDoc==0 ) return FTS_CORRUPT_VTAB;
+  *pnDoc = (u32)nDoc;

  if( paLen ) *paLen = a;
-  if( ppEnd ) *ppEnd = pEnd;
  return SQLITE_OK;
 }

@@ -1249,7 +1237,7 @@ static int fts3MatchinfoValues(
      case FTS3_MATCHINFO_NDOC:
        if( bGlobal ){
          sqlite3_int64 nDoc = 0;
-          rc = fts3MatchinfoSelectDoctotal(pTab, &pSelect, &nDoc, 0, 0);
+          rc = fts3MatchinfoSelectDoctotal(pTab, &pSelect, &nDoc, 0);
          pInfo->aMatchinfo[0] = (u32)nDoc;
        }
        break;
@@ -1258,19 +1246,14 @@ static int fts3MatchinfoValues(
        if( bGlobal ){
          sqlite3_int64 nDoc;     /* Number of rows in table */
          const char *a;          /* Aggregate column length array */
-          const char *pEnd;       /* First byte past end of length array */

-          rc = fts3MatchinfoSelectDoctotal(pTab, &pSelect, &nDoc, &a, &pEnd);
+          rc = fts3MatchinfoSelectDoctotal(pTab, &pSelect, &nDoc, &a);
          if( rc==SQLITE_OK ){
            int iCol;
            for(iCol=0; iCol<pInfo->nCol; iCol++){
              u32 iVal;
              sqlite3_int64 nToken;
              a += sqlite3Fts3GetVarint(a, &nToken);
-              if( a>pEnd ){
-                rc = SQLITE_CORRUPT_VTAB;
-                break;
-              }
              iVal = (u32)(((u32)(nToken&0xffffffff)+nDoc/2)/nDoc);
              pInfo->aMatchinfo[iCol] = iVal;
            }
@@ -1284,14 +1267,9 @@ static int fts3MatchinfoValues(
        if( rc==SQLITE_OK ){
          int iCol;
          const char *a = sqlite3_column_blob(pSelectDocsize, 0);
-          const char *pEnd = a + sqlite3_column_bytes(pSelectDocsize, 0);
          for(iCol=0; iCol<pInfo->nCol; iCol++){
            sqlite3_int64 nToken;
-            a += sqlite3Fts3GetVarintBounded(a, pEnd, &nToken);
-            if( a>pEnd ){
-              rc = SQLITE_CORRUPT_VTAB;
-              break;
-            }
+            a += sqlite3Fts3GetVarint(a, &nToken);
            pInfo->aMatchinfo[iCol] = (u32)nToken;
          }
        }
@@ -1322,7 +1300,7 @@ static int fts3MatchinfoValues(
        if( rc!=SQLITE_OK ) break;
        if( bGlobal ){
          if( pCsr->pDeferred ){
-            rc = fts3MatchinfoSelectDoctotal(pTab, &pSelect, &pInfo->nDoc,0,0);
+            rc = fts3MatchinfoSelectDoctotal(pTab, &pSelect, &pInfo->nDoc, 0);
            if( rc!=SQLITE_OK ) break;
          }
          rc = fts3ExprIterate(pExpr, fts3ExprGlobalHitsCb,(void*)pInfo);
@@ -350,7 +350,7 @@ static int fts3tokFilterMethod(
    if( pCsr->zInput==0 ){
      rc = SQLITE_NOMEM;
    }else{
-      if( nByte>0 ) memcpy(pCsr->zInput, zByte, nByte);
+      memcpy(pCsr->zInput, zByte, nByte);
      pCsr->zInput[nByte] = 0;
      rc = pTab->pMod->xOpen(pTab->pTok, pCsr->zInput, nByte, &pCsr->pCsr);
      if( rc==SQLITE_OK ){
@@ -390,9 +390,7 @@ int queryTokenizer(

  sqlite3_bind_text(pStmt, 1, zName, -1, SQLITE_STATIC);
  if( SQLITE_ROW==sqlite3_step(pStmt) ){
-    if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB
-     && sqlite3_column_bytes(pStmt, 0)==sizeof(*pp)
-    ){
+    if( sqlite3_column_type(pStmt, 0)==SQLITE_BLOB ){
      memcpy((void *)pp, sqlite3_column_blob(pStmt, 0), sizeof(*pp));
    }
  }
@@ -481,7 +479,7 @@ int sqlite3Fts3InitHashTable(
 ){
  int rc = SQLITE_OK;
  void *p = (void *)pHash;
-  const int any = SQLITE_UTF8|SQLITE_DIRECTONLY;
+  const int any = SQLITE_ANY;

 #ifdef SQLITE_TEST
  char *zTest = 0;
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <stdio.h>
+

 #define FTS_MAX_APPENDABLE_HEIGHT 16

@@ -67,7 +67,7 @@ int test_fts3_node_chunk_threshold = (4*1024)*4;
 #endif

 /*
-** The values that may be meaningfully bound to the :1 parameter in
+** The two values that may be meaningfully bound to the :1 parameter in
 ** statements SQL_REPLACE_STAT and SQL_SELECT_STAT.
 */
 #define FTS_STAT_DOCTOTAL      0
@@ -335,7 +335,7 @@ static int fts3SqlStmt(
 ** returns zero rows.  */
 /* 28 */ "SELECT level, count(*) AS cnt FROM %Q.'%q_segdir' "
         "  GROUP BY level HAVING cnt>=?"
-         "  ORDER BY (level %% 1024) ASC, 2 DESC LIMIT 1",
+         "  ORDER BY (level %% 1024) ASC LIMIT 1",

 /* Estimate the upper limit on the number of leaf nodes in a new segment
 ** created by merging the oldest :2 segments from absolute level :1. See 
@@ -696,7 +696,7 @@ static int fts3PendingListAppend(
  assert( !p || p->iLastDocid<=iDocid );

  if( !p || p->iLastDocid!=iDocid ){
-    u64 iDelta = (u64)iDocid - (u64)(p ? p->iLastDocid : 0);
+    sqlite3_int64 iDelta = iDocid - (p ? p->iLastDocid : 0);
    if( p ){
      assert( p->nData<p->nSpace );
      assert( p->aData[p->nData]==0 );
@@ -1153,7 +1153,7 @@ static int fts3AllocateSegdirIdx(
    ** segment and allocate (newly freed) index 0 at level iLevel. Otherwise,
    ** if iNext is less than FTS3_MERGE_COUNT, allocate index iNext.
    */
-    if( iNext>=MergeCount(p) ){
+    if( iNext>=FTS3_MERGE_COUNT ){
      fts3LogMerge(16, getAbsoluteLevel(p, iLangid, iIndex, iLevel));
      rc = fts3SegmentMerge(p, iLangid, iIndex, iLevel);
      *piIdx = 0;
@@ -1237,8 +1237,6 @@ int sqlite3Fts3ReadBlock(
      }
      *paBlob = aByte;
    }
-  }else if( rc==SQLITE_ERROR ){
-    rc = FTS_CORRUPT_VTAB;
  }

  return rc;
@@ -1381,7 +1379,7 @@ static int fts3SegReaderNext(
  pNext += fts3GetVarint32(pNext, &nSuffix);
  if( nSuffix<=0 
   || (&pReader->aNode[pReader->nNode] - pNext)<nSuffix
-   || nPrefix>pReader->nTerm
+   || nPrefix>pReader->nTermAlloc
  ){
    return FTS_CORRUPT_VTAB;
  }
@@ -1415,7 +1413,6 @@ static int fts3SegReaderNext(
  */
  if( pReader->nDoclist > pReader->nNode-(pReader->aDoclist-pReader->aNode)
   || (pReader->nPopulate==0 && pReader->aDoclist[pReader->nDoclist-1])
-   || pReader->nDoclist==0
  ){
    return FTS_CORRUPT_VTAB;
  }
@@ -1532,18 +1529,18 @@ static int fts3SegReaderNextDocid(
    }else{
      rc = fts3SegReaderRequire(pReader, p, FTS3_VARINT_MAX);
      if( rc==SQLITE_OK ){
-        u64 iDelta;
-        pReader->pOffsetList = p + sqlite3Fts3GetVarintU(p, &iDelta);
+        sqlite3_int64 iDelta;
+        pReader->pOffsetList = p + sqlite3Fts3GetVarint(p, &iDelta);
        if( pTab->bDescIdx ){
-          pReader->iDocid = (i64)((u64)pReader->iDocid - iDelta);
+          pReader->iDocid -= iDelta;
        }else{
-          pReader->iDocid = (i64)((u64)pReader->iDocid + iDelta);
+          pReader->iDocid += iDelta;
        }
      }
    }
  }

-  return rc;
+  return SQLITE_OK;
 }


@@ -2033,11 +2030,6 @@ static int fts3NodeAddTerm(
    nPrefix = fts3PrefixCompress(pTree->zTerm, pTree->nTerm, zTerm, nTerm);
    nSuffix = nTerm-nPrefix;

-    /* If nSuffix is zero or less, then zTerm/nTerm must be a prefix of 
-    ** pWriter->zTerm/pWriter->nTerm. i.e. must be equal to or less than when
-    ** compared with BINARY collation. This indicates corruption.  */
-    if( nSuffix<=0 ) return FTS_CORRUPT_VTAB;
-
    nReq += sqlite3Fts3VarintLen(nPrefix)+sqlite3Fts3VarintLen(nSuffix)+nSuffix;
    if( nReq<=p->nNodeSize || !pTree->zTerm ){

@@ -2282,7 +2274,6 @@ static int fts3SegWriterAdd(
    int rc;

    /* The current leaf node is full. Write it out to the database. */
-    if( pWriter->iFree==LARGEST_INT64 ) return FTS_CORRUPT_VTAB;
    rc = fts3WriteSegment(p, pWriter->iFree++, pWriter->aData, nData);
    if( rc!=SQLITE_OK ) return rc;
    p->nLeafAdd++;
@@ -2332,11 +2323,9 @@ static int fts3SegWriterAdd(
  /* Append the prefix-compressed term and doclist to the buffer. */
  nData += sqlite3Fts3PutVarint(&pWriter->aData[nData], nPrefix);
  nData += sqlite3Fts3PutVarint(&pWriter->aData[nData], nSuffix);
-  assert( nSuffix>0 );
  memcpy(&pWriter->aData[nData], &zTerm[nPrefix], nSuffix);
  nData += nSuffix;
  nData += sqlite3Fts3PutVarint(&pWriter->aData[nData], nDoclist);
-  assert( nDoclist>0 );
  memcpy(&pWriter->aData[nData], aDoclist, nDoclist);
  pWriter->nData = nData + nDoclist;

@@ -2356,7 +2345,6 @@ static int fts3SegWriterAdd(
      pWriter->zTerm = zNew;
    }
    assert( pWriter->zTerm==pWriter->zMalloc );
-    assert( nTerm>0 );
    memcpy(pWriter->zTerm, zTerm, nTerm);
  }else{
    pWriter->zTerm = (char *)zTerm;
@@ -2503,7 +2491,7 @@ static int fts3SegmentIsMaxLevel(Fts3Table *p, i64 iAbsLevel, int *pbMax){
  if( rc!=SQLITE_OK ) return rc;
  sqlite3_bind_int64(pStmt, 1, iAbsLevel+1);
  sqlite3_bind_int64(pStmt, 2, 
-      (((u64)iAbsLevel/FTS3_SEGDIR_MAXLEVEL)+1) * FTS3_SEGDIR_MAXLEVEL
+      ((iAbsLevel/FTS3_SEGDIR_MAXLEVEL)+1) * FTS3_SEGDIR_MAXLEVEL
  );

  *pbMax = 0;
@@ -2665,7 +2653,6 @@ static int fts3MsrBufferData(
    pMsr->aBuffer = pNew;
  }

-  assert( nList>0 );
  memcpy(pMsr->aBuffer, pList, nList);
  return SQLITE_OK;
 }
@@ -2979,12 +2966,14 @@ int sqlite3Fts3SegReaderStep(
          ** doclist. */
          sqlite3_int64 iDelta;
          if( p->bDescIdx && nDoclist>0 ){
-            if( iPrev<=iDocid ) return FTS_CORRUPT_VTAB;
-            iDelta = (i64)((u64)iPrev - (u64)iDocid);
+            iDelta = iPrev - iDocid;
          }else{
-            if( nDoclist>0 && iPrev>=iDocid ) return FTS_CORRUPT_VTAB;
-            iDelta = (i64)((u64)iDocid - (u64)iPrev);
+            iDelta = iDocid - iPrev;
          }
+          if( iDelta<=0 && (nDoclist>0 || iDelta!=iDocid) ){
+            return FTS_CORRUPT_VTAB;
+          }
+          assert( nDoclist>0 || iDelta==iDocid );

          nByte = sqlite3Fts3VarintLen(iDelta) + (isRequirePos?nList+1:0);
          if( nDoclist+nByte>pCsr->nBuffer ){
@@ -3069,11 +3058,11 @@ static void fts3ReadEndBlockField(
  if( zText ){
    int i;
    int iMul = 1;
-    u64 iVal = 0;
+    i64 iVal = 0;
    for(i=0; zText[i]>='0' && zText[i]<='9'; i++){
      iVal = iVal*10 + (zText[i] - '0');
    }
-    *piEndBlock = (i64)iVal;
+    *piEndBlock = iVal;
    while( zText[i]==' ' ) i++;
    iVal = 0;
    if( zText[i]=='-' ){
@@ -3083,7 +3072,7 @@ static void fts3ReadEndBlockField(
    for(/* no-op */; zText[i]>='0' && zText[i]<='9'; i++){
      iVal = iVal*10 + (zText[i] - '0');
    }
-    *pnByte = ((i64)iVal * (i64)iMul);
+    *pnByte = (iVal * (i64)iMul);
  }
 }

@@ -3266,7 +3255,7 @@ static int fts3SegmentMerge(
        csr.zTerm, csr.nTerm, csr.aDoclist, csr.nDoclist);
  }
  if( rc!=SQLITE_OK ) goto finished;
-  assert_fts3_nc( pWriter || bIgnoreEmpty );
+  assert( pWriter || bIgnoreEmpty );

  if( iLevel!=FTS3_SEGCURSOR_PENDING ){
    rc = fts3DeleteSegdir(
@@ -3493,10 +3482,7 @@ static int fts3DoOptimize(Fts3Table *p, int bReturnDone){
  int rc;
  sqlite3_stmt *pAllLangid = 0;

-  rc = sqlite3Fts3PendingTermsFlush(p);
-  if( rc==SQLITE_OK ){
-    rc = fts3SqlStmt(p, SQL_SELECT_ALL_LANGID, &pAllLangid, 0);
-  }
+  rc = fts3SqlStmt(p, SQL_SELECT_ALL_LANGID, &pAllLangid, 0);
  if( rc==SQLITE_OK ){
    int rc2;
    sqlite3_bind_int(pAllLangid, 1, p->iPrevLangid);
@@ -3517,6 +3503,7 @@ static int fts3DoOptimize(Fts3Table *p, int bReturnDone){
  }

  sqlite3Fts3SegmentsClose(p);
+  sqlite3Fts3PendingTermsClear(p);

  return (rc==SQLITE_OK && bReturnDone && bSeenDone) ? SQLITE_DONE : rc;
 }
@@ -3810,14 +3797,14 @@ static int nodeReaderInit(NodeReader *p, const char *aNode, int nNode){
  p->nNode = nNode;

  /* Figure out if this is a leaf or an internal node. */
-  if( aNode && aNode[0] ){
+  if( p->aNode[0] ){
    /* An internal node. */
    p->iOff = 1 + sqlite3Fts3GetVarint(&p->aNode[1], &p->iChild);
  }else{
    p->iOff = 1;
  }

-  return aNode ? nodeReaderNext(p) : SQLITE_OK;
+  return nodeReaderNext(p);
 }

 /*
@@ -3854,7 +3841,6 @@ static int fts3IncrmergePush(
    ** be added to.  */
    nPrefix = fts3PrefixCompress(pNode->key.a, pNode->key.n, zTerm, nTerm);
    nSuffix = nTerm - nPrefix;
-    if(nSuffix<=0 ) return FTS_CORRUPT_VTAB;
    nSpace  = sqlite3Fts3VarintLen(nPrefix);
    nSpace += sqlite3Fts3VarintLen(nSuffix) + nSuffix;

@@ -4249,10 +4235,6 @@ static int fts3IncrmergeLoad(
      pWriter->bNoLeafData = (pWriter->nLeafData==0);
      nRoot = sqlite3_column_bytes(pSelect, 4);
      aRoot = sqlite3_column_blob(pSelect, 4);
-      if( aRoot==0 ){
-        sqlite3_reset(pSelect);
-        return nRoot ? SQLITE_NOMEM : FTS_CORRUPT_VTAB;
-      }
    }else{
      return sqlite3_reset(pSelect);
    }
@@ -4288,10 +4270,6 @@ static int fts3IncrmergeLoad(
      int i;
      int nHeight = (int)aRoot[0];
      NodeWriter *pNode;
-      if( nHeight<1 || nHeight>FTS_MAX_APPENDABLE_HEIGHT ){
-        sqlite3_reset(pSelect);
-        return FTS_CORRUPT_VTAB;
-      }

      pWriter->nLeafEst = (int)((iEnd - iStart) + 1)/FTS_MAX_APPENDABLE_HEIGHT;
      pWriter->iStart = iStart;
@@ -4318,8 +4296,8 @@ static int fts3IncrmergeLoad(
        NodeReader reader;
        pNode = &pWriter->aNodeWriter[i];

-        if( pNode->block.a){
-          rc = nodeReaderInit(&reader, pNode->block.a, pNode->block.n);
+        rc = nodeReaderInit(&reader, pNode->block.a, pNode->block.n);
+        if( reader.aNode ){
          while( reader.aNode && rc==SQLITE_OK ) rc = nodeReaderNext(&reader);
          blobGrowBuffer(&pNode->key, reader.term.n, &rc);
          if( rc==SQLITE_OK ){
@@ -4852,17 +4830,13 @@ static int fts3IncrmergeHintPop(Blob *pHint, i64 *piAbsLevel, int *pnInput){
  const int nHint = pHint->n;
  int i;

-  i = pHint->n-1;
-  if( (pHint->a[i] & 0x80) ) return FTS_CORRUPT_VTAB;
+  i = pHint->n-2;
  while( i>0 && (pHint->a[i-1] & 0x80) ) i--;
-  if( i==0 ) return FTS_CORRUPT_VTAB;
-  i--;
  while( i>0 && (pHint->a[i-1] & 0x80) ) i--;

  pHint->n = i;
  i += sqlite3Fts3GetVarint(&pHint->a[i], piAbsLevel);
  i += fts3GetVarint32(&pHint->a[i], pnInput);
-  assert( i<=nHint );
  if( i!=nHint ) return FTS_CORRUPT_VTAB;

  return SQLITE_OK;
@@ -4932,14 +4906,8 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){

      rc = fts3IncrmergeHintPop(&hint, &iHintAbsLevel, &nHintSeg);
      if( nSeg<0 || (iAbsLevel % nMod) >= (iHintAbsLevel % nMod) ){
-        /* Based on the scan in the block above, it is known that there
-        ** are no levels with a relative level smaller than that of
-        ** iAbsLevel with more than nSeg segments, or if nSeg is -1, 
-        ** no levels with more than nMin segments. Use this to limit the
-        ** value of nHintSeg to avoid a large memory allocation in case the 
-        ** merge-hint is corrupt*/
        iAbsLevel = iHintAbsLevel;
-        nSeg = MIN(MAX(nMin,nSeg), nHintSeg);
+        nSeg = nHintSeg;
        bUseHint = 1;
        bDirtyHint = 1;
      }else{
@@ -4952,13 +4920,7 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
    /* If nSeg is less that zero, then there is no level with at least
    ** nMin segments and no hint in the %_stat table. No work to do.
    ** Exit early in this case.  */
-    if( nSeg<=0 ) break;
-
-    assert( nMod<=0x7FFFFFFF );
-    if( iAbsLevel<0 || iAbsLevel>(nMod<<32) ){
-      rc = FTS_CORRUPT_VTAB;
-      break;
-    }
+    if( nSeg<0 ) break;

    /* Open a cursor to iterate through the contents of the oldest nSeg 
    ** indexes of absolute level iAbsLevel. If this cursor is opened using 
@@ -4986,15 +4948,8 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){
    }
    if( SQLITE_OK==rc && pCsr->nSegment==nSeg
     && SQLITE_OK==(rc = sqlite3Fts3SegReaderStart(p, pCsr, pFilter))
+     && SQLITE_ROW==(rc = sqlite3Fts3SegReaderStep(p, pCsr))
    ){
-      int bEmpty = 0;
-      rc = sqlite3Fts3SegReaderStep(p, pCsr);
-      if( rc==SQLITE_OK ){
-        bEmpty = 1;
-      }else if( rc!=SQLITE_ROW ){
-        sqlite3Fts3SegReaderFinish(pCsr);
-        break;
-      }
      if( bUseHint && iIdx>0 ){
        const char *zKey = pCsr->zTerm;
        int nKey = pCsr->nTerm;
@@ -5005,13 +4960,11 @@ int sqlite3Fts3Incrmerge(Fts3Table *p, int nMerge, int nMin){

      if( rc==SQLITE_OK && pWriter->nLeafEst ){
        fts3LogMerge(nSeg, iAbsLevel);
-        if( bEmpty==0 ){
-          do {
-            rc = fts3IncrmergeAppend(p, pWriter, pCsr);
-            if( rc==SQLITE_OK ) rc = sqlite3Fts3SegReaderStep(p, pCsr);
-            if( pWriter->nWork>=nRem && rc==SQLITE_ROW ) rc = SQLITE_OK;
-          }while( rc==SQLITE_ROW );
-        }
+        do {
+          rc = fts3IncrmergeAppend(p, pWriter, pCsr);
+          if( rc==SQLITE_OK ) rc = sqlite3Fts3SegReaderStep(p, pCsr);
+          if( pWriter->nWork>=nRem && rc==SQLITE_ROW ) rc = SQLITE_OK;
+        }while( rc==SQLITE_ROW );

        /* Update or delete the input segments */
        if( rc==SQLITE_OK ){
@@ -5076,7 +5029,7 @@ static int fts3DoIncrmerge(
  const char *zParam              /* Nul-terminated string containing "A,B" */
 ){
  int rc;
-  int nMin = (MergeCount(p) / 2);
+  int nMin = (FTS3_MERGE_COUNT / 2);
  int nMerge = 0;
  const char *z = zParam;

@@ -5121,7 +5074,7 @@ static int fts3DoAutoincrmerge(
  int rc = SQLITE_OK;
  sqlite3_stmt *pStmt = 0;
  p->nAutoincrmerge = fts3Getint(&zParam);
-  if( p->nAutoincrmerge==1 || p->nAutoincrmerge>MergeCount(p) ){
+  if( p->nAutoincrmerge==1 || p->nAutoincrmerge>FTS3_MERGE_COUNT ){
    p->nAutoincrmerge = 8;
  }
  if( !p->bHasStat ){
@@ -5204,12 +5157,12 @@ static u64 fts3ChecksumIndex(

      i64 iDocid = 0;
      i64 iCol = 0;
-      u64 iPos = 0;
+      i64 iPos = 0;

      pCsr += sqlite3Fts3GetVarint(pCsr, &iDocid);
      while( pCsr<pEnd ){
-        u64 iVal = 0;
-        pCsr += sqlite3Fts3GetVarintU(pCsr, &iVal);
+        i64 iVal = 0;
+        pCsr += sqlite3Fts3GetVarint(pCsr, &iVal);
        if( pCsr<pEnd ){
          if( iVal==0 || iVal==1 ){
            iCol = 0;
@@ -5217,12 +5170,8 @@ static u64 fts3ChecksumIndex(
            if( iVal ){
              pCsr += sqlite3Fts3GetVarint(pCsr, &iCol);
            }else{
-              pCsr += sqlite3Fts3GetVarintU(pCsr, &iVal);
-              if( p->bDescIdx ){
-                iDocid = (i64)((u64)iDocid - iVal);
-              }else{
-                iDocid = (i64)((u64)iDocid + iVal);
-              }
+              pCsr += sqlite3Fts3GetVarint(pCsr, &iVal);
+              iDocid += iVal;
            }
          }else{
            iPos += (iVal - 2);
@@ -5295,9 +5244,10 @@ static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){
      for(iCol=0; rc==SQLITE_OK && iCol<p->nColumn; iCol++){
        if( p->abNotindexed[iCol]==0 ){
          const char *zText = (const char *)sqlite3_column_text(pStmt, iCol+1);
+          int nText = sqlite3_column_bytes(pStmt, iCol+1);
          sqlite3_tokenizer_cursor *pT = 0;

-          rc = sqlite3Fts3OpenTokenizer(p->pTokenizer, iLang, zText, -1, &pT);
+          rc = sqlite3Fts3OpenTokenizer(p->pTokenizer, iLang, zText, nText,&pT);
          while( rc==SQLITE_OK ){
            char const *zToken;       /* Buffer containing token */
            int nToken = 0;           /* Number of bytes in token */
@@ -5382,7 +5332,7 @@ static int fts3DoIntegrityCheck(
 ** meaningful value to insert is the text 'optimize'.
 */
 static int fts3SpecialInsert(Fts3Table *p, sqlite3_value *pVal){
-  int rc = SQLITE_ERROR;           /* Return Code */
+  int rc;                         /* Return Code */
  const char *zVal = (const char *)sqlite3_value_text(pVal);
  int nVal = sqlite3_value_bytes(pVal);

@@ -5398,27 +5348,21 @@ static int fts3SpecialInsert(Fts3Table *p, sqlite3_value *pVal){
    rc = fts3DoIncrmerge(p, &zVal[6]);
  }else if( nVal>10 && 0==sqlite3_strnicmp(zVal, "automerge=", 10) ){
    rc = fts3DoAutoincrmerge(p, &zVal[10]);
-#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
-  }else{
-    int v;
-    if( nVal>9 && 0==sqlite3_strnicmp(zVal, "nodesize=", 9) ){
-      v = atoi(&zVal[9]);
-      if( v>=24 && v<=p->nPgsz-35 ) p->nNodeSize = v;
-      rc = SQLITE_OK;
-    }else if( nVal>11 && 0==sqlite3_strnicmp(zVal, "maxpending=", 9) ){
-      v = atoi(&zVal[11]);
-      if( v>=64 && v<=FTS3_MAX_PENDING_DATA ) p->nMaxPendingData = v;
-      rc = SQLITE_OK;
-    }else if( nVal>21 && 0==sqlite3_strnicmp(zVal,"test-no-incr-doclist=",21) ){
-      p->bNoIncrDoclist = atoi(&zVal[21]);
-      rc = SQLITE_OK;
-    }else if( nVal>11 && 0==sqlite3_strnicmp(zVal,"mergecount=",11) ){
-      v = atoi(&zVal[11]);
-      if( v>=4 && v<=FTS3_MERGE_COUNT && (v&1)==0 ) p->nMergeCount = v;
-      rc = SQLITE_OK;
-    }
+#ifdef SQLITE_TEST
+  }else if( nVal>9 && 0==sqlite3_strnicmp(zVal, "nodesize=", 9) ){
+    p->nNodeSize = atoi(&zVal[9]);
+    rc = SQLITE_OK;
+  }else if( nVal>11 && 0==sqlite3_strnicmp(zVal, "maxpending=", 9) ){
+    p->nMaxPendingData = atoi(&zVal[11]);
+    rc = SQLITE_OK;
+  }else if( nVal>21 && 0==sqlite3_strnicmp(zVal, "test-no-incr-doclist=", 21) ){
+    p->bNoIncrDoclist = atoi(&zVal[21]);
+    rc = SQLITE_OK;
 #endif
+  }else{
+    rc = SQLITE_ERROR;
  }
+
  return rc;
 }

@@ -159,7 +159,7 @@ struct Fts5PhraseIter {
 **
 ** xSetAuxdata(pFts5, pAux, xDelete)
 **
-**   Save the pointer passed as the second argument as the extension function's 
+**   Save the pointer passed as the second argument as the extension functions 
 **   "auxiliary data". The pointer may then be retrieved by the current or any
 **   future invocation of the same fts5 extension function made as part of
 **   the same MATCH query using the xGetAuxdata() API.
@@ -401,8 +401,8 @@ struct Fts5ExtensionApi {
 **
 **   There are several ways to approach this in FTS5:
 **
-**   <ol><li> By mapping all synonyms to a single token. In this case, using
-**            the above example, this means that the tokenizer returns the
+**   <ol><li> By mapping all synonyms to a single token. In this case, the 
+**            In the above example, this means that the tokenizer returns the
 **            same token for inputs "first" and "1st". Say that token is in
 **            fact "first", so that when the user inserts the document "I won
 **            1st place" entries are added to the index for tokens "i", "won",
@@ -61,11 +61,6 @@ typedef sqlite3_uint64 u64;
 */
 #define FTS5_MAX_PREFIX_INDEXES 31

-/*
-** Maximum segments permitted in a single index 
-*/
-#define FTS5_MAX_SEGMENT 2000
-
 #define FTS5_DEFAULT_NEARDIST 10
 #define FTS5_DEFAULT_RANK     "bm25"

@@ -422,11 +417,6 @@ int sqlite3Fts5IterNextFrom(Fts5IndexIter*, i64 iMatch);
 */
 void sqlite3Fts5IterClose(Fts5IndexIter*);

-/*
-** Close the reader blob handle, if it is open.
-*/
-void sqlite3Fts5IndexCloseReader(Fts5Index*);
-
 /*
 ** This interface is used by the fts5vocab module.
 */
@@ -705,7 +695,6 @@ int sqlite3Fts5ExprEof(Fts5Expr*);
 i64 sqlite3Fts5ExprRowid(Fts5Expr*);

 void sqlite3Fts5ExprFree(Fts5Expr*);
-int sqlite3Fts5ExprAnd(Fts5Expr **pp1, Fts5Expr *p2);

 /* Called during startup to register a UDF with SQLite */
 int sqlite3Fts5ExprInit(Fts5Global*, sqlite3*);
@@ -23,7 +23,7 @@
 #define FTS5_DEFAULT_HASHSIZE    (1024*1024)

 /* Maximum allowed page size */
-#define FTS5_MAX_PAGE_SIZE (64*1024)
+#define FTS5_MAX_PAGE_SIZE (128*1024)

 static int fts5_iswhitespace(char x){
  return (x==' ');
@@ -150,7 +150,7 @@ static int fts5Dequote(char *z){
  assert( q=='[' || q=='\'' || q=='"' || q=='`' );
  if( q=='[' ) q = ']';  

-  while( z[iIn] ){
+  while( ALWAYS(z[iIn]) ){
    if( z[iIn]==q ){
      if( z[iIn+1]!=q ){
        /* Character iIn was the close quote. */
@@ -683,7 +683,7 @@ int sqlite3Fts5ConfigDeclareVtab(Fts5Config *pConfig){
    rc = sqlite3_declare_vtab(pConfig->db, zSql);
    sqlite3_free(zSql);
  }
- 
+  
  return rc;
 }

@@ -828,7 +828,7 @@ int sqlite3Fts5ConfigSetValue(
    if( SQLITE_INTEGER==sqlite3_value_numeric_type(pVal) ){
      pgsz = sqlite3_value_int(pVal);
    }
-    if( pgsz<32 || pgsz>FTS5_MAX_PAGE_SIZE ){
+    if( pgsz<=0 || pgsz>FTS5_MAX_PAGE_SIZE ){
      *pbBadkey = 1;
    }else{
      pConfig->pgsz = pgsz;
@@ -881,7 +881,6 @@ int sqlite3Fts5ConfigSetValue(
      *pbBadkey = 1;
    }else{
      if( nCrisisMerge<=1 ) nCrisisMerge = FTS5_DEFAULT_CRISISMERGE;
-      if( nCrisisMerge>=FTS5_MAX_SEGMENT ) nCrisisMerge = FTS5_MAX_SEGMENT-1;
      pConfig->nCrisisMerge = nCrisisMerge;
    }
  }
@@ -309,42 +309,6 @@ void sqlite3Fts5ExprFree(Fts5Expr *p){
  }
 }

-int sqlite3Fts5ExprAnd(Fts5Expr **pp1, Fts5Expr *p2){
-  Fts5Parse sParse;
-  memset(&sParse, 0, sizeof(sParse));
-
-  if( *pp1 ){
-    Fts5Expr *p1 = *pp1;
-    int nPhrase = p1->nPhrase + p2->nPhrase;
-
-    p1->pRoot = sqlite3Fts5ParseNode(&sParse, FTS5_AND, p1->pRoot, p2->pRoot,0);
-    p2->pRoot = 0;
-
-    if( sParse.rc==SQLITE_OK ){
-      Fts5ExprPhrase **ap = (Fts5ExprPhrase**)sqlite3_realloc(
-          p1->apExprPhrase, nPhrase * sizeof(Fts5ExprPhrase*)
-      );
-      if( ap==0 ){
-        sParse.rc = SQLITE_NOMEM;
-      }else{
-        int i;
-        memmove(&ap[p2->nPhrase], ap, p1->nPhrase*sizeof(Fts5ExprPhrase*));
-        for(i=0; i<p2->nPhrase; i++){
-          ap[i] = p2->apExprPhrase[i];
-        }
-        p1->nPhrase = nPhrase;
-        p1->apExprPhrase = ap;
-      }
-    }
-    sqlite3_free(p2->apExprPhrase);
-    sqlite3_free(p2);
-  }else{
-    *pp1 = p2;
-  }
-
-  return sParse.rc;
-}
-
 /*
 ** Argument pTerm must be a synonym iterator. Return the current rowid
 ** that it points to.
@@ -2516,12 +2480,10 @@ static void fts5ExprFunction(
  azConfig[1] = "main";
  azConfig[2] = "tbl";
  for(i=3; iArg<nArg; iArg++){
-    const char *z = (const char*)sqlite3_value_text(apVal[iArg]);
-    azConfig[i++] = (z ? z : "");
+    azConfig[i++] = (const char*)sqlite3_value_text(apVal[iArg]);
  }

  zExpr = (const char*)sqlite3_value_text(apVal[0]);
-  if( zExpr==0 ) zExpr = "";

  rc = sqlite3Fts5ConfigParse(pGlobal, db, nConfig, azConfig, &pConfig, &zErr);
  if( rc==SQLITE_OK ){
@@ -239,6 +239,11 @@
 #define FTS5_SEGMENT_ROWID(segid, pgno)       fts5_dri(segid, 0, 0, pgno)
 #define FTS5_DLIDX_ROWID(segid, height, pgno) fts5_dri(segid, 1, height, pgno)

+/*
+** Maximum segments permitted in a single index 
+*/
+#define FTS5_MAX_SEGMENT 2000
+
 #ifdef SQLITE_DEBUG
 int sqlite3Fts5Corrupt() { return SQLITE_CORRUPT_VTAB; }
 #endif
@@ -614,7 +619,7 @@ static int fts5LeafFirstTermOff(Fts5Data *pLeaf){
 /*
 ** Close the read-only blob handle, if it is open.
 */
-void sqlite3Fts5IndexCloseReader(Fts5Index *p){
+static void fts5CloseReader(Fts5Index *p){
  if( p->pReader ){
    sqlite3_blob *pReader = p->pReader;
    p->pReader = 0;
@@ -643,7 +648,7 @@ static Fts5Data *fts5DataRead(Fts5Index *p, i64 iRowid){
      assert( p->pReader==0 );
      p->pReader = pBlob;
      if( rc!=SQLITE_OK ){
-        sqlite3Fts5IndexCloseReader(p);
+        fts5CloseReader(p);
      }
      if( rc==SQLITE_ABORT ) rc = SQLITE_OK;
    }
@@ -708,7 +713,7 @@ static void fts5DataRelease(Fts5Data *pData){
 static Fts5Data *fts5LeafRead(Fts5Index *p, i64 iRowid){
  Fts5Data *pRet = fts5DataRead(p, iRowid);
  if( pRet ){
-    if( pRet->nn<4 || pRet->szLeaf>pRet->nn ){
+    if( pRet->szLeaf>pRet->nn ){
      p->rc = FTS5_CORRUPT;
      fts5DataRelease(pRet);
      pRet = 0;
@@ -4992,12 +4997,9 @@ static void fts5MergePrefixLists(
        Fts5PoslistWriter writer;
        memset(&writer, 0, sizeof(writer));

-        /* See the earlier comment in this function for an explanation of why
-        ** corrupt input position lists might cause the output to consume
-        ** at most 20 bytes of unexpected space. */
        fts5MergeAppendDocid(&out, iLastRowid, i2.iRowid);
        fts5BufferZero(&tmp);
-        sqlite3Fts5BufferSize(&p->rc, &tmp, i1.nPoslist + i2.nPoslist + 10 + 10);
+        sqlite3Fts5BufferSize(&p->rc, &tmp, i1.nPoslist + i2.nPoslist);
        if( p->rc ) break;

        sqlite3Fts5PoslistNext64(a1, i1.nPoslist, &iOff1, &iPos1);
@@ -5045,12 +5047,6 @@ static void fts5MergePrefixLists(
        }

        /* WRITEPOSLISTSIZE */
-        assert_nc( tmp.n<=i1.nPoslist+i2.nPoslist );
-        assert( tmp.n<=i1.nPoslist+i2.nPoslist+10+10 );
-        if( tmp.n>i1.nPoslist+i2.nPoslist ){
-          if( p->rc==SQLITE_OK ) p->rc = FTS5_CORRUPT;
-          break;
-        }
        fts5BufferSafeAppendVarint(&out, tmp.n * 2);
        fts5BufferSafeAppendBlob(&out, tmp.p, tmp.n);
        fts5DoclistIterNext(&i1);
@@ -5204,7 +5200,7 @@ int sqlite3Fts5IndexBeginWrite(Fts5Index *p, int bDelete, i64 iRowid){
 int sqlite3Fts5IndexSync(Fts5Index *p){
  assert( p->rc==SQLITE_OK );
  fts5IndexFlush(p);
-  sqlite3Fts5IndexCloseReader(p);
+  fts5CloseReader(p);
  return fts5IndexReturn(p);
 }

@@ -5215,7 +5211,7 @@ int sqlite3Fts5IndexSync(Fts5Index *p){
 ** records must be invalidated.
 */
 int sqlite3Fts5IndexRollback(Fts5Index *p){
-  sqlite3Fts5IndexCloseReader(p);
+  fts5CloseReader(p);
  fts5IndexDiscardData(p);
  fts5StructureInvalidate(p);
  /* assert( p->rc==SQLITE_OK ); */
@@ -5230,7 +5226,6 @@ int sqlite3Fts5IndexRollback(Fts5Index *p){
 int sqlite3Fts5IndexReinit(Fts5Index *p){
  Fts5Structure s;
  fts5StructureInvalidate(p);
-  fts5IndexDiscardData(p);
  memset(&s, 0, sizeof(Fts5Structure));
  fts5DataWrite(p, FTS5_AVERAGES_ROWID, (const u8*)"", 0);
  fts5StructureWrite(p, &s);
@@ -5318,13 +5313,9 @@ int sqlite3Fts5IndexCharlenToBytelen(
  for(i=0; i<nChar; i++){
    if( n>=nByte ) return 0;      /* Input contains fewer than nChar chars */
    if( (unsigned char)p[n++]>=0xc0 ){
-      if( n>=nByte ) return 0;
      while( (p[n] & 0xc0)==0x80 ){
        n++;
-        if( n>=nByte ){
-          if( i+1==nChar ) break;
-          return 0;
-        }
+        if( n>=nByte ) break;
      }
    }
  }
@@ -5460,7 +5451,7 @@ int sqlite3Fts5IndexQuery(
    if( p->rc ){
      sqlite3Fts5IterClose((Fts5IndexIter*)pRet);
      pRet = 0;
-      sqlite3Fts5IndexCloseReader(p);
+      fts5CloseReader(p);
    }

    *ppIter = (Fts5IndexIter*)pRet;
@@ -5533,7 +5524,7 @@ void sqlite3Fts5IterClose(Fts5IndexIter *pIndexIter){
    Fts5Iter *pIter = (Fts5Iter*)pIndexIter;
    Fts5Index *pIndex = pIter->pIndex;
    fts5MultiIterFree(pIter);
-    sqlite3Fts5IndexCloseReader(pIndex);
+    fts5CloseReader(pIndex);
  }
 }

@@ -5726,37 +5717,6 @@ static int fts5QueryCksum(
  return rc;
 }

-/*
-** Check if buffer z[], size n bytes, contains as series of valid utf-8
-** encoded codepoints. If so, return 0. Otherwise, if the buffer does not
-** contain valid utf-8, return non-zero.
-*/
-static int fts5TestUtf8(const char *z, int n){
-  int i = 0;
-  assert_nc( n>0 );
-  while( i<n ){
-    if( (z[i] & 0x80)==0x00 ){
-      i++;
-    }else
-    if( (z[i] & 0xE0)==0xC0 ){
-      if( i+1>=n || (z[i+1] & 0xC0)!=0x80 ) return 1;
-      i += 2;
-    }else
-    if( (z[i] & 0xF0)==0xE0 ){
-      if( i+2>=n || (z[i+1] & 0xC0)!=0x80 || (z[i+2] & 0xC0)!=0x80 ) return 1;
-      i += 3;
-    }else
-    if( (z[i] & 0xF8)==0xF0 ){
-      if( i+3>=n || (z[i+1] & 0xC0)!=0x80 || (z[i+2] & 0xC0)!=0x80 ) return 1;
-      if( (z[i+2] & 0xC0)!=0x80 ) return 1;
-      i += 3;
-    }else{
-      return 1;
-    }
-  }
-
-  return 0;
-}

 /*
 ** This function is also purely an internal test. It does not contribute to 
@@ -5797,14 +5757,8 @@ static void fts5TestTerm(
    ** This check may only be performed if the hash table is empty. This
    ** is because the hash table only supports a single scan query at
    ** a time, and the multi-iter loop from which this function is called
-    ** is already performing such a scan. 
-    **
-    ** Also only do this if buffer zTerm contains nTerm bytes of valid
-    ** utf-8. Otherwise, the last part of the buffer contents might contain
-    ** a non-utf-8 sequence that happens to be a prefix of a valid utf-8
-    ** character stored in the main fts index, which will cause the
-    ** test to fail.  */
-    if( p->nPendingData==0 && 0==fts5TestUtf8(zTerm, nTerm) ){
+    ** is already performing such a scan. */
+    if( p->nPendingData==0 ){
      if( iIdx>0 && rc==SQLITE_OK ){
        int f = flags|FTS5INDEX_QUERY_TEST_NOIDX;
        ck2 = 0;
@@ -5927,8 +5881,7 @@ static void fts5IndexIntegrityCheckSegment(
  if( pSeg->pgnoFirst==0 ) return;

  fts5IndexPrepareStmt(p, &pStmt, sqlite3_mprintf(
-      "SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d "
-      "ORDER BY 1, 2",
+      "SELECT segid, term, (pgno>>1), (pgno&1) FROM %Q.'%q_idx' WHERE segid=%d",
      pConfig->zDb, pConfig->zName, pSeg->iSegid
  ));

@@ -5937,8 +5890,8 @@ static void fts5IndexIntegrityCheckSegment(
    i64 iRow;                     /* Rowid for this leaf */
    Fts5Data *pLeaf;              /* Data for this leaf */

-    const char *zIdxTerm = (const char*)sqlite3_column_blob(pStmt, 1);
    int nIdxTerm = sqlite3_column_bytes(pStmt, 1);
+    const char *zIdxTerm = (const char*)sqlite3_column_text(pStmt, 1);
    int iIdxLeaf = sqlite3_column_int(pStmt, 2);
    int bIdxDlidx = sqlite3_column_int(pStmt, 3);

@@ -289,10 +289,7 @@ static void fts5CheckTransactionState(Fts5FullTable *p, int op, int iSavepoint){
    case FTS5_ROLLBACKTO:
      assert( p->ts.eState==1 );
      assert( iSavepoint>=-1 );
-      /* The following assert() can fail if another vtab strikes an error
-      ** within an xSavepoint() call then SQLite calls xRollbackTo() - without
-      ** having called xSavepoint() on this vtab.  */
-      /* assert( iSavepoint<=p->ts.iSavepoint ); */
+      assert( iSavepoint<=p->ts.iSavepoint );
      p->ts.iSavepoint = iSavepoint;
      break;
  }
@@ -468,39 +465,17 @@ static void fts5SetUniqueFlag(sqlite3_index_info *pIdxInfo){
 ** Implementation of the xBestIndex method for FTS5 tables. Within the 
 ** WHERE constraint, it searches for the following:
 **
-**   1. A MATCH constraint against the table column.
+**   1. A MATCH constraint against the special column.
 **   2. A MATCH constraint against the "rank" column.
-**   3. A MATCH constraint against some other column.
-**   4. An == constraint against the rowid column.
-**   5. A < or <= constraint against the rowid column.
-**   6. A > or >= constraint against the rowid column.
+**   3. An == constraint against the rowid column.
+**   4. A < or <= constraint against the rowid column.
+**   5. A > or >= constraint against the rowid column.
 **
-** Within the ORDER BY, the following are supported:
+** Within the ORDER BY, either:
 **
 **   5. ORDER BY rank [ASC|DESC]
 **   6. ORDER BY rowid [ASC|DESC]
 **
-** Information for the xFilter call is passed via both the idxNum and 
-** idxStr variables. Specifically, idxNum is a bitmask of the following
-** flags used to encode the ORDER BY clause:
-**
-**     FTS5_BI_ORDER_RANK
-**     FTS5_BI_ORDER_ROWID
-**     FTS5_BI_ORDER_DESC
-**
-** idxStr is used to encode data from the WHERE clause. For each argument
-** passed to the xFilter method, the following is appended to idxStr:
-**
-**   Match against table column:            "m"
-**   Match against rank column:             "r"
-**   Match against other column:            "<column-number>"
-**   Equality constraint against the rowid: "="
-**   A < or <= against the rowid:           "<"
-**   A > or >= against the rowid:           ">"
-**
-** This function ensures that there is at most one "r" or "=". And that if
-** there exists an "=" then there is no "<" or ">".
-**
 ** Costs are assigned as follows:
 **
 **  a) If an unusable MATCH operator is present in the WHERE clause, the
@@ -528,18 +503,32 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
  Fts5Config *pConfig = pTab->pConfig;
  const int nCol = pConfig->nCol;
  int idxFlags = 0;               /* Parameter passed through to xFilter() */
+  int bHasMatch;
+  int iNext;
  int i;

-  char *idxStr;
-  int iIdxStr = 0;
-  int iCons = 0;
-
-  int bSeenEq = 0;
-  int bSeenGt = 0;
-  int bSeenLt = 0;
-  int bSeenMatch = 0;
-  int bSeenRank = 0;
+  struct Constraint {
+    int op;                       /* Mask against sqlite3_index_constraint.op */
+    int fts5op;                   /* FTS5 mask for idxFlags */
+    int iCol;                     /* 0==rowid, 1==tbl, 2==rank */
+    int omit;                     /* True to omit this if found */
+    int iConsIndex;               /* Index in pInfo->aConstraint[] */
+  } aConstraint[] = {
+    {SQLITE_INDEX_CONSTRAINT_MATCH|SQLITE_INDEX_CONSTRAINT_EQ, 
+                                    FTS5_BI_MATCH,    1, 1, -1},
+    {SQLITE_INDEX_CONSTRAINT_MATCH|SQLITE_INDEX_CONSTRAINT_EQ, 
+                                    FTS5_BI_RANK,     2, 1, -1},
+    {SQLITE_INDEX_CONSTRAINT_EQ,    FTS5_BI_ROWID_EQ, 0, 0, -1},
+    {SQLITE_INDEX_CONSTRAINT_LT|SQLITE_INDEX_CONSTRAINT_LE, 
+                                    FTS5_BI_ROWID_LE, 0, 0, -1},
+    {SQLITE_INDEX_CONSTRAINT_GT|SQLITE_INDEX_CONSTRAINT_GE, 
+                                    FTS5_BI_ROWID_GE, 0, 0, -1},
+  };

+  int aColMap[3];
+  aColMap[0] = -1;
+  aColMap[1] = nCol;
+  aColMap[2] = nCol+1;

  assert( SQLITE_INDEX_CONSTRAINT_EQ<SQLITE_INDEX_CONSTRAINT_MATCH );
  assert( SQLITE_INDEX_CONSTRAINT_GT<SQLITE_INDEX_CONSTRAINT_MATCH );
@@ -554,78 +543,40 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
    return SQLITE_ERROR;
  }

-  idxStr = (char*)sqlite3_malloc(pInfo->nConstraint * 6 + 1);
-  if( idxStr==0 ) return SQLITE_NOMEM;
-  pInfo->idxStr = idxStr;
-  pInfo->needToFreeIdxStr = 1;
-
+  /* Set idxFlags flags for all WHERE clause terms that will be used. */
  for(i=0; i<pInfo->nConstraint; i++){
    struct sqlite3_index_constraint *p = &pInfo->aConstraint[i];
    int iCol = p->iColumn;
-    if( p->op==SQLITE_INDEX_CONSTRAINT_MATCH
-     || (p->op==SQLITE_INDEX_CONSTRAINT_EQ && iCol>=nCol)
+
+    if( (p->op==SQLITE_INDEX_CONSTRAINT_MATCH && iCol>=0 && iCol<=nCol)
+     || (p->op==SQLITE_INDEX_CONSTRAINT_EQ && iCol==nCol)
    ){
      /* A MATCH operator or equivalent */
-      if( p->usable==0 || iCol<0 ){
+      if( p->usable ){
+        idxFlags = (idxFlags & 0xFFFF) | FTS5_BI_MATCH | (iCol << 16);
+        aConstraint[0].iConsIndex = i;
+      }else{
        /* As there exists an unusable MATCH constraint this is an 
        ** unusable plan. Set a prohibitively high cost. */
        pInfo->estimatedCost = 1e50;
-        assert( iIdxStr < pInfo->nConstraint*6 + 1 );
-        idxStr[iIdxStr] = 0;
        return SQLITE_OK;
-      }else{
-        if( iCol==nCol+1 ){
-          if( bSeenRank ) continue;
-          idxStr[iIdxStr++] = 'r';
-          bSeenRank = 1;
-        }else{
-          bSeenMatch = 1;
-          idxStr[iIdxStr++] = 'm';
-          if( iCol<nCol ){
-            sqlite3_snprintf(6, &idxStr[iIdxStr], "%d", iCol);
-            idxStr += strlen(&idxStr[iIdxStr]);
-            assert( idxStr[iIdxStr]=='\0' );
-          }
-        }
-        pInfo->aConstraintUsage[i].argvIndex = ++iCons;
-        pInfo->aConstraintUsage[i].omit = 1;
      }
-    }
-    else if( p->usable && bSeenEq==0 
-      && p->op==SQLITE_INDEX_CONSTRAINT_EQ && iCol<0 
-    ){
-      idxStr[iIdxStr++] = '=';
-      bSeenEq = 1;
-      pInfo->aConstraintUsage[i].argvIndex = ++iCons;
-    }
-  }
-
-  if( bSeenEq==0 ){
-    for(i=0; i<pInfo->nConstraint; i++){
-      struct sqlite3_index_constraint *p = &pInfo->aConstraint[i];
-      if( p->iColumn<0 && p->usable ){
-        int op = p->op;
-        if( op==SQLITE_INDEX_CONSTRAINT_LT || op==SQLITE_INDEX_CONSTRAINT_LE ){
-          if( bSeenLt ) continue;
-          idxStr[iIdxStr++] = '<';
-          pInfo->aConstraintUsage[i].argvIndex = ++iCons;
-          bSeenLt = 1;
-        }else
-        if( op==SQLITE_INDEX_CONSTRAINT_GT || op==SQLITE_INDEX_CONSTRAINT_GE ){
-          if( bSeenGt ) continue;
-          idxStr[iIdxStr++] = '>';
-          pInfo->aConstraintUsage[i].argvIndex = ++iCons;
-          bSeenGt = 1;
+    }else if( p->op<=SQLITE_INDEX_CONSTRAINT_MATCH ){
+      int j;
+      for(j=1; j<ArraySize(aConstraint); j++){
+        struct Constraint *pC = &aConstraint[j];
+        if( iCol==aColMap[pC->iCol] && (p->op & pC->op) && p->usable ){
+          pC->iConsIndex = i;
+          idxFlags |= pC->fts5op;
        }
      }
    }
  }
-  idxStr[iIdxStr] = '\0';

  /* Set idxFlags flags for the ORDER BY clause */
  if( pInfo->nOrderBy==1 ){
    int iSort = pInfo->aOrderBy[0].iColumn;
-    if( iSort==(pConfig->nCol+1) && bSeenMatch ){
+    if( iSort==(pConfig->nCol+1) && BitFlagTest(idxFlags, FTS5_BI_MATCH) ){
      idxFlags |= FTS5_BI_ORDER_RANK;
    }else if( iSort==-1 ){
      idxFlags |= FTS5_BI_ORDER_ROWID;
@@ -639,15 +590,26 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
  }

  /* Calculate the estimated cost based on the flags set in idxFlags. */
-  if( bSeenEq ){
-    pInfo->estimatedCost = bSeenMatch ? 100.0 : 10.0;
-    if( bSeenMatch==0 ) fts5SetUniqueFlag(pInfo);
-  }else if( bSeenLt && bSeenGt ){
-    pInfo->estimatedCost = bSeenMatch ? 500.0 : 250000.0;
-  }else if( bSeenLt || bSeenGt ){
-    pInfo->estimatedCost = bSeenMatch ? 750.0 : 750000.0;
+  bHasMatch = BitFlagTest(idxFlags, FTS5_BI_MATCH);
+  if( BitFlagTest(idxFlags, FTS5_BI_ROWID_EQ) ){
+    pInfo->estimatedCost = bHasMatch ? 100.0 : 10.0;
+    if( bHasMatch==0 ) fts5SetUniqueFlag(pInfo);
+  }else if( BitFlagAllTest(idxFlags, FTS5_BI_ROWID_LE|FTS5_BI_ROWID_GE) ){
+    pInfo->estimatedCost = bHasMatch ? 500.0 : 250000.0;
+  }else if( BitFlagTest(idxFlags, FTS5_BI_ROWID_LE|FTS5_BI_ROWID_GE) ){
+    pInfo->estimatedCost = bHasMatch ? 750.0 : 750000.0;
  }else{
-    pInfo->estimatedCost = bSeenMatch ? 1000.0 : 1000000.0;
+    pInfo->estimatedCost = bHasMatch ? 1000.0 : 1000000.0;
+  }
+
+  /* Assign argvIndex values to each constraint in use. */
+  iNext = 1;
+  for(i=0; i<ArraySize(aConstraint); i++){
+    struct Constraint *pC = &aConstraint[i];
+    if( pC->iConsIndex>=0 ){
+      pInfo->aConstraintUsage[pC->iConsIndex].argvIndex = iNext++;
+      pInfo->aConstraintUsage[pC->iConsIndex].omit = (unsigned char)pC->omit;
+    }
  }

  pInfo->idxNum = idxFlags;
@@ -747,7 +709,6 @@ static void fts5FreeCursorComponents(Fts5Cursor *pCsr){
    sqlite3_free(pCsr->zRankArgs);
  }

-  sqlite3Fts5IndexCloseReader(pTab->p.pIndex);
  memset(&pCsr->ePlan, 0, sizeof(Fts5Cursor) - ((u8*)&pCsr->ePlan - (u8*)pCsr));
 }

@@ -898,24 +859,15 @@ static int fts5NextMethod(sqlite3_vtab_cursor *pCursor){
        break;
      }
  
-      default: {
-        Fts5Config *pConfig = ((Fts5Table*)pCursor->pVtab)->pConfig;
-        pConfig->bLock++;
+      default:
        rc = sqlite3_step(pCsr->pStmt);
-        pConfig->bLock--;
        if( rc!=SQLITE_ROW ){
          CsrFlagSet(pCsr, FTS5CSR_EOF);
          rc = sqlite3_reset(pCsr->pStmt);
-          if( rc!=SQLITE_OK ){
-            pCursor->pVtab->zErrMsg = sqlite3_mprintf(
-                "%s", sqlite3_errmsg(pConfig->db)
-            );
-          }
        }else{
          rc = SQLITE_OK;
        }
        break;
-      }
    }
  }
  
@@ -980,7 +932,7 @@ static int fts5CursorFirstSorted(
  **
  ** If SQLite a built-in statement cache, this wouldn't be a problem. */
  rc = fts5PrepareStatement(&pSorter->pStmt, pConfig,
-      "SELECT rowid, rank FROM %Q.%Q ORDER BY %s(\"%w\"%s%s) %s",
+      "SELECT rowid, rank FROM %Q.%Q ORDER BY %s(%s%s%s) %s",
      pConfig->zDb, pConfig->zName, zRank, pConfig->zName,
      (zRankArgs ? ", " : ""),
      (zRankArgs ? zRankArgs : ""),
@@ -1036,10 +988,10 @@ static int fts5SpecialMatch(
  assert( pTab->p.base.zErrMsg==0 );
  pCsr->ePlan = FTS5_PLAN_SPECIAL;

-  if( n==5 && 0==sqlite3_strnicmp("reads", z, n) ){
+  if( 0==sqlite3_strnicmp("reads", z, n) ){
    pCsr->iSpecial = sqlite3Fts5IndexReads(pTab->p.pIndex);
  }
-  else if( n==2 && 0==sqlite3_strnicmp("id", z, n) ){
+  else if( 0==sqlite3_strnicmp("id", z, n) ){
    pCsr->iSpecial = pCsr->iCsrId;
  }
  else{
@@ -1180,7 +1132,7 @@ static i64 fts5GetRowidLimit(sqlite3_value *pVal, i64 iDefault){
 static int fts5FilterMethod(
  sqlite3_vtab_cursor *pCursor,   /* The cursor used for this query */
  int idxNum,                     /* Strategy index */
-  const char *idxStr,             /* Unused */
+  const char *zUnused,            /* Unused */
  int nVal,                       /* Number of elements in apVal */
  sqlite3_value **apVal           /* Arguments for the indexing scheme */
 ){
@@ -1188,24 +1140,19 @@ static int fts5FilterMethod(
  Fts5Config *pConfig = pTab->p.pConfig;
  Fts5Cursor *pCsr = (Fts5Cursor*)pCursor;
  int rc = SQLITE_OK;             /* Error code */
+  int iVal = 0;                   /* Counter for apVal[] */
  int bDesc;                      /* True if ORDER BY [rank|rowid] DESC */
  int bOrderByRank;               /* True if ORDER BY rank */
+  sqlite3_value *pMatch = 0;      /* <tbl> MATCH ? expression (or NULL) */
  sqlite3_value *pRank = 0;       /* rank MATCH ? expression (or NULL) */
  sqlite3_value *pRowidEq = 0;    /* rowid = ? expression (or NULL) */
  sqlite3_value *pRowidLe = 0;    /* rowid <= ? expression (or NULL) */
  sqlite3_value *pRowidGe = 0;    /* rowid >= ? expression (or NULL) */
  int iCol;                       /* Column on LHS of MATCH operator */
  char **pzErrmsg = pConfig->pzErrmsg;
-  int i;
-  int iIdxStr = 0;
-  Fts5Expr *pExpr = 0;

-  if( pConfig->bLock ){
-    pTab->p.base.zErrMsg = sqlite3_mprintf(
-        "recursively defined fts5 content table"
-    );
-    return SQLITE_ERROR;
-  }
+  UNUSED_PARAM(zUnused);
+  UNUSED_PARAM(nVal);

  if( pCsr->ePlan ){
    fts5FreeCursorComponents(pCsr);
@@ -1218,60 +1165,23 @@ static int fts5FilterMethod(
  assert( pCsr->pRank==0 );
  assert( pCsr->zRank==0 );
  assert( pCsr->zRankArgs==0 );
-  assert( pTab->pSortCsr==0 || nVal==0 );

  assert( pzErrmsg==0 || pzErrmsg==&pTab->p.base.zErrMsg );
  pConfig->pzErrmsg = &pTab->p.base.zErrMsg;

-  /* Decode the arguments passed through to this function. */
-  for(i=0; i<nVal; i++){
-    switch( idxStr[iIdxStr++] ){
-      case 'r':
-        pRank = apVal[i];
-        break;
-      case 'm': {
-        const char *zText = (const char*)sqlite3_value_text(apVal[i]);
-        if( zText==0 ) zText = "";
-
-        if( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' ){
-          iCol = 0;
-          do{
-            iCol = iCol*10 + (idxStr[iIdxStr]-'0');
-            iIdxStr++;
-          }while( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' );
-        }else{
-          iCol = pConfig->nCol;
-        }
-
-        if( zText[0]=='*' ){
-          /* The user has issued a query of the form "MATCH '*...'". This
-          ** indicates that the MATCH expression is not a full text query,
-          ** but a request for an internal parameter.  */
-          rc = fts5SpecialMatch(pTab, pCsr, &zText[1]);
-          goto filter_out;
-        }else{
-          char **pzErr = &pTab->p.base.zErrMsg;
-          rc = sqlite3Fts5ExprNew(pConfig, iCol, zText, &pExpr, pzErr);
-          if( rc==SQLITE_OK ){
-            rc = sqlite3Fts5ExprAnd(&pCsr->pExpr, pExpr);
-            pExpr = 0;
-          }
-          if( rc!=SQLITE_OK ) goto filter_out;
-        }
-
-        break;
-      }
-      case '=':
-        pRowidEq = apVal[i];
-        break;
-      case '<':
-        pRowidLe = apVal[i];
-        break;
-      default: assert( idxStr[iIdxStr-1]=='>' );
-        pRowidGe = apVal[i];
-        break;
-    }
-  }
+  /* Decode the arguments passed through to this function.
+  **
+  ** Note: The following set of if(...) statements must be in the same
+  ** order as the corresponding entries in the struct at the top of
+  ** fts5BestIndexMethod().  */
+  if( BitFlagTest(idxNum, FTS5_BI_MATCH) ) pMatch = apVal[iVal++];
+  if( BitFlagTest(idxNum, FTS5_BI_RANK) ) pRank = apVal[iVal++];
+  if( BitFlagTest(idxNum, FTS5_BI_ROWID_EQ) ) pRowidEq = apVal[iVal++];
+  if( BitFlagTest(idxNum, FTS5_BI_ROWID_LE) ) pRowidLe = apVal[iVal++];
+  if( BitFlagTest(idxNum, FTS5_BI_ROWID_GE) ) pRowidGe = apVal[iVal++];
+  iCol = (idxNum>>16);
+  assert( iCol>=0 && iCol<=pConfig->nCol );
+  assert( iVal==nVal );
  bOrderByRank = ((idxNum & FTS5_BI_ORDER_RANK) ? 1 : 0);
  pCsr->bDesc = bDesc = ((idxNum & FTS5_BI_ORDER_DESC) ? 1 : 0);

@@ -1298,7 +1208,7 @@ static int fts5FilterMethod(
    ** (pCursor) is used to execute the query issued by function 
    ** fts5CursorFirstSorted() above.  */
    assert( pRowidEq==0 && pRowidLe==0 && pRowidGe==0 && pRank==0 );
-    assert( nVal==0 && bOrderByRank==0 && bDesc==0 );
+    assert( nVal==0 && pMatch==0 && bOrderByRank==0 && bDesc==0 );
    assert( pCsr->iLastRowid==LARGEST_INT64 );
    assert( pCsr->iFirstRowid==SMALLEST_INT64 );
    if( pTab->pSortCsr->bDesc ){
@@ -1311,15 +1221,29 @@ static int fts5FilterMethod(
    pCsr->ePlan = FTS5_PLAN_SOURCE;
    pCsr->pExpr = pTab->pSortCsr->pExpr;
    rc = fts5CursorFirst(pTab, pCsr, bDesc);
-  }else if( pCsr->pExpr ){
+  }else if( pMatch ){
+    const char *zExpr = (const char*)sqlite3_value_text(apVal[0]);
+    if( zExpr==0 ) zExpr = "";
+
    rc = fts5CursorParseRank(pConfig, pCsr, pRank);
    if( rc==SQLITE_OK ){
-      if( bOrderByRank ){
-        pCsr->ePlan = FTS5_PLAN_SORTED_MATCH;
-        rc = fts5CursorFirstSorted(pTab, pCsr, bDesc);
+      if( zExpr[0]=='*' ){
+        /* The user has issued a query of the form "MATCH '*...'". This
+        ** indicates that the MATCH expression is not a full text query,
+        ** but a request for an internal parameter.  */
+        rc = fts5SpecialMatch(pTab, pCsr, &zExpr[1]);
      }else{
-        pCsr->ePlan = FTS5_PLAN_MATCH;
-        rc = fts5CursorFirst(pTab, pCsr, bDesc);
+        char **pzErr = &pTab->p.base.zErrMsg;
+        rc = sqlite3Fts5ExprNew(pConfig, iCol, zExpr, &pCsr->pExpr, pzErr);
+        if( rc==SQLITE_OK ){
+          if( bOrderByRank ){
+            pCsr->ePlan = FTS5_PLAN_SORTED_MATCH;
+            rc = fts5CursorFirstSorted(pTab, pCsr, bDesc);
+          }else{
+            pCsr->ePlan = FTS5_PLAN_MATCH;
+            rc = fts5CursorFirst(pTab, pCsr, bDesc);
+          }
+        }
      }
    }
  }else if( pConfig->zContent==0 ){
@@ -1336,7 +1260,7 @@ static int fts5FilterMethod(
    );
    if( rc==SQLITE_OK ){
      if( pCsr->ePlan==FTS5_PLAN_ROWID ){
-        sqlite3_bind_value(pCsr->pStmt, 1, pRowidEq);
+        sqlite3_bind_value(pCsr->pStmt, 1, apVal[0]);
      }else{
        sqlite3_bind_int64(pCsr->pStmt, 1, pCsr->iFirstRowid);
        sqlite3_bind_int64(pCsr->pStmt, 2, pCsr->iLastRowid);
@@ -1345,8 +1269,6 @@ static int fts5FilterMethod(
    }
  }

- filter_out:
-  sqlite3Fts5ExprFree(pExpr);
  pConfig->pzErrmsg = pzErrmsg;
  return rc;
 }
@@ -1427,13 +1349,10 @@ static int fts5SeekCursor(Fts5Cursor *pCsr, int bErrormsg){
  }

  if( rc==SQLITE_OK && CsrFlagTest(pCsr, FTS5CSR_REQUIRE_CONTENT) ){
-    Fts5Table *pTab = (Fts5Table*)(pCsr->base.pVtab);
    assert( pCsr->pExpr );
    sqlite3_reset(pCsr->pStmt);
    sqlite3_bind_int64(pCsr->pStmt, 1, fts5CursorRowid(pCsr));
-    pTab->pConfig->bLock++;
    rc = sqlite3_step(pCsr->pStmt);
-    pTab->pConfig->bLock--;
    if( rc==SQLITE_ROW ){
      rc = SQLITE_OK;
      CsrFlagClear(pCsr, FTS5CSR_REQUIRE_CONTENT);
@@ -1441,10 +1360,6 @@ static int fts5SeekCursor(Fts5Cursor *pCsr, int bErrormsg){
      rc = sqlite3_reset(pCsr->pStmt);
      if( rc==SQLITE_OK ){
        rc = FTS5_CORRUPT;
-      }else if( pTab->pConfig->pzErrmsg ){
-        *pTab->pConfig->pzErrmsg = sqlite3_mprintf(
-            "%s", sqlite3_errmsg(pTab->pConfig->db)
-        );
      }
    }
  }
@@ -2324,7 +2239,7 @@ static void fts5ApiCallback(
  iCsrId = sqlite3_value_int64(argv[0]);

  pCsr = fts5CursorFromCsrid(pAux->pGlobal, iCsrId);
-  if( pCsr==0 || pCsr->ePlan==0 ){
+  if( pCsr==0 ){
    char *zErr = sqlite3_mprintf("no such cursor: %lld", iCsrId);
    sqlite3_result_error(context, zErr, -1);
    sqlite3_free(zErr);
@@ -2460,12 +2375,10 @@ static int fts5ColumnMethod(
      }
    }
  }else if( !fts5IsContentless(pTab) ){
-    pConfig->pzErrmsg = &pTab->p.base.zErrMsg;
    rc = fts5SeekCursor(pCsr, 1);
    if( rc==SQLITE_OK ){
      sqlite3_result_value(pCtx, sqlite3_column_value(pCsr->pStmt, iCol+1));
    }
-    pConfig->pzErrmsg = 0;
  }
  return rc;
 }
@@ -560,8 +560,6 @@ int sqlite3Fts5StorageDeleteAll(Fts5Storage *p){
  Fts5Config *pConfig = p->pConfig;
  int rc;

-  p->bTotalsValid = 0;
-
  /* Delete the contents of the %_data and %_docsize tables. */
  rc = fts5ExecPrintf(pConfig->db, 0,
      "DELETE FROM %Q.'%q_data';" 
@@ -613,11 +611,10 @@ int sqlite3Fts5StorageRebuild(Fts5Storage *p){
    for(ctx.iCol=0; rc==SQLITE_OK && ctx.iCol<pConfig->nCol; ctx.iCol++){
      ctx.szCol = 0;
      if( pConfig->abUnindexed[ctx.iCol]==0 ){
-        const char *zText = (const char*)sqlite3_column_text(pScan, ctx.iCol+1);
-        int nText = sqlite3_column_bytes(pScan, ctx.iCol+1);
        rc = sqlite3Fts5Tokenize(pConfig, 
            FTS5_TOKENIZE_DOCUMENT,
-            zText, nText,
+            (const char*)sqlite3_column_text(pScan, ctx.iCol+1),
+            sqlite3_column_bytes(pScan, ctx.iCol+1),
            (void*)&ctx,
            fts5StorageInsertCallback
        );
@@ -739,11 +736,10 @@ int sqlite3Fts5StorageIndexInsert(
  for(ctx.iCol=0; rc==SQLITE_OK && ctx.iCol<pConfig->nCol; ctx.iCol++){
    ctx.szCol = 0;
    if( pConfig->abUnindexed[ctx.iCol]==0 ){
-      const char *zText = (const char*)sqlite3_value_text(apVal[ctx.iCol+2]);
-      int nText = sqlite3_value_bytes(apVal[ctx.iCol+2]);
      rc = sqlite3Fts5Tokenize(pConfig, 
          FTS5_TOKENIZE_DOCUMENT,
-          zText, nText,
+          (const char*)sqlite3_value_text(apVal[ctx.iCol+2]),
+          sqlite3_value_bytes(apVal[ctx.iCol+2]),
          (void*)&ctx,
          fts5StorageInsertCallback
      );
@@ -912,11 +908,10 @@ int sqlite3Fts5StorageIntegrity(Fts5Storage *p){
          rc = sqlite3Fts5TermsetNew(&ctx.pTermset);
        }
        if( rc==SQLITE_OK ){
-          const char *zText = (const char*)sqlite3_column_text(pScan, i+1);
-          int nText = sqlite3_column_bytes(pScan, i+1);
          rc = sqlite3Fts5Tokenize(pConfig, 
              FTS5_TOKENIZE_DOCUMENT,
-              zText, nText,
+              (const char*)sqlite3_column_text(pScan, i+1),
+              sqlite3_column_bytes(pScan, i+1),
              (void*)&ctx,
              fts5StorageIntegrityCallback
          );
@@ -50,7 +50,6 @@ struct Fts5VocabTable {
  sqlite3 *db;                    /* Database handle */
  Fts5Global *pGlobal;            /* FTS5 global object for this database */
  int eType;                      /* FTS5_VOCAB_COL, ROW or INSTANCE */
-  unsigned bBusy;                 /* True if busy */
 };

 struct Fts5VocabCursor {
@@ -333,12 +332,6 @@ static int fts5VocabOpenMethod(
  sqlite3_stmt *pStmt = 0;
  char *zSql = 0;

-  if( pTab->bBusy ){
-    pVTab->zErrMsg = sqlite3_mprintf(
-       "recursive definition for %s.%s", pTab->zFts5Db, pTab->zFts5Tbl
-    );
-    return SQLITE_ERROR;
-  }
  zSql = sqlite3Fts5Mprintf(&rc,
      "SELECT t.%Q FROM %Q.%Q AS t WHERE t.%Q MATCH '*id'",
      pTab->zFts5Tbl, pTab->zFts5Db, pTab->zFts5Tbl, pTab->zFts5Tbl
@@ -350,12 +343,10 @@ static int fts5VocabOpenMethod(
  assert( rc==SQLITE_OK || pStmt==0 );
  if( rc==SQLITE_ERROR ) rc = SQLITE_OK;

-  pTab->bBusy = 1;
  if( pStmt && sqlite3_step(pStmt)==SQLITE_ROW ){
    i64 iId = sqlite3_column_int64(pStmt, 0);
    pFts5 = sqlite3Fts5TableFromCsrid(pTab->pGlobal, iId);
  }
-  pTab->bBusy = 0;

  if( rc==SQLITE_OK ){
    if( pFts5==0 ){
@@ -257,41 +257,16 @@ do_execsql_test 6.2 {
 # Check that an fts5 table cannot be its own content table.
 #
 reset_db
-do_execsql_test 7.1.1 {
+do_execsql_test 7.1 {
  CREATE VIRTUAL TABLE t1 USING fts5(a, c=t1 );
  INSERT INTO t1( a ) VALUES('abc');
 }
-do_catchsql_test 7.1.2 { 
+do_catchsql_test 7.2 { 
  SELECT * FROM t1; 
 } {1 {recursively defined fts5 content table}}
-do_catchsql_test 7.1.3 { 
+do_catchsql_test 7.3 { 
  SELECT * FROM t1('abc'); 
 } {1 {recursively defined fts5 content table}}
-do_catchsql_test 7.1.4 { 
-  SELECT count(*) FROM t1;
-} {1 {recursively defined fts5 content table}}
-do_catchsql_test 7.1.5 { 
-  SELECT * FROM t1('abc') ORDER BY rank;
-} {1 {recursively defined fts5 content table}}
-
-reset_db
-do_execsql_test 7.2.1 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a, c=t2 );
-  CREATE VIRTUAL TABLE t2 USING fts5(a, c=t1 );
-  INSERT INTO t1( a ) VALUES('abc');
-}
-do_catchsql_test 7.2.2 { 
-  SELECT * FROM t1; 
-} {1 {recursively defined fts5 content table}}
-do_catchsql_test 7.2.3 { 
-  SELECT * FROM t1('abc'); 
-} {1 {recursively defined fts5 content table}}
-do_catchsql_test 7.2.4 { 
-  SELECT count(*) FROM t1;
-} {1 {recursively defined fts5 content table}}
-do_catchsql_test 7.2.5 { 
-  SELECT * FROM t1('abc') ORDER BY rank;
-} {1 {recursively defined fts5 content table}}

 finish_test

@@ -59,27 +59,10 @@ do_catchsql_test 2.1 {
  SELECT fts5_expr()
 } {1 {wrong number of arguments to function fts5_expr}}

-do_catchsql_test 2.2 {
+do_catchsql_test 2.1 {
  SELECT fts5_expr_tcl()
 } {1 {wrong number of arguments to function fts5_expr_tcl}}

-do_catchsql_test 2.3 {
-  SELECT fts5_expr('')
-} {1 {fts5: syntax error near ""}}
-
-do_catchsql_test 2.4 {
-  SELECT fts5_expr(NULL)
-} {1 {fts5: syntax error near ""}}
-
-do_catchsql_test 2.5 {
-  SELECT fts5_expr(NULL, NULL)
-} {1 {parse error in ""}}
-
-for {set i 0} {$i < 255} {incr i} {
-  do_test 2.6.$i {
-    lindex [catchsql {sELECT fts5_expr(NULL, char($i));}] 0
-  } 1
-}

 do_execsql_test 3.0 {
  CREATE VIRTUAL TABLE e1 USING fts5(text, tokenize = 'porter unicode61');
@@ -147,27 +147,5 @@ do_faultsim_test 5.1 -faults oom* -body {
  faultsim_test_result {0 {1 4}}
 }

-#-------------------------------------------------------------------------
-# Test OOM injection in a query with two MATCH expressions
-#
-reset_db
-do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a);
-  INSERT INTO t1 VALUES('a b c d');  -- 1
-  INSERT INTO t1 VALUES('d a b c');  -- 2
-  INSERT INTO t1 VALUES('c d a b');  -- 3
-  INSERT INTO t1 VALUES('b c d a');  -- 4
-}
-do_faultsim_test 6.1 -faults oom* -body {
-  execsql { SELECT rowid FROM t1 WHERE t1 MATCH 'a' AND t1 MATCH 'b' }
-} -test {
-  faultsim_test_result {0 {1 2 3 4}}
-}
-do_faultsim_test 6.2 -faults oom* -body {
-  execsql { SELECT rowid FROM t1 WHERE t1 MATCH 'a OR b' AND t1 MATCH 'c OR d' }
-} -test {
-  faultsim_test_result {0 {1 2 3 4}}
-}
-

 finish_test
@@ -36,7 +36,7 @@ do_test 1.1 {
      execsql { INSERT INTO x8 VALUES( rnddoc(5) ); }
    }
  } msg] $msg
-} {0 {}}
+} {1 {database or disk is full}}


 finish_test
@@ -210,76 +210,4 @@ foreach {tn pgsz} {
  } {1000}
 }

-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 7.0 {
-  PRAGMA encoding = 'UTF-16';
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-  INSERT INTO vt0 VALUES (x'46f0');
-  SELECT quote(c0) FROM vt0;
-} {X'46F0'}
-do_execsql_test 7.1 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-do_execsql_test 7.2 {
-  INSERT INTO vt0(vt0) VALUES('rebuild');
-}
-do_execsql_test 7.3 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-do_execsql_test 7.4 {
-  UPDATE vt0 SET c0='';
-}
-do_execsql_test 7.5 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-# Ticket 7a458c2a5f4
-#
-reset_db
-do_execsql_test 8.0 {
-  PRAGMA locking_mode = EXCLUSIVE;
-  PRAGMA journal_mode = PERSIST;
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-} {exclusive persist}
-do_execsql_test 8.1 {
-  PRAGMA data_version
-} {1}
-do_execsql_test 8.2 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-  PRAGMA data_version;
-} {1}
-do_execsql_test 8.1 {
-  INSERT INTO vt0(vt0, rank) VALUES('usermerge', 2);
-}
-
-#-------------------------------------------------------------------------
-# Ticket [771fe617]
-#
-reset_db
-do_execsql_test 9.0 {
-  PRAGMA encoding = 'UTF16';
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-}
-
-#explain_i { SELECT quote(SUBSTR(x'37', 0)); }
-#execsql { PRAGMA vdbe_trace = 1 }
-do_execsql_test 9.1.1 {
-  SELECT quote(SUBSTR(x'37', 0));
-} {X'37'}
-do_execsql_test 9.1.2 {
-  SELECT quote(x'37');
-} {X'37'}
-
-breakpoint
-do_execsql_test 9.2 {
-  INSERT INTO vt0 VALUES (SUBSTR(x'37', 0));
--  INSERT INTO vt0 VALUES (x'37');
-}
-do_execsql_test 9.3 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
 finish_test
@@ -491,33 +491,4 @@ do_catchsql_test 14.2 {
  SELECT matchinfo(x1, 'd') FROM x1('a b c');
 } {1 {unrecognized matchinfo flag: d}}

-#-------------------------------------------------------------------------
-# Test using matchinfo() and similar on a non-full-text query
-#
-do_execsql_test 15.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y);
-  INSERT INTO t1 VALUES('a', 'b');
-  INSERT INTO t1 VALUES('c', 'd');
-}
-
-if {$tcl_platform(byteOrder)=="littleEndian"} {
-  set res {X'02000000'}
-} else {
-  set res {X'00000002'}
-}
-do_execsql_test 15.1 {
-  SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
-} $res
-do_execsql_test 15.2 {
-  DELETE FROM t1_content WHERE rowid=1;
-  SELECT quote(matchinfo(t1, 'n')) FROM t1 LIMIT 1;
-} $res
-
-fts5_aux_test_functions db
-do_execsql_test 15.3 {
-  SELECT fts5_test_all(t1) FROM t1 LIMIT 1;
-} {
-  {columnsize {0 0} columntext {c d} columntotalsize {2 2} poslist {} tokenize {c d} rowcount 2}
-}
-
 finish_test
@@ -1,327 +0,0 @@
-# 2019 September 02
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#*************************************************************************
-# This file implements regression tests for SQLite library.  The
-# focus of this script is testing the FTS5 module.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5misc
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a);
-}
-
-do_catchsql_test 1.1.1 { 
-  SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*'); 
-} {1 {unknown special query: }}
-do_catchsql_test 1.1.2 {
-  SELECT a FROM t1
-    WHERE rank = (SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*'));
-} {1 {unknown special query: }}
-
-do_catchsql_test 1.2.1 { 
-  SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*id'); 
-} {0 {{}}}
-
-do_catchsql_test 1.2.2 {
-  SELECT a FROM t1
-    WHERE rank = (SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*id'));
-} {0 {}}
-
-do_catchsql_test 1.3.1 { 
-  SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*reads'); 
-} {1 {no such cursor: 1}}
-
-do_catchsql_test 1.3.2 {
-  SELECT a FROM t1
-    WHERE rank = (SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*reads'));
-} {1 {no such cursor: 1}}
-
-db close
-sqlite3 db test.db
-
-do_catchsql_test 1.3.3 {
-  SELECT a FROM t1
-    WHERE rank = (SELECT highlight(t1, 4, '<b>', '</b>') FROM t1('*reads'));
-} {1 {no such cursor: 1}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 2.0 {
-  CREATE TABLE t0(c0);
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-}
-do_execsql_test 2.1.1 {
-  BEGIN TRANSACTION;
-  INSERT INTO vt0(c0) VALUES ('xyz');
-}
-do_execsql_test 2.1.2 {
-  ALTER TABLE t0 ADD COLUMN c5;
-}
-do_execsql_test 2.1.3 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-do_execsql_test 2.1.4 {
-  INSERT INTO vt0(c0) VALUES ('abc');
-  COMMIT
-}
-do_execsql_test 2.1.5 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-reset_db
-do_execsql_test 2.2.1 {
-  CREATE TABLE t0(c0);
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-  BEGIN TRANSACTION;
-  INSERT INTO vt0(c0) VALUES ('xyz');
-}
-
-breakpoint
-do_execsql_test 2.2.2 {
-  ALTER TABLE t0 RENAME TO t1;
-}
-do_execsql_test 2.2.3 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-do_execsql_test 2.2.4 {
-  INSERT INTO vt0(c0) VALUES ('abc');
-  COMMIT;
-}
-do_execsql_test 2.2.5 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE vt0 USING fts5(a);
-  PRAGMA reverse_unordered_selects = true;
-  INSERT INTO vt0 VALUES('365062398'), (0), (0);
-  INSERT INTO vt0(vt0, rank) VALUES('pgsz', '38');
-}
-do_execsql_test 3.1 {
-  UPDATE vt0 SET a = 399905135; -- unexpected: database disk image is malformed
-}
-do_execsql_test 3.2 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-  INSERT INTO vt0(c0) VALUES ('xyz');
-}
-
-do_execsql_test 4.1 {
-  BEGIN;
-    INSERT INTO vt0(c0) VALUES ('abc');
-    INSERT INTO vt0(vt0) VALUES('rebuild');
-  COMMIT;
-}
-
-do_execsql_test 4.2 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-do_execsql_test 4.3 {
-  BEGIN;
-    INSERT INTO vt0(vt0) VALUES('rebuild');
-    INSERT INTO vt0(vt0) VALUES('rebuild');
-  COMMIT;
-}
-
-do_execsql_test 4.4 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-# Ticket [81a7f7b9].
-#
-reset_db
-do_execsql_test 5.0 {
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0, c1);
-  INSERT INTO vt0(vt0, rank) VALUES('pgsz', '65536');
-  WITH s(i) AS (
-    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<1236
-  )
-  INSERT INTO vt0(c0) SELECT '0' FROM s;
-} {}
-
-do_execsql_test 5.1 {
-  UPDATE vt0 SET c1 = 'T,D&p^y/7#3*v<b<4j7|f';
-}
-
-do_execsql_test 5.2 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-do_catchsql_test 5.3 {
-  INSERT INTO vt0(vt0, rank) VALUES('pgsz', '65537');
-} {1 {SQL logic error}}
-
-#-------------------------------------------------------------------------
-# Ticket [d392017c].
-#
-reset_db
-do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-  WITH s(i) AS (
-    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<10000
-  )
-  INSERT INTO vt0(c0) SELECT '0' FROM s;
-  INSERT INTO vt0(vt0, rank) VALUES('crisismerge', 2000);
-  INSERT INTO vt0(vt0, rank) VALUES('automerge', 0);
-} {}
-
-do_execsql_test 6.1 {
-  INSERT INTO vt0(vt0) VALUES('rebuild');
-}
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 7.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x);
-  INSERT INTO t1(rowid, x) VALUES(1, 'hello world');
-  INSERT INTO t1(rowid, x) VALUES(2, 'well said');
-  INSERT INTO t1(rowid, x) VALUES(3, 'hello said');
-  INSERT INTO t1(rowid, x) VALUES(4, 'well world');
-
-  CREATE TABLE t2 (a, b);
-  INSERT INTO t2 VALUES(1, 'hello');
-  INSERT INTO t2 VALUES(2, 'world');
-  INSERT INTO t2 VALUES(3, 'said');
-  INSERT INTO t2 VALUES(4, 'hello');
-}
-
-do_execsql_test 7.1 {
-  SELECT rowid FROM t1 WHERE (rowid, x) IN (SELECT a, b FROM t2); 
-}
-
-do_execsql_test 7.2 {
-  SELECT rowid FROM t1 WHERE rowid=2 AND t1 = 'hello';
-}
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 8.0 {
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0, tokenize = "ascii", prefix = 1);
-  INSERT INTO vt0(c0) VALUES (x'd1');
-}
-
-do_execsql_test 8.1 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 9.0 {
-  CREATE VIRTUAL TABLE t1 using FTS5(mailcontent);
-  insert into t1(rowid, mailcontent) values
-      (-4764623217061966105, 'we are going to upgrade'),
-      (8324454597464624651, 'we are going to upgrade');
-}
-
-do_execsql_test 9.1 {
-  INSERT INTO t1(t1) VALUES('integrity-check');
-}
-
-do_execsql_test 9.2 {
-  SELECT rowid FROM t1('upgrade');
-} {
-  -4764623217061966105 8324454597464624651
-}
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 10.0 {
-  CREATE VIRTUAL TABLE vt1 USING fts5(c1, c2, prefix = 1, tokenize = "ascii");
-  INSERT INTO vt1 VALUES (x'e4', '䔬');
-}
-
-do_execsql_test 10.1 {
-  SELECT quote(CAST(c1 AS blob)), quote(CAST(c2 AS blob)) FROM vt1
-} {X'E4' X'E494AC'}
-
-do_execsql_test 10.2 {
-  INSERT INTO vt1(vt1) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 11.0 {
-  CREATE VIRTUAL TABLE vt0 USING fts5(
-      c0, prefix = 71, tokenize = "porter ascii", prefix = 9
-  );
-} {}
-do_execsql_test 11.1 {
-  BEGIN;
-  INSERT INTO vt0(c0) VALUES (x'e8');
-}
-do_execsql_test 11.2 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-# Ticket [752fdbf6] 
-#
-reset_db
-do_execsql_test 11.0 {
-  PRAGMA encoding = 'UTF-16';
-  CREATE VIRTUAL TABLE vt0 USING fts5(c0, c1);
-  INSERT INTO vt0(vt0, rank) VALUES('pgsz', '37');
-  INSERT INTO vt0(c0, c1) VALUES (0.66077, 1957391816);
-}
-do_execsql_test 11.1 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-# Ticket [7c0e06b16] 
-#
-do_execsql_test 12.0 {
-  CREATE TABLE t1(a, b, rank);
-  INSERT INTO t1 VALUES('a', 'hello', '');
-  INSERT INTO t1 VALUES('b', 'world', '');
-
-  CREATE VIRTUAL TABLE ft USING fts5(a);
-  INSERT INTO ft VALUES('b');
-  INSERT INTO ft VALUES('y');
-
-  CREATE TABLE t2(x, y, ft);
-  INSERT INTO t2 VALUES(1, 2, 'x');
-  INSERT INTO t2 VALUES(3, 4, 'b');
-}
-
-do_execsql_test 12.1 {
-  SELECT * FROM t1 NATURAL JOIN ft WHERE ft MATCH('b')
-} {b world {}}
-do_execsql_test 12.2 {
-  SELECT * FROM ft NATURAL JOIN t1 WHERE ft MATCH('b')
-} {b world {}}
-do_execsql_test 12.3 {
-  SELECT * FROM t2 JOIN ft USING (ft)
-} {3 4 b b}
-
-finish_test
-
@@ -1,99 +0,0 @@
-# 2014 September 13
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#*************************************************************************
-# This file implements regression tests for SQLite library.  The
-# focus of this script is testing the FTS5 module.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5multi
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-fts5_aux_test_functions db
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a, b, c);
-  INSERT INTO t1 VALUES('gg bb bb'   ,'gg ff gg'   ,'ii ii');
-  INSERT INTO t1 VALUES('dd dd hh kk','jj'         ,'aa');
-  INSERT INTO t1 VALUES('kk gg ee'   ,'hh cc'      ,'hh jj aa cc');
-  INSERT INTO t1 VALUES('hh'         ,'bb jj cc'   ,'kk ii');
-  INSERT INTO t1 VALUES('kk dd kk ii','aa ee aa'   ,'ee');
-  INSERT INTO t1 VALUES('ee'         ,'ff gg kk aa','ee ff ee');
-  INSERT INTO t1 VALUES('ff jj'      ,'gg ee'      ,'kk ee gg kk');
-  INSERT INTO t1 VALUES('ff ee dd hh','kk ee'      ,'gg dd');
-  INSERT INTO t1 VALUES('bb'         ,'aa'         ,'bb aa');
-  INSERT INTO t1 VALUES('hh cc bb'   ,'ff bb'      ,'cc');
-  INSERT INTO t1 VALUES('jj'         ,'ff dd bb aa','dd dd ff ff');
-  INSERT INTO t1 VALUES('ff dd gg dd','gg aa bb ff','cc');
-  INSERT INTO t1 VALUES('ff aa cc jj','kk'         ,'ii dd');
-  INSERT INTO t1 VALUES('jj dd'      ,'cc'         ,'ii hh ee aa');
-  INSERT INTO t1 VALUES('ff ii hh'   ,'dd'         ,'gg');
-  INSERT INTO t1 VALUES('ff dd gg hh','hh'         ,'ff dd');
-  INSERT INTO t1 VALUES('cc cc'      ,'ff dd ff'   ,'bb');
-  INSERT INTO t1 VALUES('ii'         ,'bb ii'      ,'jj kk');
-  INSERT INTO t1 VALUES('ff hh'      ,'hh bb'      ,'bb dd ee');
-  INSERT INTO t1 VALUES('jj kk'      ,'jj'         ,'gg ff cc');
-  INSERT INTO t1 VALUES('dd kk'      ,'ii gg'      ,'dd');
-  INSERT INTO t1 VALUES('cc'         ,'aa ff'      ,'ii');
-  INSERT INTO t1 VALUES('bb ff bb ii','bb kk bb aa','hh ff ii dd');
-  INSERT INTO t1 VALUES('aa'         ,'ee bb jj jj','dd');
-  INSERT INTO t1 VALUES('kk dd cc'   ,'aa jj'      ,'ee aa ff');
-  INSERT INTO t1 VALUES('aa gg aa'   ,'jj'         ,'ii kk hh gg');
-  INSERT INTO t1 VALUES('ff hh aa'   ,'jj ii'      ,'hh dd bb jj');
-  INSERT INTO t1 VALUES('hh'         ,'aa gg kk'   ,'bb ee');
-  INSERT INTO t1 VALUES('bb'         ,'ee'         ,'gg');
-  INSERT INTO t1 VALUES('dd kk'      ,'kk bb aa'   ,'ee');
-}
-
-foreach {tn c1 e1 c2 e2} {
-  1     t1 aa     t1 bb
-  2     a  aa     b  bb
-  3     a  "aa OR bb OR cc"    b  "jj OR ii OR hh"
-  4     t1  "aa AND bb"       t1  "cc"
-  5     c   "kk"               b  "aa OR bb OR cc OR dd OR ee"
-} {
-  if {$c1=="t1"} {
-    set lhs "( $e1 )"
-  } else {
-    set lhs "$c1 : ( $e1 )"
-  }
-  if {$c2=="t1"} {
-    set rhs "( $e2 )"
-  } else {
-    set rhs "$c2 : ( $e2 )"
-  }
-
-  set q1 "t1 MATCH '($lhs) AND ($rhs)'"
-  set q2 "$c1 MATCH '$e1' AND $c2 MATCH '$e2'"
-
-  set ret [execsql "SELECT rowid FROM t1 WHERE $q1"]
-  set N [llength $ret]
-  do_execsql_test 1.$tn.1.($N) "SELECT rowid FROM t1 WHERE $q2" $ret
-
-  set ret [execsql "SELECT fts5_test_poslist(t1) FROM t1 WHERE $q1"]
-  do_execsql_test 1.$tn.2.($N) "
-    SELECT fts5_test_poslist(t1) FROM t1 WHERE $q2
-  " $ret
-}
-
-do_catchsql_test 2.1.1 {
-  SELECT rowid FROM t1 WHERE t1 MATCH '(NOT' AND t1 MATCH 'aa bb';
-} {1 {fts5: syntax error near "NOT"}}
-do_catchsql_test 2.1.2 {
-  SELECT rowid FROM t1 WHERE t1 MATCH 'aa bb' AND t1 MATCH '(NOT';
-} {1 {fts5: syntax error near "NOT"}}
-
-finish_test
-
@@ -31,7 +31,7 @@ do_eqp_test 1.1 {
 } {
  QUERY PLAN
  |--SCAN TABLE t1
-  `--SCAN TABLE f1 VIRTUAL TABLE INDEX 0:m
+  `--SCAN TABLE f1 VIRTUAL TABLE INDEX 65537:
 }

 do_eqp_test 1.2 {
@@ -46,7 +46,7 @@ do_eqp_test 1.3 {
  SELECT * FROM f1 WHERE f1 MATCH ? ORDER BY ff
 } {
  QUERY PLAN
-  |--SCAN TABLE f1 VIRTUAL TABLE INDEX 0:m
+  |--SCAN TABLE f1 VIRTUAL TABLE INDEX 65537:
  `--USE TEMP B-TREE FOR ORDER BY
 }

@@ -60,6 +60,6 @@ do_eqp_test 1.4 {

 do_eqp_test 1.5 {
  SELECT * FROM f1 WHERE rank MATCH ?
-} {SCAN TABLE f1 VIRTUAL TABLE INDEX 0:r}
+} {SCAN TABLE f1 VIRTUAL TABLE INDEX 2:}

 finish_test
@@ -162,22 +162,4 @@ do_execsql_test 5.1 {
  SELECT rowid FROM ttt('word') WHERE rowid BETWEEN 30 AND 40 ORDER BY rank;
 } {30 31 32 33 34 35 36 37 38 39 40}

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE "My.Table" USING fts5(Text);
-
-  INSERT INTO "My.Table" VALUES ('hello this is a test');
-  INSERT INTO "My.Table" VALUES ('of trying to order by');
-  INSERT INTO "My.Table" VALUES ('rank on an fts5 table');
-  INSERT INTO "My.Table" VALUES ('that have periods in');
-  INSERT INTO "My.Table" VALUES ('the table names.');
-  INSERT INTO "My.Table" VALUES ('table table table');
-}
-do_execsql_test 6.1 {
-  SELECT * FROM "My.Table" WHERE Text MATCH 'table' ORDER BY rank;
-} {
-  {table table table} {the table names.} {rank on an fts5 table}
-}
-
 finish_test
@@ -1,85 +0,0 @@
-# 2019 Dec 26
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5savepoint
-
-# If SQLITE_ENABLE_FTS5 is defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE ft USING fts5(c);
-  BEGIN;
-    SAVEPOINT one;
-      INSERT INTO ft VALUES('a');
-      SAVEPOINT two;
-        INSERT INTO ft VALUES('b');
-      RELEASE two;
-      SAVEPOINT four;
-        INSERT INTO ft VALUES('c');
-      RELEASE four;
-      SAVEPOINT three;
-        INSERT INTO ft VALUES('d');
-      ROLLBACK TO three;
-  COMMIT;
-  SELECT * FROM ft
-} {a b c}
-
-reset_db
-do_catchsql_test 2.0 {
-  CREATE VIRTUAL TABLE ft1 USING fts5(c);
-  CREATE VIRTUAL TABLE ft2 USING fts5(c);
-  DROP TABLE ft2_idx;
-  BEGIN;
-      INSERT INTO ft2 VALUES('a');
-      INSERT INTO ft1 VALUES('a');
-      SAVEPOINT two;
-        INSERT INTO ft1 VALUES('b');
-  COMMIT;
-} {1 {SQL logic error}}
-
-reset_db
-ifcapable fts3 {
-  do_execsql_test 3.0 {
-    CREATE VIRTUAL TABLE vt0 USING fts5(c0);
-    CREATE VIRTUAL TABLE vt1 USING fts4(c0);
-    INSERT INTO vt1(c0) VALUES(0);
-  }
-
-  do_execsql_test 3.1 {
-    BEGIN;
-      UPDATE vt1 SET c0 = 0;
-      INSERT INTO vt1(c0) VALUES (0), (0);
-      UPDATE vt0 SET c0 = 0;
-      INSERT INTO vt1(c0) VALUES (0);
-      UPDATE vt1 SET c0 = 0;
-      INSERT INTO vt1(vt1) VALUES('automerge=1');
-      UPDATE vt1 SET c0 = 0;
-  }
-
-  do_catchsql_test 3.2 {
-    DROP TABLE vt1;
-  } {1 {SQL logic error}}
-
-  do_execsql_test 3.3 {
-    SAVEPOINT x;
-      INSERT INTO vt0 VALUES('x');
-    COMMIT;
-    INSERT INTO vt0(vt0) VALUES('integrity-check');
-  }
-}
-
-finish_test
-
@@ -467,17 +467,4 @@ do_execsql_test 21.3 {
  SELECT rowid FROM x1($doc);
 } {11112}

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 22.0 {
-  CREATE VIRTUAL TABLE x1 USING fts5(x);
-  INSERT INTO x1(x) VALUES('a b c');
-  INSERT INTO x1(x) VALUES('x y z');
-  INSERT INTO x1(x) VALUES('c b a');
-  INSERT INTO x1(x) VALUES('z y x');
-}
-
-do_catchsql_test 22.1 {SELECT * FROM x1('')}   {1 {fts5: syntax error near ""}}
-do_catchsql_test 22.2 {SELECT * FROM x1(NULL)} {1 {fts5: syntax error near ""}}
-
 finish_test
@@ -542,16 +542,5 @@ do_execsql_test 10.7.3 {
  SELECT * FROM t2 WHERE term=?;
 }

-# 2020-02-16  Detect recursively define fts5vocab() tables.
-# Error found by dbsqlfuzz.
-#
-reset_db
-do_execsql_test 11.100 {
-  CREATE VIRTUAL TABLE t3 USING fts5vocab(rowid , 'col');
-  CREATE VIRTUAL TABLE rowid USING fts5vocab(rowid , 'instance');
-} {}
-do_catchsql_test 11.110 {
-  SELECT rowid+1,rowid, * FROM t3 WHERE null>rowid ;
-} {1 {SQL logic error}}
-
 finish_test
+
@@ -143,7 +143,7 @@ static int icuLikeCompare(
    **     3. uPattern is an unescaped escape character, or
    **     4. uPattern is to be handled as an ordinary character
    */
-    if( uPattern==MATCH_ALL && !prevEscape && uPattern!=(uint32_t)uEsc ){
+    if( !prevEscape && uPattern==MATCH_ALL ){
      /* Case 1. */
      uint8_t c;

@@ -169,12 +169,12 @@ static int icuLikeCompare(
      }
      return 0;

-    }else if( uPattern==MATCH_ONE && !prevEscape && uPattern!=(uint32_t)uEsc ){
+    }else if( !prevEscape && uPattern==MATCH_ONE ){
      /* Case 2. */
      if( *zString==0 ) return 0;
      SQLITE_ICU_SKIP_UTF8(zString);

-    }else if( uPattern==(uint32_t)uEsc && !prevEscape ){
+    }else if( !prevEscape && uPattern==(uint32_t)uEsc){
      /* Case 3. */
      prevEscape = 1;

@@ -499,27 +499,26 @@ static void icuLoadCollation(
 ** Register the ICU extension functions with database db.
 */
 int sqlite3IcuInit(sqlite3 *db){
-# define SQLITEICU_EXTRAFLAGS (SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS)
  static const struct IcuScalar {
    const char *zName;                        /* Function name */
    unsigned char nArg;                       /* Number of arguments */
-    unsigned int enc;                         /* Optimal text encoding */
+    unsigned short enc;                       /* Optimal text encoding */
    unsigned char iContext;                   /* sqlite3_user_data() context */
    void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
  } scalars[] = {
-    {"icu_load_collation",2,SQLITE_UTF8|SQLITE_DIRECTONLY,1, icuLoadCollation},
+    {"icu_load_collation",  2, SQLITE_UTF8,                1, icuLoadCollation},
 #if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_ICU)
-    {"regexp", 2, SQLITE_ANY|SQLITEICU_EXTRAFLAGS,         0, icuRegexpFunc},
-    {"lower",  1, SQLITE_UTF16|SQLITEICU_EXTRAFLAGS,       0, icuCaseFunc16},
-    {"lower",  2, SQLITE_UTF16|SQLITEICU_EXTRAFLAGS,       0, icuCaseFunc16},
-    {"upper",  1, SQLITE_UTF16|SQLITEICU_EXTRAFLAGS,       1, icuCaseFunc16},
-    {"upper",  2, SQLITE_UTF16|SQLITEICU_EXTRAFLAGS,       1, icuCaseFunc16},
-    {"lower",  1, SQLITE_UTF8|SQLITEICU_EXTRAFLAGS,        0, icuCaseFunc16},
-    {"lower",  2, SQLITE_UTF8|SQLITEICU_EXTRAFLAGS,        0, icuCaseFunc16},
-    {"upper",  1, SQLITE_UTF8|SQLITEICU_EXTRAFLAGS,        1, icuCaseFunc16},
-    {"upper",  2, SQLITE_UTF8|SQLITEICU_EXTRAFLAGS,        1, icuCaseFunc16},
-    {"like",   2, SQLITE_UTF8|SQLITEICU_EXTRAFLAGS,        0, icuLikeFunc},
-    {"like",   3, SQLITE_UTF8|SQLITEICU_EXTRAFLAGS,        0, icuLikeFunc},
+    {"regexp", 2, SQLITE_ANY|SQLITE_DETERMINISTIC,         0, icuRegexpFunc},
+    {"lower",  1, SQLITE_UTF16|SQLITE_DETERMINISTIC,       0, icuCaseFunc16},
+    {"lower",  2, SQLITE_UTF16|SQLITE_DETERMINISTIC,       0, icuCaseFunc16},
+    {"upper",  1, SQLITE_UTF16|SQLITE_DETERMINISTIC,       1, icuCaseFunc16},
+    {"upper",  2, SQLITE_UTF16|SQLITE_DETERMINISTIC,       1, icuCaseFunc16},
+    {"lower",  1, SQLITE_UTF8|SQLITE_DETERMINISTIC,        0, icuCaseFunc16},
+    {"lower",  2, SQLITE_UTF8|SQLITE_DETERMINISTIC,        0, icuCaseFunc16},
+    {"upper",  1, SQLITE_UTF8|SQLITE_DETERMINISTIC,        1, icuCaseFunc16},
+    {"upper",  2, SQLITE_UTF8|SQLITE_DETERMINISTIC,        1, icuCaseFunc16},
+    {"like",   2, SQLITE_UTF8|SQLITE_DETERMINISTIC,        0, icuLikeFunc},
+    {"like",   3, SQLITE_UTF8|SQLITE_DETERMINISTIC,        0, icuLikeFunc},
 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_ICU) */
  };
  int rc = SQLITE_OK;
@@ -43,10 +43,10 @@ LSMTESTSRC = $(LSMDIR)/lsm-test/lsmtest1.c $(LSMDIR)/lsm-test/lsmtest2.c     \

 # all: lsm.so

-LSMOPTS += -fPIC -DLSM_MUTEX_PTHREADS=1 -I$(LSMDIR) -DHAVE_ZLIB
+LSMOPTS += -DLSM_MUTEX_PTHREADS=1 -I$(LSMDIR) -DHAVE_ZLIB

 lsm.so:	$(LSMOBJ)
-	$(TCCX) -shared -fPIC -o lsm.so $(LSMOBJ)
+	$(TCCX) -shared -o lsm.so $(LSMOBJ)

 %.o:	$(LSMDIR)/%.c $(LSMHDR) sqlite3.h
 	$(TCCX) $(LSMOPTS) -c $<
@@ -842,7 +842,7 @@ static int lsm1BestIndex(

  const struct sqlite3_index_constraint *pConstraint;
  pConstraint = pIdxInfo->aConstraint;
-  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
+  for(i=0; i<pIdxInfo->nConstraint && idxNum<16; i++, pConstraint++){
    if( pConstraint->usable==0 ) continue;
    if( pConstraint->iColumn!=0 ) continue;
    switch( pConstraint->op ){
@@ -88,65 +88,6 @@ do_execsql_test 210 {
 do_execsql_test 211 {
  SELECT quote(a), quote(lsm1_key), quote(lsm1_value), '|' FROM x1;
 } {'12' X'3132' X'05320000000000000A401FFB42ABE9DB' | '15' X'3135' X'4284C6' | '8' X'38' X'2162616E6A6F1633323105' |}
-do_execsql_test 212 {
-  SELECT quote(a), quote(lsm1_key), quote(lsm1_value) FROM x1 WHERE a='12';
-} {'12' X'3132' X'05320000000000000A401FFB42ABE9DB'}

-#-------------------------------------------------------------------------
-reset_db
-forcedelete testlsm.db
-load_lsm1_vtab db
-do_execsql_test 300 {
-  CREATE VIRTUAL TABLE x1 USING lsm1(testlsm.db,a,TEXT,b,c,d);
-}
-do_eqp_test 310 {
-  SELECT * FROM x1 WHERE a=?
-} {SCAN TABLE x1 VIRTUAL TABLE INDEX 0:}
-
-do_eqp_test 320 {
-  SELECT * FROM x1 WHERE a>?
-} {SCAN TABLE x1 VIRTUAL TABLE INDEX 2:}
-
-do_eqp_test 330 {
-  SELECT * FROM x1 WHERE a<?
-} {SCAN TABLE x1 VIRTUAL TABLE INDEX 3:}
-do_eqp_test 340 {
-  SELECT * FROM x1 WHERE a BETWEEN ? AND ?
-} {SCAN TABLE x1 VIRTUAL TABLE INDEX 1:}
-
-#-------------------------------------------------------------------------
-reset_db
-forcedelete testlsm.db
-load_lsm1_vtab db
-do_execsql_test 400 {
-  CREATE VIRTUAL TABLE x1 USING lsm1(testlsm.db,a,TEXT,b);
-  INSERT INTO x1 VALUES('one', 1);
-  INSERT INTO x1 VALUES('two', 2);
-  INSERT INTO x1 VALUES('three', 3);
-  INSERT INTO x1 VALUES('four', 4);
-  INSERT INTO x1 VALUES('five', 5);
-}
-do_execsql_test 410 {
-  SELECT b FROM x1 WHERE a = 'two'
-} {2}
-do_execsql_test 411 {
-  SELECT b FROM x1 WHERE a = 'one'
-} {1}
-do_execsql_test 412 {
-  SELECT b FROM x1 WHERE a = 'five'
-} {5}
-
-do_execsql_test 420 {
-  SELECT b FROM x1 WHERE a BETWEEN 'one' AND 'three';
-} {1 3}
-do_execsql_test 421 {
-  SELECT b FROM x1 WHERE a BETWEEN 'five' AND 'two';
-} {5 4 1 3 2}
-do_execsql_test 421 {
-  SELECT b FROM x1 WHERE a > 'five';
-} {4 1 3 2}
-do_execsql_test 421 {
-  SELECT b FROM x1 WHERE a <= 'three';
-} {3 1 4 5}

 finish_test
@@ -900,7 +900,6 @@ static int amatchConnect(
    rc = amatchLoadRules(db, pNew, pzErr);
  }
  if( rc==SQLITE_OK ){
-    sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
    rc = sqlite3_declare_vtab(db,
           "CREATE TABLE x(word,distance,language,"
           "command HIDDEN,nword HIDDEN)"
@@ -23,7 +23,7 @@
 **    rootpage INT,                -- The root page of the btree
 **    sql TEXT,                    -- SQL for this btree - from sqlite_master
 **    hasRowid BOOLEAN,            -- True if the btree has a rowid
-**    nEntry INT,                  -- Estimated number of entries
+**    nEntry INT,                  -- Estimated number of enteries
 **    nPage INT,                   -- Estimated number of pages
 **    depth INT,                   -- Depth of the btree
 **    szPage INT,                  -- Size of each page in bytes
@@ -24,7 +24,7 @@
 **
 **    static int aX[] = { 53, 9, 17, 2231, 4, 99 };
 **    int i = sqlite3_bind_parameter_index(pStmt, "$ptr");
-**    sqlite3_bind_pointer(pStmt, i, aX, "carray", 0);
+**    sqlite3_bind_value(pStmt, i, aX, "carray", 0);
 **
 ** There is an optional third parameter to determine the datatype of
 ** the C-language array.  Allowed values of the third parameter are
@@ -1,778 +0,0 @@
-/*
-** 2020-04-20
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** This file implements a VFS shim that writes a checksum on each page
-** of an SQLite database file.  When reading pages, the checksum is verified
-** and an error is raised if the checksum is incorrect.
-**
-** COMPILING
-**
-** This extension requires SQLite 3.32.0 or later.  It uses the
-** sqlite3_database_file_object() interface which was added in
-** version 3.32.0, so it will not link with an earlier version of
-** SQLite.
-**
-** To build this extension as a separately loaded shared library or
-** DLL, use compiler command-lines similar to the following:
-**
-**   (linux)    gcc -fPIC -shared cksumvfs.c -o cksumvfs.so
-**   (mac)      clang -fPIC -dynamiclib cksumvfs.c -o cksumvfs.dylib
-**   (windows)  cl cksumvfs.c -link -dll -out:cksumvfs.dll
-**
-** You may want to add additional compiler options, of course,
-** according to the needs of your project.
-**
-** If you want to statically link this extension with your product,
-** then compile it like any other C-language module but add the
-** "-DSQLITE_CKSUMVFS_STATIC" option so that this module knows that
-** it is being statically linked rather than dynamically linked
-**
-** LOADING
-**
-** To load this extension as a shared library, you first have to
-** bring up a dummy SQLite database connection to use as the argument
-** to the sqlite3_load_extension() API call.  Then you invoke the
-** sqlite3_load_extension() API and shutdown the dummy database
-** connection.  All subsequent database connections that are opened
-** will include this extension.  For example:
-**
-**     sqlite3 *db;
-**     sqlite3_open(":memory:", &db);
-**     sqlite3_load_extention(db, "./cksumvfs");
-**     sqlite3_close(db);
-**
-** If this extension is compiled with -DSQLITE_CKSUMVFS_STATIC and
-** statically linked against the application, initialize it using
-** a single API call as follows:
-**
-**     sqlite3_cksumvfs_init();
-**
-** Cksumvfs is a VFS Shim. When loaded, "cksmvfs" becomes the new
-** default VFS and it uses the prior default VFS as the next VFS
-** down in the stack.  This is normally what you want.  However, it
-** complex situations where multiple VFS shims are being loaded,
-** it might be important to ensure that cksumvfs is loaded in the
-** correct order so that it sequences itself into the default VFS
-** Shim stack in the right order.
-**
-** USING
-**
-** Open database connections using the sqlite3_open() or 
-** sqlite3_open_v2() interfaces, as normal.  Ordinary database files
-** (without a checksum) will operate normally.  Databases with 
-** checksums will return an SQLITE_IOERR_DATA error if a page is
-** encountered that contains an invalid checksum.
-**
-** Checksumming only works on databases that have a reserve-bytes
-** value of exactly 8.  The default value for reserve-bytes is 0.
-** Hence, newly created database files will omit the checksum by
-** default.  To create a database that includes a checksum, change
-** the reserve-bytes value to 8 by runing:
-**
-**    int n = 8;
-**    sqlite3_file_control(db, 0, SQLITE_FCNTL_RESERVED_BYTES, &n);
-**
-** If you do this immediately after creating a new database file,
-** before anything else has been written into the file, then that
-** might be all that you need to do.  Otherwise, the API call
-** above should be followed by:
-**
-**    sqlite3_exec(db, "VACUUM", 0, 0, 0);
-**
-** It never hurts to run the VACUUM, even if you don't need it.
-** If the database is in WAL mode, you should shutdown and
-** reopen all database connections before continuing.
-**
-** From the CLI, use the ".filectrl reserve_bytes 8" command, 
-** followed by "VACUUM;".
-**
-** Note that SQLite allows the number of reserve-bytes to be
-** increased but not decreased.  So if a database file already
-** has a reserve-bytes value greater than 8, there is no way to
-** activate checksumming on that database, other than to dump
-** and restore the database file.  Note also that other extensions
-** might also make use of the reserve-bytes.  Checksumming will
-** be incompatible with those other extensions.
-**
-** VERIFICATION OF CHECKSUMS
-**
-** If any checksum is incorrect, the "PRAGMA quick_check" command
-** will find it.  To verify that checksums are actually enabled
-** and running, use the following query:
-**
-**   SELECT count(*), verify_checksum(data)
-**     FROM sqlite_dbpage
-**    GROUP BY 2;
-**
-** There are three possible outputs form the verify_checksum()
-** function: 1, 0, and NULL.  1 is returned if the checksum is
-** correct.  0 is returned if the checksum is incorrect.  NULL
-** is returned if the page is unreadable.  If checksumming is
-** enabled, the read will fail if the checksum is wrong, so the
-** usual result from verify_checksum() on a bad checksum is NULL.
-**
-** If everything is OK, the query above should return a single
-** row where the second column is 1.  Any other result indicates
-** either that there is a checksum error, or checksum validation
-** is disabled.
-**
-** CONTROLLING CHECKSUM VERIFICATION
-**
-** The cksumvfs extension implements a new PRAGMA statement that can
-** be used to disable, re-enable, or query the status of checksum
-** verification:
-**
-**    PRAGMA checksum_verification;          -- query status
-**    PRAGMA checksum_verification=OFF;      -- disable verification
-**    PRAGMA checksum_verification=ON;       -- re-enable verification
-**
-** The "checksum_verification" pragma will return "1" (true) or "0"
-** (false) if checksum verification is enabled or disabled, respectively.
-** "Verification" in this context means the feature that causes
-** SQLITE_IOERR_DATA errors if a checksum mismatch is detected while
-** reading.  Checksums are always kept up-to-date as long as the
-** reserve-bytes value of the database is 8, regardless of the setting
-** of this pragma.  Checksum verification can be disabled (for example)
-** to do forensic analysis of a database that has previously reported
-** a checksum error.
-**
-** The "checksum_verification" pragma will always respond with "0" if
-** the database file does not have a reserve-bytes value of 8.  The
-** pragma will return no rows at all if the cksumvfs extension is
-** not loaded.
-**
-** IMPLEMENTATION NOTES
-**
-** The checksum is stored in the last 8 bytes of each page.  This
-** module only operates if the "bytes of reserved space on each page"
-** value at offset 20 the SQLite database header is exactly 8.  If
-** the reserved-space value is not 8, this module is a no-op.
-*/
-#ifdef SQLITE_CKSUMVFS_STATIC
-# include "sqlite3.h"
-#else
-# include "sqlite3ext.h"
-  SQLITE_EXTENSION_INIT1
-#endif
-#include <string.h>
-#include <assert.h>
-
-
-/*
-** Forward declaration of objects used by this utility
-*/
-typedef struct sqlite3_vfs CksmVfs;
-typedef struct CksmFile CksmFile;
-
-/*
-** Useful datatype abbreviations
-*/
-#if !defined(SQLITE_CORE)
-  typedef unsigned char u8;
-  typedef unsigned int u32;
-#endif
-
-/* Access to a lower-level VFS that (might) implement dynamic loading,
-** access to randomness, etc.
-*/
-#define ORIGVFS(p)  ((sqlite3_vfs*)((p)->pAppData))
-#define ORIGFILE(p) ((sqlite3_file*)(((CksmFile*)(p))+1))
-
-/* An open file */
-struct CksmFile {
-  sqlite3_file base;    /* IO methods */
-  const char *zFName;   /* Original name of the file */
-  char computeCksm;     /* True to compute checksums.
-                        ** Always true if reserve size is 8. */
-  char verifyCksm;      /* True to verify checksums */
-  char isWal;           /* True if processing a WAL file */
-  CksmFile *pPartner;   /* Ptr from WAL to main-db, or from main-db to WAL */
-};
-
-/*
-** Methods for CksmFile
-*/
-static int cksmClose(sqlite3_file*);
-static int cksmRead(sqlite3_file*, void*, int iAmt, sqlite3_int64 iOfst);
-static int cksmWrite(sqlite3_file*,const void*,int iAmt, sqlite3_int64 iOfst);
-static int cksmTruncate(sqlite3_file*, sqlite3_int64 size);
-static int cksmSync(sqlite3_file*, int flags);
-static int cksmFileSize(sqlite3_file*, sqlite3_int64 *pSize);
-static int cksmLock(sqlite3_file*, int);
-static int cksmUnlock(sqlite3_file*, int);
-static int cksmCheckReservedLock(sqlite3_file*, int *pResOut);
-static int cksmFileControl(sqlite3_file*, int op, void *pArg);
-static int cksmSectorSize(sqlite3_file*);
-static int cksmDeviceCharacteristics(sqlite3_file*);
-static int cksmShmMap(sqlite3_file*, int iPg, int pgsz, int, void volatile**);
-static int cksmShmLock(sqlite3_file*, int offset, int n, int flags);
-static void cksmShmBarrier(sqlite3_file*);
-static int cksmShmUnmap(sqlite3_file*, int deleteFlag);
-static int cksmFetch(sqlite3_file*, sqlite3_int64 iOfst, int iAmt, void **pp);
-static int cksmUnfetch(sqlite3_file*, sqlite3_int64 iOfst, void *p);
-
-/*
-** Methods for CksmVfs
-*/
-static int cksmOpen(sqlite3_vfs*, const char *, sqlite3_file*, int , int *);
-static int cksmDelete(sqlite3_vfs*, const char *zName, int syncDir);
-static int cksmAccess(sqlite3_vfs*, const char *zName, int flags, int *);
-static int cksmFullPathname(sqlite3_vfs*, const char *zName, int, char *zOut);
-static void *cksmDlOpen(sqlite3_vfs*, const char *zFilename);
-static void cksmDlError(sqlite3_vfs*, int nByte, char *zErrMsg);
-static void (*cksmDlSym(sqlite3_vfs *pVfs, void *p, const char*zSym))(void);
-static void cksmDlClose(sqlite3_vfs*, void*);
-static int cksmRandomness(sqlite3_vfs*, int nByte, char *zOut);
-static int cksmSleep(sqlite3_vfs*, int microseconds);
-static int cksmCurrentTime(sqlite3_vfs*, double*);
-static int cksmGetLastError(sqlite3_vfs*, int, char *);
-static int cksmCurrentTimeInt64(sqlite3_vfs*, sqlite3_int64*);
-static int cksmSetSystemCall(sqlite3_vfs*, const char*,sqlite3_syscall_ptr);
-static sqlite3_syscall_ptr cksmGetSystemCall(sqlite3_vfs*, const char *z);
-static const char *cksmNextSystemCall(sqlite3_vfs*, const char *zName);
-
-static sqlite3_vfs cksm_vfs = {
-  3,                            /* iVersion (set when registered) */
-  0,                            /* szOsFile (set when registered) */
-  1024,                         /* mxPathname */
-  0,                            /* pNext */
-  "cksmvfs",                    /* zName */
-  0,                            /* pAppData (set when registered) */ 
-  cksmOpen,                     /* xOpen */
-  cksmDelete,                   /* xDelete */
-  cksmAccess,                   /* xAccess */
-  cksmFullPathname,             /* xFullPathname */
-  cksmDlOpen,                   /* xDlOpen */
-  cksmDlError,                  /* xDlError */
-  cksmDlSym,                    /* xDlSym */
-  cksmDlClose,                  /* xDlClose */
-  cksmRandomness,               /* xRandomness */
-  cksmSleep,                    /* xSleep */
-  cksmCurrentTime,              /* xCurrentTime */
-  cksmGetLastError,             /* xGetLastError */
-  cksmCurrentTimeInt64,         /* xCurrentTimeInt64 */
-  cksmSetSystemCall,            /* xSetSystemCall */
-  cksmGetSystemCall,            /* xGetSystemCall */
-  cksmNextSystemCall            /* xNextSystemCall */
-};
-
-static const sqlite3_io_methods cksm_io_methods = {
-  3,                              /* iVersion */
-  cksmClose,                      /* xClose */
-  cksmRead,                       /* xRead */
-  cksmWrite,                      /* xWrite */
-  cksmTruncate,                   /* xTruncate */
-  cksmSync,                       /* xSync */
-  cksmFileSize,                   /* xFileSize */
-  cksmLock,                       /* xLock */
-  cksmUnlock,                     /* xUnlock */
-  cksmCheckReservedLock,          /* xCheckReservedLock */
-  cksmFileControl,                /* xFileControl */
-  cksmSectorSize,                 /* xSectorSize */
-  cksmDeviceCharacteristics,      /* xDeviceCharacteristics */
-  cksmShmMap,                     /* xShmMap */
-  cksmShmLock,                    /* xShmLock */
-  cksmShmBarrier,                 /* xShmBarrier */
-  cksmShmUnmap,                   /* xShmUnmap */
-  cksmFetch,                      /* xFetch */
-  cksmUnfetch                     /* xUnfetch */
-};
-
-/* Do byte swapping on a unsigned 32-bit integer */
-#define BYTESWAP32(x) ( \
-    (((x)&0x000000FF)<<24) + (((x)&0x0000FF00)<<8)  \
-  + (((x)&0x00FF0000)>>8)  + (((x)&0xFF000000)>>24) \
-)
-
-/* Compute a checksum on a buffer */
-static void cksmCompute(
-  u8 *a,           /* Content to be checksummed */
-  int nByte,       /* Bytes of content in a[].  Must be a multiple of 8. */
-  u8 *aOut         /* OUT: Final 8-byte checksum value output */
-){
-  u32 s1 = 0, s2 = 0;
-  u32 *aData = (u32*)a;
-  u32 *aEnd = (u32*)&a[nByte];
-  u32 x = 1;
-
-  assert( nByte>=8 );
-  assert( (nByte&0x00000007)==0 );
-  assert( nByte<=65536 );
-
-  if( 1 == *(u8*)&x ){
-    /* Little-endian */
-    do {
-      s1 += *aData++ + s2;
-      s2 += *aData++ + s1;
-    }while( aData<aEnd );
-  }else{
-    /* Big-endian */
-    do {
-      s1 += BYTESWAP32(aData[0]) + s2;
-      s2 += BYTESWAP32(aData[1]) + s1;
-      aData += 2;
-    }while( aData<aEnd );
-    s1 = BYTESWAP32(s1);
-    s2 = BYTESWAP32(s2);
-  }
-  memcpy(aOut, &s1, 4);
-  memcpy(aOut+4, &s2, 4);
-}
-
-/*
-** SQL function:    verify_checksum(BLOB)
-**
-** Return 0 or 1 if the checksum is invalid or valid.  Or return
-** NULL if the input is not a BLOB that is the right size for a
-** database page.
-*/
-static void cksmVerifyFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  int nByte;
-  u8 *data;
-  u8 cksum[8];
-  data = (u8*)sqlite3_value_blob(argv[0]);
-  if( data==0 ) return;
-  if( sqlite3_value_type(argv[0])!=SQLITE_BLOB ) return;
-  nByte = sqlite3_value_bytes(argv[0]);
-  if( nByte<512 || nByte>65536 || (nByte & (nByte-1))!=0 ) return;
-  cksmCompute(data, nByte-8, cksum);
-  sqlite3_result_int(context, memcmp(data+nByte-8,cksum,8)==0);
-}
-
-/*
-** Close a cksm-file.
-*/
-static int cksmClose(sqlite3_file *pFile){
-  CksmFile *p = (CksmFile *)pFile;
-  if( p->pPartner ){
-    assert( p->pPartner->pPartner==p );
-    p->pPartner->pPartner = 0;
-    p->pPartner = 0;
-  }
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xClose(pFile);
-}
-
-/*
-** Read data from a cksm-file.
-*/
-static int cksmRead(
-  sqlite3_file *pFile, 
-  void *zBuf, 
-  int iAmt, 
-  sqlite_int64 iOfst
-){
-  int rc;
-  CksmFile *p = (CksmFile *)pFile;
-  pFile = ORIGFILE(pFile);
-  rc = pFile->pMethods->xRead(pFile, zBuf, iAmt, iOfst);
-  if( rc==SQLITE_OK ){
-    if( iOfst==0 && iAmt>=100 && memcmp(zBuf,"SQLite format 3",16)==0 ){
-      u8 *d = (u8*)zBuf;
-      char hasCorrectReserveSize = (d[20]==8);
-      if( hasCorrectReserveSize!=p->computeCksm ){
-        p->computeCksm = p->verifyCksm = hasCorrectReserveSize;
-      }
-    }
-    /* Verify the checksum if (1) the size seems appropriate for a database
-    ** page, and if (2) checksum verification is enabled.  But (3) do not 
-    ** verify the checksums on a WAL page if the main database file
-    ** has subsequently turned off checksums.
-    */
-    if( iAmt>=512           /* (1) */
-     && p->verifyCksm       /* (2) */
-     && (!p->isWal || (p->pPartner!=0 && p->pPartner->verifyCksm))  /* (3) */
-    ){
-      u8 cksum[8];
-      cksmCompute((u8*)zBuf, iAmt-8, cksum);
-      if( memcmp(zBuf+iAmt-8, cksum, 8)!=0 ){
-        sqlite3_log(SQLITE_IOERR_DATA,
-           "checksum fault offset %lld of \"%s\"",
-           iOfst, p->zFName);
-        rc = SQLITE_IOERR_DATA;
-      }
-    }
-  }
-  return rc;
-}
-
-/*
-** Write data to a cksm-file.
-*/
-static int cksmWrite(
-  sqlite3_file *pFile,
-  const void *zBuf,
-  int iAmt,
-  sqlite_int64 iOfst
-){
-  CksmFile *p = (CksmFile *)pFile;
-  pFile = ORIGFILE(pFile);
-  if( iOfst==0 && iAmt>=100 && memcmp(zBuf,"SQLite format 3",16)==0 ){
-    u8 *d = (u8*)zBuf;
-    char hasCorrectReserveSize = (d[20]==8);
-    if( hasCorrectReserveSize!=p->computeCksm ){
-      p->computeCksm = p->verifyCksm = hasCorrectReserveSize;
-    }
-  }
-  /* If the write size is appropriate for a database page and if
-  ** checksums where ever enabled, then it will be safe to compute
-  ** the checksums.  The reserve byte size might have increased, but
-  ** it will never decrease.  And because it cannot decrease, the
-  ** checksum will not overwrite anything.
-  */
-  if( iAmt>=512 && p->computeCksm ){
-    cksmCompute((u8*)zBuf, iAmt-8, ((u8*)zBuf)+iAmt-8);
-  }
-  return pFile->pMethods->xWrite(pFile, zBuf, iAmt, iOfst);
-}
-
-/*
-** Truncate a cksm-file.
-*/
-static int cksmTruncate(sqlite3_file *pFile, sqlite_int64 size){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xTruncate(pFile, size);
-}
-
-/*
-** Sync a cksm-file.
-*/
-static int cksmSync(sqlite3_file *pFile, int flags){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xSync(pFile, flags);
-}
-
-/*
-** Return the current file-size of a cksm-file.
-*/
-static int cksmFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){
-  CksmFile *p = (CksmFile *)pFile;
-  pFile = ORIGFILE(p);
-  return pFile->pMethods->xFileSize(pFile, pSize);
-}
-
-/*
-** Lock a cksm-file.
-*/
-static int cksmLock(sqlite3_file *pFile, int eLock){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xLock(pFile, eLock);
-}
-
-/*
-** Unlock a cksm-file.
-*/
-static int cksmUnlock(sqlite3_file *pFile, int eLock){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xUnlock(pFile, eLock);
-}
-
-/*
-** Check if another file-handle holds a RESERVED lock on a cksm-file.
-*/
-static int cksmCheckReservedLock(sqlite3_file *pFile, int *pResOut){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xCheckReservedLock(pFile, pResOut);
-}
-
-/*
-** File control method. For custom operations on a cksm-file.
-*/
-static int cksmFileControl(sqlite3_file *pFile, int op, void *pArg){
-  int rc;
-  CksmFile *p = (CksmFile*)pFile;
-  pFile = ORIGFILE(pFile);
-  if( op==SQLITE_FCNTL_PRAGMA ){
-    char **azArg = (char**)pArg;
-    assert( azArg[1]!=0 );
-    if( sqlite3_stricmp(azArg[1],"checksum_verification")==0 ){
-      char *zArg = azArg[2];
-      if( zArg!=0 ){
-        if( (zArg[0]>='1' && zArg[0]<='9')
-         || sqlite3_strlike("enable%",zArg,0)==0
-         || sqlite3_stricmp("yes",zArg)==0
-         || sqlite3_stricmp("on",zArg)==0
-        ){
-          p->verifyCksm = p->computeCksm;
-        }else{
-          p->verifyCksm = 0;
-        }
-      }
-      azArg[0] = sqlite3_mprintf("%d",p->verifyCksm);
-      return SQLITE_OK;
-    }else if( p->computeCksm && azArg[2]!=0
-           && sqlite3_stricmp(azArg[1], "page_size")==0 ){
-      /* Do not allow page size changes on a checksum database */
-      return SQLITE_OK;
-    }
-  }
-  rc = pFile->pMethods->xFileControl(pFile, op, pArg);
-  if( rc==SQLITE_OK && op==SQLITE_FCNTL_VFSNAME ){
-    *(char**)pArg = sqlite3_mprintf("cksm/%z", *(char**)pArg);
-  }
-  return rc;
-}
-
-/*
-** Return the sector-size in bytes for a cksm-file.
-*/
-static int cksmSectorSize(sqlite3_file *pFile){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xSectorSize(pFile);
-}
-
-/*
-** Return the device characteristic flags supported by a cksm-file.
-*/
-static int cksmDeviceCharacteristics(sqlite3_file *pFile){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xDeviceCharacteristics(pFile);
-}
-
-/* Create a shared memory file mapping */
-static int cksmShmMap(
-  sqlite3_file *pFile,
-  int iPg,
-  int pgsz,
-  int bExtend,
-  void volatile **pp
-){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xShmMap(pFile,iPg,pgsz,bExtend,pp);
-}
-
-/* Perform locking on a shared-memory segment */
-static int cksmShmLock(sqlite3_file *pFile, int offset, int n, int flags){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xShmLock(pFile,offset,n,flags);
-}
-
-/* Memory barrier operation on shared memory */
-static void cksmShmBarrier(sqlite3_file *pFile){
-  pFile = ORIGFILE(pFile);
-  pFile->pMethods->xShmBarrier(pFile);
-}
-
-/* Unmap a shared memory segment */
-static int cksmShmUnmap(sqlite3_file *pFile, int deleteFlag){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xShmUnmap(pFile,deleteFlag);
-}
-
-/* Fetch a page of a memory-mapped file */
-static int cksmFetch(
-  sqlite3_file *pFile,
-  sqlite3_int64 iOfst,
-  int iAmt,
-  void **pp
-){
-  CksmFile *p = (CksmFile *)pFile;
-  if( p->computeCksm ){
-    *pp = 0;
-    return SQLITE_OK;
-  }
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xFetch(pFile, iOfst, iAmt, pp);
-}
-
-/* Release a memory-mapped page */
-static int cksmUnfetch(sqlite3_file *pFile, sqlite3_int64 iOfst, void *pPage){
-  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xUnfetch(pFile, iOfst, pPage);
-}
-
-/*
-** Open a cksm file handle.
-*/
-static int cksmOpen(
-  sqlite3_vfs *pVfs,
-  const char *zName,
-  sqlite3_file *pFile,
-  int flags,
-  int *pOutFlags
-){
-  CksmFile *p;
-  sqlite3_file *pSubFile;
-  sqlite3_vfs *pSubVfs;
-  int rc;
-  pSubVfs = ORIGVFS(pVfs);
-  if( (flags & (SQLITE_OPEN_MAIN_DB|SQLITE_OPEN_WAL))==0 ){
-    return pSubVfs->xOpen(pSubVfs, zName, pFile, flags, pOutFlags);
-  }
-  p = (CksmFile*)pFile;
-  memset(p, 0, sizeof(*p));
-  pSubFile = ORIGFILE(pFile);
-  p->base.pMethods = &cksm_io_methods;
-  rc = pSubVfs->xOpen(pSubVfs, zName, pSubFile, flags, pOutFlags);
-  if( rc ) goto cksm_open_done;
-  if( flags & SQLITE_OPEN_WAL ){
-    sqlite3_file *pDb = sqlite3_database_file_object(zName);
-    p->pPartner = (CksmFile*)pDb;
-    assert( p->pPartner->pPartner==0 );
-    p->pPartner->pPartner = p;
-    p->isWal = 1;
-    p->computeCksm = p->pPartner->computeCksm;
-  }else{
-    p->isWal = 0;
-    p->computeCksm = 0;
-  }
-  p->zFName = zName;
-cksm_open_done:
-  if( rc ) pFile->pMethods = 0;
-  return rc;
-}
-
-/*
-** All other VFS methods are pass-thrus.
-*/
-static int cksmDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
-  return ORIGVFS(pVfs)->xDelete(ORIGVFS(pVfs), zPath, dirSync);
-}
-static int cksmAccess(
-  sqlite3_vfs *pVfs, 
-  const char *zPath, 
-  int flags, 
-  int *pResOut
-){
-  return ORIGVFS(pVfs)->xAccess(ORIGVFS(pVfs), zPath, flags, pResOut);
-}
-static int cksmFullPathname(
-  sqlite3_vfs *pVfs, 
-  const char *zPath, 
-  int nOut, 
-  char *zOut
-){
-  return ORIGVFS(pVfs)->xFullPathname(ORIGVFS(pVfs),zPath,nOut,zOut);
-}
-static void *cksmDlOpen(sqlite3_vfs *pVfs, const char *zPath){
-  return ORIGVFS(pVfs)->xDlOpen(ORIGVFS(pVfs), zPath);
-}
-static void cksmDlError(sqlite3_vfs *pVfs, int nByte, char *zErrMsg){
-  ORIGVFS(pVfs)->xDlError(ORIGVFS(pVfs), nByte, zErrMsg);
-}
-static void (*cksmDlSym(sqlite3_vfs *pVfs, void *p, const char *zSym))(void){
-  return ORIGVFS(pVfs)->xDlSym(ORIGVFS(pVfs), p, zSym);
-}
-static void cksmDlClose(sqlite3_vfs *pVfs, void *pHandle){
-  ORIGVFS(pVfs)->xDlClose(ORIGVFS(pVfs), pHandle);
-}
-static int cksmRandomness(sqlite3_vfs *pVfs, int nByte, char *zBufOut){
-  return ORIGVFS(pVfs)->xRandomness(ORIGVFS(pVfs), nByte, zBufOut);
-}
-static int cksmSleep(sqlite3_vfs *pVfs, int nMicro){
-  return ORIGVFS(pVfs)->xSleep(ORIGVFS(pVfs), nMicro);
-}
-static int cksmCurrentTime(sqlite3_vfs *pVfs, double *pTimeOut){
-  return ORIGVFS(pVfs)->xCurrentTime(ORIGVFS(pVfs), pTimeOut);
-}
-static int cksmGetLastError(sqlite3_vfs *pVfs, int a, char *b){
-  return ORIGVFS(pVfs)->xGetLastError(ORIGVFS(pVfs), a, b);
-}
-static int cksmCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *p){
-  return ORIGVFS(pVfs)->xCurrentTimeInt64(ORIGVFS(pVfs), p);
-}
-static int cksmSetSystemCall(
-  sqlite3_vfs *pVfs,
-  const char *zName,
-  sqlite3_syscall_ptr pCall
-){
-  return ORIGVFS(pVfs)->xSetSystemCall(ORIGVFS(pVfs),zName,pCall);
-}
-static sqlite3_syscall_ptr cksmGetSystemCall(
-  sqlite3_vfs *pVfs,
-  const char *zName
-){
-  return ORIGVFS(pVfs)->xGetSystemCall(ORIGVFS(pVfs),zName);
-}
-static const char *cksmNextSystemCall(sqlite3_vfs *pVfs, const char *zName){
-  return ORIGVFS(pVfs)->xNextSystemCall(ORIGVFS(pVfs), zName);
-}
-
-/* Register the verify_checksum() SQL function.
-*/
-static int cksmRegisterFunc(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  int rc;
-  if( db==0 ) return SQLITE_OK;
-  rc = sqlite3_create_function(db, "verify_checksum", 1,
-                   SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
-                   0, cksmVerifyFunc, 0, 0);
-  return rc;
-}
-
-/*
-** Register the cksum VFS as the default VFS for the system.
-** Also make arrangements to automatically register the "verify_checksum()"
-** SQL function on each new database connection.
-*/
-static int cksmRegisterVfs(void){
-  int rc = SQLITE_OK;
-  sqlite3_vfs *pOrig;
-  if( sqlite3_vfs_find("cksum")!=0 ) return SQLITE_OK;
-  pOrig = sqlite3_vfs_find(0);
-  cksm_vfs.iVersion = pOrig->iVersion;
-  cksm_vfs.pAppData = pOrig;
-  cksm_vfs.szOsFile = pOrig->szOsFile + sizeof(CksmFile);
-  rc = sqlite3_vfs_register(&cksm_vfs, 1);
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_auto_extension((void(*)(void))cksmRegisterFunc);
-  }
-  return rc;
-}
-
-#if defined(SQLITE_CKSUMVFS_STATIC)
-/* This variant of the initializer runs when the extension is
-** statically linked.
-*/
-int sqlite3_register_cksumvfs(const char *NotUsed){
-  (void)NotUsed;
-  return cksmRegisterVfs();
-}
-#endif /* defined(SQLITE_CKSUMVFS_STATIC */
-
-#if !defined(SQLITE_CKSUMVFS_STATIC)
-/* This variant of the initializer function is used when the
-** extension is shared library to be loaded at run-time.
-*/
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-/* 
-** This routine is called by sqlite3_load_extension() when the
-** extension is first loaded.
-***/
-int sqlite3_cksumvfs_init(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  int rc;
-  SQLITE_EXTENSION_INIT2(pApi);
-  (void)pzErrMsg; /* not used */
-  rc = cksmRegisterFunc(db, 0, 0);
-  if( rc==SQLITE_OK ){
-    
-  }
-  if( rc==SQLITE_OK ){
-    rc = cksmRegisterVfs();
-  }
-  if( rc==SQLITE_OK ) rc = SQLITE_OK_LOAD_PERMANENTLY;
-  return rc;
-}
-#endif /* !defined(SQLITE_CKSUMVFS_STATIC) */
@@ -118,7 +118,6 @@ static int completionConnect(
 #define COMPLETION_COLUMN_WHOLELINE 2  /* Entire line seen so far */
 #define COMPLETION_COLUMN_PHASE     3  /* ePhase - used for debugging only */

-  sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
  rc = sqlite3_declare_vtab(db,
      "CREATE TABLE x("
      "  candidate TEXT,"
@@ -119,13 +119,11 @@ int sqlite3_compress_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "compress", 1, 
-                    SQLITE_UTF8 | SQLITE_INNOCUOUS,
-                    0, compressFunc, 0, 0);
+  rc = sqlite3_create_function(db, "compress", 1, SQLITE_UTF8, 0,
+                               compressFunc, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "uncompress", 1,
-                    SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
-                    0, uncompressFunc, 0, 0);
+    rc = sqlite3_create_function(db, "uncompress", 1, SQLITE_UTF8, 0,
+                                 uncompressFunc, 0, 0);
  }
  return rc;
 }
@@ -632,15 +632,6 @@ static int csvtabConnect(
  for(i=0; i<sizeof(azPValue)/sizeof(azPValue[0]); i++){
    sqlite3_free(azPValue[i]);
  }
-  /* Rationale for DIRECTONLY:
-  ** An attacker who controls a database schema could use this vtab
-  ** to exfiltrate sensitive data from other files in the filesystem.
-  ** And, recommended practice is to put all CSV virtual tables in the
-  ** TEMP namespace, so they should still be usable from within TEMP
-  ** views, so there shouldn't be a serious loss of functionality by
-  ** prohibiting the use of this vtab from persistent triggers and views.
-  */
-  sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
  return SQLITE_OK;

 csvtab_connect_oom:
@@ -113,12 +113,10 @@ int sqlite3_eval_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "eval", 1, 
-                               SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+  rc = sqlite3_create_function(db, "eval", 1, SQLITE_UTF8, 0,
                               sqlEvalFunc, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "eval", 2,
-                                 SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+    rc = sqlite3_create_function(db, "eval", 2, SQLITE_UTF8, 0,
                                 sqlEvalFunc, 0, 0);
  }
  return rc;
@@ -394,7 +394,6 @@ static int writeFile(

  if( mtime>=0 ){
 #if defined(_WIN32)
-#if !SQLITE_OS_WINRT
    /* Windows */
    FILETIME lastAccess;
    FILETIME lastWrite;
@@ -425,7 +424,6 @@ static int writeFile(
    }else{
      return 1;
    }
-#endif
 #elif defined(AT_FDCWD) && 0 /* utimensat() is not universally available */
    /* Recent unix */
    struct timespec times[2];
@@ -587,7 +585,6 @@ static int fsdirConnect(
    pNew = (fsdir_tab*)sqlite3_malloc( sizeof(*pNew) );
    if( pNew==0 ) return SQLITE_NOMEM;
    memset(pNew, 0, sizeof(*pNew));
-    sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
  }
  *ppVtab = (sqlite3_vtab*)pNew;
  return rc;
@@ -981,12 +978,10 @@ int sqlite3_fileio_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "readfile", 1, 
-                               SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+  rc = sqlite3_create_function(db, "readfile", 1, SQLITE_UTF8, 0,
                               readfileFunc, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "writefile", -1,
-                                 SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+    rc = sqlite3_create_function(db, "writefile", -1, SQLITE_UTF8, 0,
                                 writefileFunc, 0, 0);
  }
  if( rc==SQLITE_OK ){
@@ -822,7 +822,6 @@ static int deltaparsevtabConnect(
    *ppVtab = (sqlite3_vtab*)pNew;
    if( pNew==0 ) return SQLITE_NOMEM;
    memset(pNew, 0, sizeof(*pNew));
-    sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
  }
  return rc;
 }
@@ -1071,18 +1070,17 @@ int sqlite3_fossildelta_init(
  char **pzErrMsg, 
  const sqlite3_api_routines *pApi
 ){
-  static const int enc = SQLITE_UTF8|SQLITE_INNOCUOUS;
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "delta_create", 2, enc, 0,
+  rc = sqlite3_create_function(db, "delta_create", 2, SQLITE_UTF8, 0,
                               deltaCreateFunc, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "delta_apply", 2, enc, 0,
+    rc = sqlite3_create_function(db, "delta_apply", 2, SQLITE_UTF8, 0,
                                 deltaApplyFunc, 0, 0);
  }
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "delta_output_size", 1, enc, 0,
+    rc = sqlite3_create_function(db, "delta_output_size", 1, SQLITE_UTF8, 0,
                                 deltaOutputSizeFunc, 0, 0);
  }
  if( rc==SQLITE_OK ){
@@ -540,8 +540,6 @@ static int fuzzerConnect(
      if( rc!=SQLITE_OK ){
        fuzzerDisconnect((sqlite3_vtab *)pNew);
        pNew = 0;
-      }else{
-        sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
      }
    }
  }
@@ -121,12 +121,10 @@ int sqlite3_ieee_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "ieee754", 1, 
-                               SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+  rc = sqlite3_create_function(db, "ieee754", 1, SQLITE_UTF8, 0,
                               ieee754func, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "ieee754", 2,
-                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+    rc = sqlite3_create_function(db, "ieee754", 2, SQLITE_UTF8, 0,
                                 ieee754func, 0, 0);
  }
  return rc;
@@ -522,37 +522,6 @@ static void jsonReturnJson(
  sqlite3_result_subtype(pCtx, JSON_SUBTYPE);
 }

-/*
-** Translate a single byte of Hex into an integer.
-** This routine only works if h really is a valid hexadecimal
-** character:  0..9a..fA..F
-*/
-static u8 jsonHexToInt(int h){
-  assert( (h>='0' && h<='9') ||  (h>='a' && h<='f') ||  (h>='A' && h<='F') );
-#ifdef SQLITE_EBCDIC
-  h += 9*(1&~(h>>4));
-#else
-  h += 9*(1&(h>>6));
-#endif
-  return (u8)(h & 0xf);
-}
-
-/*
-** Convert a 4-byte hex string into an integer
-*/
-static u32 jsonHexToInt4(const char *z){
-  u32 v;
-  assert( safe_isxdigit(z[0]) );
-  assert( safe_isxdigit(z[1]) );
-  assert( safe_isxdigit(z[2]) );
-  assert( safe_isxdigit(z[3]) );
-  v = (jsonHexToInt(z[0])<<12)
-    + (jsonHexToInt(z[1])<<8)
-    + (jsonHexToInt(z[2])<<4)
-    + jsonHexToInt(z[3]);
-  return v;
-}
-
 /*
 ** Make the JsonNode the return value of the function.
 */
@@ -646,8 +615,15 @@ static void jsonReturn(
          }else{
            c = z[++i];
            if( c=='u' ){
-              u32 v = jsonHexToInt4(z+i+1);
-              i += 4;
+              u32 v = 0, k;
+              for(k=0; k<4; i++, k++){
+                assert( i<n-2 );
+                c = z[i+1];
+                assert( safe_isxdigit(c) );
+                if( c<='9' ) v = v*16 + c - '0';
+                else if( c<='F' ) v = v*16 + c - 'A' + 10;
+                else v = v*16 + c - 'a' + 10;
+              }
              if( v==0 ) break;
              if( v<=0x7f ){
                zOut[j++] = (char)v;
@@ -655,25 +631,9 @@ static void jsonReturn(
                zOut[j++] = (char)(0xc0 | (v>>6));
                zOut[j++] = 0x80 | (v&0x3f);
              }else{
-                u32 vlo;
-                if( (v&0xfc00)==0xd800
-                  && i<n-6
-                  && z[i+1]=='\\'
-                  && z[i+2]=='u'
-                  && ((vlo = jsonHexToInt4(z+i+3))&0xfc00)==0xdc00
-                ){
-                  /* We have a surrogate pair */
-                  v = ((v&0x3ff)<<10) + (vlo&0x3ff) + 0x10000;
-                  i += 6;
-                  zOut[j++] = 0xf0 | (v>>18);
-                  zOut[j++] = 0x80 | ((v>>12)&0x3f);
-                  zOut[j++] = 0x80 | ((v>>6)&0x3f);
-                  zOut[j++] = 0x80 | (v&0x3f);
-                }else{
-                  zOut[j++] = 0xe0 | (v>>12);
-                  zOut[j++] = 0x80 | ((v>>6)&0x3f);
-                  zOut[j++] = 0x80 | (v&0x3f);
-                }
+                zOut[j++] = (char)(0xe0 | (v>>12));
+                zOut[j++] = 0x80 | ((v>>6)&0x3f);
+                zOut[j++] = 0x80 | (v&0x3f);
              }
            }else{
              if( c=='b' ){
@@ -1176,49 +1136,18 @@ static JsonNode *jsonLookupStep(
      }
      return pNode;
    }
-  }else if( zPath[0]=='[' ){
+  }else if( zPath[0]=='[' && safe_isdigit(zPath[1]) ){
+    if( pRoot->eType!=JSON_ARRAY ) return 0;
    i = 0;
    j = 1;
    while( safe_isdigit(zPath[j]) ){
      i = i*10 + zPath[j] - '0';
      j++;
    }
-    if( j<2 || zPath[j]!=']' ){
-      if( zPath[1]=='#' ){
-        JsonNode *pBase = pRoot;
-        int iBase = iRoot;
-        if( pRoot->eType!=JSON_ARRAY ) return 0;
-        for(;;){
-          while( j<=pBase->n ){
-            if( (pBase[j].jnFlags & JNODE_REMOVE)==0 ) i++;
-            j += jsonNodeSize(&pBase[j]);
-          }
-          if( (pBase->jnFlags & JNODE_APPEND)==0 ) break;
-          iBase += pBase->u.iAppend;
-          pBase = &pParse->aNode[iBase];
-          j = 1;
-        }
-        j = 2;
-        if( zPath[2]=='-' && safe_isdigit(zPath[3]) ){
-          unsigned int x = 0;
-          j = 3;
-          do{
-            x = x*10 + zPath[j] - '0';
-            j++;
-          }while( safe_isdigit(zPath[j]) );
-          if( x>i ) return 0;
-          i -= x;
-        }
-        if( zPath[j]!=']' ){
-          *pzErr = zPath;
-          return 0;
-        }
-      }else{
-        *pzErr = zPath;
-        return 0;
-      }
+    if( zPath[j]!=']' ){
+      *pzErr = zPath;
+      return 0;
    }
-    if( pRoot->eType!=JSON_ARRAY ) return 0;
    zPath += j + 1;
    j = 1;
    for(;;){
@@ -1891,7 +1820,7 @@ static void jsonArrayStep(
    if( pStr->zBuf==0 ){
      jsonInit(pStr, ctx);
      jsonAppendChar(pStr, '[');
-    }else if( pStr->nUsed>1 ){
+    }else{
      jsonAppendChar(pStr, ',');
      pStr->pCtx = ctx;
    }
@@ -1939,11 +1868,9 @@ static void jsonGroupInverse(
  int argc,
  sqlite3_value **argv
 ){
-  unsigned int i;
+  int i;
  int inStr = 0;
-  int nNest = 0;
  char *z;
-  char c;
  JsonString *pStr;
  UNUSED_PARAM(argc);
  UNUSED_PARAM(argv);
@@ -1954,18 +1881,12 @@ static void jsonGroupInverse(
  if( NEVER(!pStr) ) return;
 #endif
  z = pStr->zBuf;
-  for(i=1; (c = z[i])!=',' || inStr || nNest; i++){
-    if( i>=pStr->nUsed ){
-      pStr->nUsed = 1;
-      return;
-    }
-    if( c=='"' ){
+  for(i=1; z[i]!=',' || inStr; i++){
+    assert( i<pStr->nUsed );
+    if( z[i]=='"' ){
      inStr = !inStr;
-    }else if( c=='\\' ){
+    }else if( z[i]=='\\' ){
      i++;
-    }else if( !inStr ){
-      if( c=='{' || c=='[' ) nNest++;
-      if( c=='}' || c==']' ) nNest--;
    }
  }
  pStr->nUsed -= i;      
@@ -1995,7 +1916,7 @@ static void jsonObjectStep(
    if( pStr->zBuf==0 ){
      jsonInit(pStr, ctx);
      jsonAppendChar(pStr, '{');
-    }else if( pStr->nUsed>1 ){
+    }else{
      jsonAppendChar(pStr, ',');
      pStr->pCtx = ctx;
    }
@@ -2091,7 +2012,6 @@ static int jsonEachConnect(
    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
    if( pNew==0 ) return SQLITE_NOMEM;
    memset(pNew, 0, sizeof(*pNew));
-    sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
  }
  return rc;
 }
@@ -2582,19 +2502,16 @@ int sqlite3Json1Init(sqlite3 *db){
    { "json_tree",            &jsonTreeModule               },
  };
 #endif
-  static const int enc = 
-       SQLITE_UTF8 |
-       SQLITE_DETERMINISTIC |
-       SQLITE_INNOCUOUS;
  for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
-    rc = sqlite3_create_function(db, aFunc[i].zName, aFunc[i].nArg, enc,
+    rc = sqlite3_create_function(db, aFunc[i].zName, aFunc[i].nArg,
+                                 SQLITE_UTF8 | SQLITE_DETERMINISTIC, 
                                 (void*)&aFunc[i].flag,
                                 aFunc[i].xFunc, 0, 0);
  }
 #ifndef SQLITE_OMIT_WINDOWFUNC
  for(i=0; i<sizeof(aAgg)/sizeof(aAgg[0]) && rc==SQLITE_OK; i++){
    rc = sqlite3_create_window_function(db, aAgg[i].zName, aAgg[i].nArg,
-                                 SQLITE_SUBTYPE | enc, 0,
+                                 SQLITE_UTF8 | SQLITE_DETERMINISTIC, 0,
                                 aAgg[i].xStep, aAgg[i].xFinal,
                                 aAgg[i].xValue, jsonGroupInverse, 0);
  }
@@ -297,17 +297,14 @@ int sqlite3_nextchar_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "next_char", 3,
-                               SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+  rc = sqlite3_create_function(db, "next_char", 3, SQLITE_UTF8, 0,
                               nextCharFunc, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "next_char", 4,
-                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+    rc = sqlite3_create_function(db, "next_char", 4, SQLITE_UTF8, 0,
                                 nextCharFunc, 0, 0);
  }
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "next_char", 5,
-                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+    rc = sqlite3_create_function(db, "next_char", 5, SQLITE_UTF8, 0,
                                 nextCharFunc, 0, 0);
  }
  return rc;
@@ -1,68 +0,0 @@
-/*
-** 2020-01-08
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** This SQLite extension implements a noop() function used for testing.
-**
-** Variants:
-**
-**    noop(X)           The default.  Deterministic.
-**    noop_i(X)         Deterministic and innocuous.
-**    noop_do(X)        Deterministic and direct-only.
-**    noop_nd(X)        Non-deterministic.
-*/
-#include "sqlite3ext.h"
-SQLITE_EXTENSION_INIT1
-#include <assert.h>
-#include <string.h>
-
-/*
-** Implementation of the noop() function.
-**
-** The function returns its argument, unchanged.
-*/
-static void noopfunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  assert( argc==1 );
-  sqlite3_result_value(context, argv[0]);
-}
-
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_noop_init(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  int rc = SQLITE_OK;
-  SQLITE_EXTENSION_INIT2(pApi);
-  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "noop", 1,
-                     SQLITE_UTF8 | SQLITE_DETERMINISTIC,
-                     0, noopfunc, 0, 0);
-  if( rc ) return rc;
-  rc = sqlite3_create_function(db, "noop_i", 1,
-                     SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS,
-                     0, noopfunc, 0, 0);
-  if( rc ) return rc;
-  rc = sqlite3_create_function(db, "noop_do", 1,
-                     SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_DIRECTONLY,
-                     0, noopfunc, 0, 0);
-  if( rc ) return rc;
-  rc = sqlite3_create_function(db, "noop_nd", 1,
-                     SQLITE_UTF8,
-                     0, noopfunc, 0, 0);
-  return rc;
-}
@@ -213,8 +213,7 @@ int sqlite3_percentile_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "percentile", 2, 
-                               SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+  rc = sqlite3_create_function(db, "percentile", 2, SQLITE_UTF8, 0,
                               0, percentStep, percentFinal);
  return rc;
 }
@@ -79,7 +79,6 @@ static int prefixesConnect(
    *ppVtab = (sqlite3_vtab*)pNew;
    if( pNew==0 ) return SQLITE_NOMEM;
    memset(pNew, 0, sizeof(*pNew));
-    sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
  }
  return rc;
 }
@@ -156,7 +156,7 @@ static unsigned re_next_char(ReInput *p){
           && (p->z[p->i+1]&0xc0)==0x80 ){
      c = (c&0x0f)<<12 | ((p->z[p->i]&0x3f)<<6) | (p->z[p->i+1]&0x3f);
      p->i += 2;
-      if( c<=0x7ff || (c>=0xd800 && c<=0xdfff) ) c = 0xfffd;
+      if( c<=0x3ff || (c>=0xd800 && c<=0xdfff) ) c = 0xfffd;
    }else if( (c&0xf8)==0xf0 && p->i+3<p->mx && (p->z[p->i]&0xc0)==0x80
           && (p->z[p->i+1]&0xc0)==0x80 && (p->z[p->i+2]&0xc0)==0x80 ){
      c = (c&0x07)<<18 | ((p->z[p->i]&0x3f)<<12) | ((p->z[p->i+1]&0x3f)<<6)
@@ -610,7 +610,7 @@ static const char *re_subcompile_string(ReCompiled *p){
 ** regular expression.  Applications should invoke this routine once
 ** for every call to re_compile() to avoid memory leaks.
 */
-static void re_free(ReCompiled *pRe){
+void re_free(ReCompiled *pRe){
  if( pRe ){
    sqlite3_free(pRe->aOp);
    sqlite3_free(pRe->aArg);
@@ -624,7 +624,7 @@ static void re_free(ReCompiled *pRe){
 ** compiled regular expression in *ppRe.  Return NULL on success or an
 ** error message if something goes wrong.
 */
-static const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
+const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
  ReCompiled *pRe;
  const char *zErr;
  int i, j;
@@ -754,7 +754,7 @@ int sqlite3_regexp_init(
 ){
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
-  rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS,
-                               0, re_sql_func, 0, 0);
+  rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8, 0,
+                                 re_sql_func, 0, 0);
  return rc;
 }
@@ -105,9 +105,8 @@ int sqlite3_rot_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "rot13", 1,
-                   SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
-                   0, rot13func, 0, 0);
+  rc = sqlite3_create_function(db, "rot13", 1, SQLITE_UTF8, 0,
+                               rot13func, 0, 0);
  if( rc==SQLITE_OK ){
    rc = sqlite3_create_collation(db, "rot13", SQLITE_UTF8, 0, rot13CollFunc);
  }
@@ -126,7 +126,6 @@ static int seriesConnect(
    pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
    if( pNew==0 ) return SQLITE_NOMEM;
    memset(pNew, 0, sizeof(*pNew));
-    sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
  }
  return rc;
 }
@@ -39,9 +39,25 @@ struct SHA1Context {
  unsigned char buffer[64];
 };

+
+#if __GNUC__ && (defined(__i386__) || defined(__x86_64__))
+/*
+ * GCC by itself only generates left rotates.  Use right rotates if
+ * possible to be kinder to dinky implementations with iterative rotate
+ * instructions.
+ */
+#define SHA_ROT(op, x, k) \
+        ({ unsigned int y; asm(op " %1,%0" : "=r" (y) : "I" (k), "0" (x)); y; })
+#define rol(x,k) SHA_ROT("roll", x, k)
+#define ror(x,k) SHA_ROT("rorl", x, k)
+
+#else
+/* Generic C equivalent */
 #define SHA_ROT(x,l,r) ((x) << (l) | (x) >> (r))
 #define rol(x,k) SHA_ROT(x,k,32-(k))
 #define ror(x,k) SHA_ROT(x,32-(k),k)
+#endif
+

 #define blk0le(i) (block[i] = (ror(block[i],8)&0xFF00FF00) \
    |(rol(block[i],8)&0x00FF00FF))
@@ -381,12 +397,10 @@ int sqlite3_sha_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "sha1", 1, 
-                       SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
-                               0, sha1Func, 0, 0);
+  rc = sqlite3_create_function(db, "sha1", 1, SQLITE_UTF8, 0,
+                               sha1Func, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sha1_query", 1, 
-                                 SQLITE_UTF8|SQLITE_DIRECTONLY, 0,
+    rc = sqlite3_create_function(db, "sha1_query", 1, SQLITE_UTF8, 0,
                                 sha1QueryFunc, 0, 0);
  }
  return rc;
@@ -26,12 +26,19 @@
 ** is used.  If SIZE is included it must be one of the integers 224, 256,
 ** 384, or 512, to determine SHA3 hash variant that is computed.
 */
+#if !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_SHA3)
+#if !defined(SQLITEINT_H)
 #include "sqlite3ext.h"
+#endif
 SQLITE_EXTENSION_INIT1
 #include <assert.h>
 #include <string.h>
 #include <stdarg.h>
+#ifdef SQLITE_CORE
+#include "sqliteInt.h"
+#else
 typedef sqlite3_uint64 u64;
+#endif

 /******************************************************************************
 ** The Hash Engine
@@ -684,7 +691,34 @@ static void sha3QueryFunc(
  sqlite3_result_blob(context, SHA3Final(&cx), iSize/8, SQLITE_TRANSIENT);
 }

+/*
+** Register the SHA3 functions on the database connection db.
+** Return any errors encountered.
+*/
+int sqlite3Sha3Init(sqlite3 *db){
+  int rc = SQLITE_OK;
+  rc = sqlite3_create_function(db, "sha3", 1, SQLITE_UTF8, 0,
+                               sha3Func, 0, 0);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function(db, "sha3", 2, SQLITE_UTF8, 0,
+                                 sha3Func, 0, 0);
+  }
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function(db, "sha3_query", 1, SQLITE_UTF8, 0,
+                                 sha3QueryFunc, 0, 0);
+  }
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function(db, "sha3_query", 2, SQLITE_UTF8, 0,
+                                 sha3QueryFunc, 0, 0);
+  }
+  return rc;
+}

+/*
+** Registration entry point for when this module is compiled as a shared
+** library.
+*/
+#ifndef SQLITE_CORE
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
@@ -696,23 +730,7 @@ int sqlite3_shathree_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "sha3", 1,
-                      SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
-                      0, sha3Func, 0, 0);
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sha3", 2,
-                      SQLITE_UTF8 | SQLITE_INNOCUOUS | SQLITE_DETERMINISTIC,
-                      0, sha3Func, 0, 0);
-  }
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sha3_query", 1,
-                      SQLITE_UTF8 | SQLITE_DIRECTONLY,
-                      0, sha3QueryFunc, 0, 0);
-  }
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sha3_query", 2,
-                      SQLITE_UTF8 | SQLITE_DIRECTONLY,
-                      0, sha3QueryFunc, 0, 0);
-  }
-  return rc;
+  return sqlite3Sha3Init(db);
 }
+#endif /* SQLITE_CORE */
+#endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_SHA3) */
@@ -2069,7 +2069,6 @@ static int spellfix1Init(
    if( pNew->zTableName==0 ){
      rc = SQLITE_NOMEM;
    }else{
-      sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
      rc = sqlite3_declare_vtab(db, 
           "CREATE TABLE x(word,rank,distance,langid, "
           "score, matchlen, phonehash HIDDEN, "
@@ -111,12 +111,10 @@ int sqlite3_sqlar_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "sqlar_compress", 1, 
-                               SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+  rc = sqlite3_create_function(db, "sqlar_compress", 1, SQLITE_UTF8, 0,
                               sqlarCompressFunc, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "sqlar_uncompress", 2,
-                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+    rc = sqlite3_create_function(db, "sqlar_uncompress", 2, SQLITE_UTF8, 0,
                                 sqlarUncompressFunc, 0, 0);
  }
  return rc;
@@ -502,13 +502,11 @@ int sqlite3_totype_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "tointeger", 1,
-        SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS, 0,
-        tointegerFunc, 0, 0);
+  rc = sqlite3_create_function(db, "tointeger", 1, SQLITE_UTF8, 0,
+                               tointegerFunc, 0, 0);
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "toreal", 1,
-        SQLITE_UTF8 | SQLITE_DETERMINISTIC | SQLITE_INNOCUOUS, 0,
-        torealFunc, 0, 0);
+    rc = sqlite3_create_function(db, "toreal", 1, SQLITE_UTF8, 0,
+                                 torealFunc, 0, 0);
  }
  return rc;
 }
@@ -1,91 +0,0 @@
-/*
-** 2020-04-14
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** This SQLite extension implements the UINT collating sequence.
-**
-** UINT works like BINARY for text, except that embedded strings
-** of digits compare in numeric order.
-**
-**     *   Leading zeros are handled properly, in the sense that
-**         they do not mess of the maginitude comparison of embedded
-**         strings of digits.  "x00123y" is equal to "x123y".
-**
-**     *   Only unsigned integers are recognized.  Plus and minus
-**         signs are ignored.  Decimal points and exponential notation
-**         are ignored.
-**
-**     *   Embedded integers can be of arbitrary length.  Comparison
-**         is *not* limited integers that can be expressed as a
-**         64-bit machine integer.
-*/
-#include "sqlite3ext.h"
-SQLITE_EXTENSION_INIT1
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-
-/*
-** Compare text in lexicographic order, except strings of digits
-** compare in numeric order.
-*/
-static int uintCollFunc(
-  void *notUsed,
-  int nKey1, const void *pKey1,
-  int nKey2, const void *pKey2
-){
-  const unsigned char *zA = (const unsigned char*)pKey1;
-  const unsigned char *zB = (const unsigned char*)pKey2;
-  int i=0, j=0, x;
-  while( i<nKey1 && j<nKey2 ){
-    x = zA[i] - zB[j];
-    if( isdigit(zA[i]) ){
-      int k;
-      if( !isdigit(zB[j]) ) return x;
-      while( i<nKey1 && zA[i]=='0' ){ i++; }
-      while( j<nKey2 && zB[j]=='0' ){ j++; }
-      k = 0;
-      while( i+k<nKey1 && isdigit(zA[i+k])
-             && j+k<nKey2 && isdigit(zB[j+k]) ){
-        k++;
-      }
-      if( i+k<nKey1 && isdigit(zA[i+k]) ){
-        return +1;
-      }else if( j+k<nKey2 && isdigit(zB[j+k]) ){
-        return -1;
-      }else{
-        x = memcmp(zA+i, zB+j, k);
-        if( x ) return x;
-        i += k;
-        j += k;
-      }
-    }else if( x ){
-      return x;
-    }else{
-      i++;
-      j++;
-    }
-  }
-  return (nKey1 - i) - (nKey2 - j);
-}
-
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_uint_init(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  SQLITE_EXTENSION_INIT2(pApi);
-  (void)pzErrMsg;  /* Unused parameter */
-  return sqlite3_create_collation(db, "uint", SQLITE_UTF8, 0, uintCollFunc);
-}
@@ -1,209 +0,0 @@
-/*
-** 2020-01-11
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** This SQLite extension implements various SQL functions used to access
-** the following SQLite C-language APIs:
-**
-**         sqlite3_uri_parameter()
-**         sqlite3_uri_boolean()
-**         sqlite3_uri_int64()
-**         sqlite3_uri_key()
-**         sqlite3_filename_database()
-**         sqlite3_filename_journal()
-**         sqlite3_filename_wal()
-**         sqlite3_db_filename()
-**
-** These SQL functions are for testing and demonstration purposes only.
-**
-**
-*/
-#include "sqlite3ext.h"
-SQLITE_EXTENSION_INIT1
-#include <assert.h>
-#include <string.h>
-
-/*
-** SQL function:    sqlite3_db_filename(SCHEMA) 
-**
-** Return the filename corresponding to SCHEMA.
-*/
-static void func_db_filename(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  sqlite3_result_text(context, zFile, -1, SQLITE_TRANSIENT);
-}
-
-/*
-** SQL function:    sqlite3_uri_parameter(SCHEMA,NAME) 
-**
-** Return the value of the NAME query parameter to the database for SCHEMA
-*/
-static void func_uri_parameter(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  const char *zName = (const char*)sqlite3_value_text(argv[1]);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  const char *zRes = sqlite3_uri_parameter(zFile, zName);
-  sqlite3_result_text(context, zRes, -1, SQLITE_TRANSIENT);
-}
-
-/*
-** SQL function:    sqlite3_uri_boolean(SCHEMA,NAME,DEFAULT) 
-**
-** Return the boolean value of the NAME query parameter to
-** the database for SCHEMA
-*/
-static void func_uri_boolean(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  const char *zName = (const char*)sqlite3_value_text(argv[1]);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  int iDflt = sqlite3_value_int(argv[2]);
-  int iRes = sqlite3_uri_boolean(zFile, zName, iDflt);
-  sqlite3_result_int(context, iRes);
-}
-
-/*
-** SQL function:    sqlite3_uri_key(SCHEMA,N)
-**
-** Return the name of the Nth query parameter
-*/
-static void func_uri_key(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  int N = sqlite3_value_int(argv[1]);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  const char *zRes = sqlite3_uri_key(zFile, N);
-  sqlite3_result_text(context, zRes, -1, SQLITE_TRANSIENT);
-}
-
-/*
-** SQL function:    sqlite3_uri_int64(SCHEMA,NAME,DEFAULT) 
-**
-** Return the int64 value of the NAME query parameter to
-** the database for SCHEMA
-*/
-static void func_uri_int64(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  const char *zName = (const char*)sqlite3_value_text(argv[1]);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  sqlite3_int64 iDflt = sqlite3_value_int64(argv[2]);
-  sqlite3_int64 iRes = sqlite3_uri_int64(zFile, zName, iDflt);
-  sqlite3_result_int64(context, iRes);
-}
-
-/*
-** SQL function:    sqlite3_filename_database(SCHEMA)
-**
-** Return the database filename for SCHEMA
-*/
-static void func_filename_database(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  const char *zRes = zFile ? sqlite3_filename_database(zFile) : 0;
-  sqlite3_result_text(context, zRes, -1, SQLITE_TRANSIENT);
-}
-
-/*
-** SQL function:    sqlite3_filename_journal(SCHEMA)
-**
-** Return the rollback journal filename for SCHEMA
-*/
-static void func_filename_journal(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  const char *zRes = zFile ? sqlite3_filename_journal(zFile) : 0;
-  sqlite3_result_text(context, zRes, -1, SQLITE_TRANSIENT);
-}
-
-/*
-** SQL function:    sqlite3_filename_wal(SCHEMA)
-**
-** Return the WAL filename for SCHEMA
-*/
-static void func_filename_wal(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  const char *zSchema = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  const char *zFile = sqlite3_db_filename(db, zSchema);
-  const char *zRes = zFile ? sqlite3_filename_wal(zFile) : 0;
-  sqlite3_result_text(context, zRes, -1, SQLITE_TRANSIENT);
-}
-
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_urifuncs_init(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  static const struct {
-    const char *zFuncName;
-    int nArg;
-    void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
-  } aFunc[] = {
-    { "sqlite3_db_filename",       1, func_db_filename       },
-    { "sqlite3_uri_parameter",     2, func_uri_parameter     },
-    { "sqlite3_uri_boolean",       3, func_uri_boolean       },
-    { "sqlite3_uri_int64",         3, func_uri_int64         },
-    { "sqlite3_uri_key",           2, func_uri_key           },
-    { "sqlite3_filename_database", 1, func_filename_database },
-    { "sqlite3_filename_journal",  1, func_filename_journal  },
-    { "sqlite3_filename_wal",      1, func_filename_wal      },
-  };
-  int rc = SQLITE_OK;
-  int i;
-  SQLITE_EXTENSION_INIT2(pApi);
-  (void)pzErrMsg;  /* Unused parameter */
-  for(i=0; rc==SQLITE_OK && i<sizeof(aFunc)/sizeof(aFunc[0]); i++){
-    rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg,
-                     SQLITE_UTF8, 0,
-                     aFunc[i].xFunc, 0, 0);
-  }
-  return rc;
-}
@@ -1,233 +0,0 @@
-/*
-** 2019-10-23
-**
-** The author disclaims copyright to this source code.  In place of
-** a legal notice, here is a blessing:
-**
-**    May you do good and not evil.
-**    May you find forgiveness for yourself and forgive others.
-**    May you share freely, never taking more than you give.
-**
-******************************************************************************
-**
-** This SQLite extension implements functions that handling RFC-4122 UUIDs
-** Three SQL functions are implemented:
-**
-**     uuid()        - generate a version 4 UUID as a string
-**     uuid_str(X)   - convert a UUID X into a well-formed UUID string
-**     uuid_blob(X)  - convert a UUID X into a 16-byte blob
-**
-** The output from uuid() and uuid_str(X) are always well-formed RFC-4122
-** UUID strings in this format:
-**
-**        xxxxxxxx-xxxx-Mxxx-Nxxx-xxxxxxxxxxxx
-**
-** All of the 'x', 'M', and 'N' values are lower-case hexadecimal digits.
-** The M digit indicates the "version".  For uuid()-generated UUIDs, the
-** version is always "4" (a random UUID).  The upper three bits of N digit
-** are the "variant".  This library only supports variant 1 (indicated
-** by values of N between '8' and 'b') as those are overwhelming the most
-** common.  Other variants are for legacy compatibility only.
-**
-** The output of uuid_blob(X) is always a 16-byte blob.  The UUID input
-** string is converted in network byte order (big-endian) in accordance
-** with RFC-4122 specifications for variant-1 UUIDs.  Note that network
-** byte order is *always* used, even if the input self-identifies as a
-** variant-2 UUID.
-**
-** The input X to the uuid_str() and uuid_blob() functions can be either
-** a string or a BLOB.  If it is a BLOB it must be exactly 16 bytes in
-** length or else a NULL is returned.  If the input is a string it must
-** consist of 32 hexadecimal digits, upper or lower case, optionally
-** surrounded by {...} and with optional "-" characters interposed in the
-** middle.  The flexibility of input is inspired by the PostgreSQL
-** implementation of UUID functions that accept in all of the following
-** formats:
-**
-**     A0EEBC99-9C0B-4EF8-BB6D-6BB9BD380A11
-**     {a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11}
-**     a0eebc999c0b4ef8bb6d6bb9bd380a11
-**     a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11
-**     {a0eebc99-9c0b4ef8-bb6d6bb9-bd380a11}
-**
-** If any of the above inputs are passed into uuid_str(), the output will
-** always be in the canonical RFC-4122 format:
-**
-**     a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11
-**
-** If the X input string has too few or too many digits or contains
-** stray characters other than {, }, or -, then NULL is returned.
-*/
-#include "sqlite3ext.h"
-SQLITE_EXTENSION_INIT1
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-
-#if !defined(SQLITE_ASCII) && !defined(SQLITE_EBCDIC)
-# define SQLITE_ASCII 1
-#endif
-
-/*
-** Translate a single byte of Hex into an integer.
-** This routine only works if h really is a valid hexadecimal
-** character:  0..9a..fA..F
-*/
-static unsigned char sqlite3UuidHexToInt(int h){
-  assert( (h>='0' && h<='9') ||  (h>='a' && h<='f') ||  (h>='A' && h<='F') );
-#ifdef SQLITE_ASCII
-  h += 9*(1&(h>>6));
-#endif
-#ifdef SQLITE_EBCDIC
-  h += 9*(1&~(h>>4));
-#endif
-  return (unsigned char)(h & 0xf);
-}
-
-/*
-** Convert a 16-byte BLOB into a well-formed RFC-4122 UUID.  The output
-** buffer zStr should be at least 37 bytes in length.   The output will
-** be zero-terminated.
-*/
-static void sqlite3UuidBlobToStr(
-  const unsigned char *aBlob,  /* Input blob */
-  unsigned char *zStr          /* Write the answer here */
-){
-  static const char zDigits[] = "0123456789abcdef";
-  int i, k;
-  unsigned char x;
-  k = 0;
-  for(i=0, k=0x550; i<16; i++, k=k>>1){
-    if( k&1 ){
-      zStr[0] = '-';
-      zStr++;
-    }
-    x = aBlob[i];
-    zStr[0] = zDigits[x>>4];
-    zStr[1] = zDigits[x&0xf];
-    zStr += 2;
-  }
-  *zStr = 0;
-}
-
-/*
-** Attempt to parse a zero-terminated input string zStr into a binary
-** UUID.  Return 0 on success, or non-zero if the input string is not
-** parsable.
-*/
-static int sqlite3UuidStrToBlob(
-  const unsigned char *zStr,   /* Input string */
-  unsigned char *aBlob         /* Write results here */
-){
-  int i;
-  if( zStr[0]=='{' ) zStr++;
-  for(i=0; i<16; i++){
-    if( zStr[0]=='-' ) zStr++;
-    if( isxdigit(zStr[0]) && isxdigit(zStr[1]) ){
-      aBlob[i] = (sqlite3UuidHexToInt(zStr[0])<<4)
-                      + sqlite3UuidHexToInt(zStr[1]);
-      zStr += 2;
-    }else{
-      return 1;
-    }
-  }
-  if( zStr[0]=='}' ) zStr++;
-  return zStr[0]!=0;
-}
-
-/*
-** Render sqlite3_value pIn as a 16-byte UUID blob.  Return a pointer
-** to the blob, or NULL if the input is not well-formed.
-*/
-static const unsigned char *sqlite3UuidInputToBlob(
-  sqlite3_value *pIn,     /* Input text */
-  unsigned char *pBuf     /* output buffer */
-){
-  switch( sqlite3_value_type(pIn) ){
-    case SQLITE_TEXT: {
-      const unsigned char *z = sqlite3_value_text(pIn);
-      if( sqlite3UuidStrToBlob(z, pBuf) ) return 0;
-      return pBuf;
-    }
-    case SQLITE_BLOB: {
-      int n = sqlite3_value_bytes(pIn);
-      return n==16 ? sqlite3_value_blob(pIn) : 0;
-    }
-    default: {
-      return 0;
-    }
-  }
-}
-
-/* Implementation of uuid() */
-static void sqlite3UuidFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  unsigned char aBlob[16];
-  unsigned char zStr[37];
-  (void)argc;
-  (void)argv;
-  sqlite3_randomness(16, aBlob);
-  aBlob[6] = (aBlob[6]&0x0f) + 0x40;
-  aBlob[8] = (aBlob[8]&0x3f) + 0x80;
-  sqlite3UuidBlobToStr(aBlob, zStr);
-  sqlite3_result_text(context, (char*)zStr, 36, SQLITE_TRANSIENT);
-}
-
-/* Implementation of uuid_str() */
-static void sqlite3UuidStrFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  unsigned char aBlob[16];
-  unsigned char zStr[37];
-  const unsigned char *pBlob;
-  (void)argc;
-  pBlob = sqlite3UuidInputToBlob(argv[0], aBlob);
-  if( pBlob==0 ) return;
-  sqlite3UuidBlobToStr(pBlob, zStr);
-  sqlite3_result_text(context, (char*)zStr, 36, SQLITE_TRANSIENT);
-}
-
-/* Implementation of uuid_blob() */
-static void sqlite3UuidBlobFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  unsigned char aBlob[16];
-  const unsigned char *pBlob;
-  (void)argc;
-  pBlob = sqlite3UuidInputToBlob(argv[0], aBlob);
-  if( pBlob==0 ) return;
-  sqlite3_result_blob(context, pBlob, 16, SQLITE_TRANSIENT);
-}
-
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_uuid_init(
-  sqlite3 *db,
-  char **pzErrMsg,
-  const sqlite3_api_routines *pApi
-){
-  int rc = SQLITE_OK;
-  SQLITE_EXTENSION_INIT2(pApi);
-  (void)pzErrMsg;  /* Unused parameter */
-  rc = sqlite3_create_function(db, "uuid", 0, SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
-                               sqlite3UuidFunc, 0, 0);
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "uuid_str", 1, 
-                       SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
-                       0, sqlite3UuidStrFunc, 0, 0);
-  }
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(db, "uuid_blob", 1,
-                       SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
-                       0, sqlite3UuidBlobFunc, 0, 0);
-  }
-  return rc;
-}
@@ -50,7 +50,6 @@ static int wholenumberConnect(
  pNew = *ppVtab = sqlite3_malloc( sizeof(*pNew) );
  if( pNew==0 ) return SQLITE_NOMEM;
  sqlite3_declare_vtab(db, "CREATE TABLE x(value)");
-  sqlite3_vtab_config(db, SQLITE_VTAB_INNOCUOUS);
  memset(pNew, 0, sizeof(*pNew));
  return SQLITE_OK;
 }
@@ -369,7 +369,6 @@ static int zipfileConnect(
      zipfileDequote(pNew->zFile);
    }
  }
-  sqlite3_vtab_config(db, SQLITE_VTAB_DIRECTONLY);
  *ppVtab = (sqlite3_vtab*)pNew;
  return rc;
 }
@@ -982,25 +981,25 @@ static int zipfileDeflate(
  u8 **ppOut, int *pnOut,         /* Output */
  char **pzErr                    /* OUT: Error message */
 ){
-  int rc = SQLITE_OK;
-  sqlite3_int64 nAlloc;
-  z_stream str;
+  sqlite3_int64 nAlloc = compressBound(nIn);
  u8 *aOut;
+  int rc = SQLITE_OK;

-  memset(&str, 0, sizeof(str));
-  str.next_in = (Bytef*)aIn;
-  str.avail_in = nIn;
-  deflateInit2(&str, 9, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
-
-  nAlloc = deflateBound(&str, nIn);
  aOut = (u8*)sqlite3_malloc64(nAlloc);
  if( aOut==0 ){
    rc = SQLITE_NOMEM;
  }else{
    int res;
+    z_stream str;
+    memset(&str, 0, sizeof(str));
+    str.next_in = (Bytef*)aIn;
+    str.avail_in = nIn;
    str.next_out = aOut;
    str.avail_out = nAlloc;
+
+    deflateInit2(&str, 9, Z_DEFLATED, -15, 8, Z_DEFAULT_STRATEGY);
    res = deflate(&str, Z_FINISH);
+
    if( res==Z_STREAM_END ){
      *ppOut = aOut;
      *pnOut = (int)str.total_out;
@@ -1309,10 +1308,10 @@ static int zipfileBestIndex(
      idx = i;
    }
  }
-  pIdxInfo->estimatedCost = 1000.0;
  if( idx>=0 ){
    pIdxInfo->aConstraintUsage[idx].argvIndex = 1;
    pIdxInfo->aConstraintUsage[idx].omit = 1;
+    pIdxInfo->estimatedCost = 1000.0;
    pIdxInfo->idxNum = 1;
  }else if( unusable ){
    return SQLITE_CONSTRAINT;
@@ -1434,8 +1433,8 @@ static int zipfileGetMode(
 ** identical, ignoring any trailing '/' character in either path.  */
 static int zipfileComparePath(const char *zA, const char *zB, int nB){
  int nA = (int)strlen(zA);
-  if( nA>0 && zA[nA-1]=='/' ) nA--;
-  if( nB>0 && zB[nB-1]=='/' ) nB--;
+  if( zA[nA-1]=='/' ) nA--;
+  if( zB[nB-1]=='/' ) nB--;
  if( nA==nB && memcmp(zA, zB, nA)==0 ) return 0;
  return 1;
 }
@@ -1445,10 +1444,6 @@ static int zipfileBegin(sqlite3_vtab *pVtab){
  int rc = SQLITE_OK;

  assert( pTab->pWriteFd==0 );
-  if( pTab->zFile==0 || pTab->zFile[0]==0 ){
-    pTab->base.zErrMsg = sqlite3_mprintf("zipfile: missing filename");
-    return SQLITE_ERROR;
-  }

  /* Open a write fd on the file. Also load the entire central directory
  ** structure into memory. During the transaction any new file data is 
@@ -1623,7 +1618,6 @@ static int zipfileUpdate(

    if( rc==SQLITE_OK ){
      zPath = (const char*)sqlite3_value_text(apVal[2]);
-      if( zPath==0 ) zPath = "";
      nPath = (int)strlen(zPath);
      mTime = zipfileGetTime(apVal[4]);
    }
@@ -1633,15 +1627,11 @@ static int zipfileUpdate(
      ** '/'. This appears to be required for compatibility with info-zip
      ** (the unzip command on unix). It does not create directories
      ** otherwise.  */
-      if( nPath<=0 || zPath[nPath-1]!='/' ){
+      if( zPath[nPath-1]!='/' ){
        zFree = sqlite3_mprintf("%s/", zPath);
+        if( zFree==0 ){ rc = SQLITE_NOMEM; }
        zPath = (const char*)zFree;
-        if( zFree==0 ){
-          rc = SQLITE_NOMEM;
-          nPath = 0;
-        }else{
-          nPath = (int)strlen(zPath);
-        }
+        nPath++;
      }
    }

@@ -2034,19 +2024,19 @@ void zipfileStep(sqlite3_context *pCtx, int nVal, sqlite3_value **apVal){
  ** at the end of the path. Or, if this is not a directory and the path
  ** ends in '/' it is an error. */
  if( bIsDir==0 ){
-    if( nName>0 && zName[nName-1]=='/' ){
+    if( zName[nName-1]=='/' ){
      zErr = sqlite3_mprintf("non-directory name must not end with /");
      rc = SQLITE_ERROR;
      goto zipfile_step_out;
    }
  }else{
-    if( nName==0 || zName[nName-1]!='/' ){
+    if( zName[nName-1]!='/' ){
      zName = zFree = sqlite3_mprintf("%s/", zName);
+      nName++;
      if( zName==0 ){
        rc = SQLITE_NOMEM;
        goto zipfile_step_out;
      }
-      nName = (int)strlen(zName);
    }else{
      while( nName>1 && zName[nName-2]=='/' ) nName--;
    }
@@ -414,37 +414,5 @@ foreach {bReopen} { 0 1 } {
  }
 }

-#-------------------------------------------------------------------------
-# Test that sqlite3_bp_progress() works with an RBU vacuum if there
-# is an rbu_count table in the db being vacuumed.
-#
-reset_db
-do_execsql_test 6.0 {
-  CREATE TABLE t1(a, b, c);
-  CREATE INDEX i1 ON t1(a);
-  CREATE INDEX i2 ON t1(b);
-  WITH s(i) AS (
-    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<100
-  )
-  INSERT INTO t1 SELECT i, i, i FROM s;
-  CREATE TABLE rbu_count(tbl TEXT PRIMARY KEY, cnt INTEGER) WITHOUT ROWID;
-  INSERT INTO rbu_count VALUES('t1', (SELECT count(*) FROM t1));
-  INSERT INTO rbu_count VALUES('rbu_count', 2);
-}
-
-forcedelete state.db
-do_test 6.1 {
-  set maxA 0
-  set maxB 0
-  sqlite3rbu_vacuum rbu test.db state.db
-  while {[rbu step]=="SQLITE_OK"} {
-    foreach {a b} [rbu bp_progress] {
-      if {$a > $maxA} { set maxA $a }
-      if {$b > $maxB} { set maxB $b }
-    }
-  }
-  list [rbu close] $maxA $maxB
-} {SQLITE_DONE 10000 10000}
-

 finish_test
@@ -944,8 +944,8 @@ static void rbuTargetNameFunc(
  zIn = (const char*)sqlite3_value_text(argv[0]);
  if( zIn ){
    if( rbuIsVacuum(p) ){
-      assert( argc==2 || argc==1 );
-      if( argc==1 || 0==sqlite3_value_int(argv[1]) ){
+      assert( argc==2 );
+      if( 0==sqlite3_value_int(argv[1]) ){
        sqlite3_result_text(pCtx, zIn, -1, SQLITE_STATIC);
      }
    }else{
@@ -3860,11 +3860,10 @@ static void rbuIndexCntFunc(
  sqlite3_stmt *pStmt = 0;
  char *zErrmsg = 0;
  int rc;
-  sqlite3 *db = (rbuIsVacuum(p) ? p->dbRbu : p->dbMain);

  assert( nVal==1 );
  
-  rc = prepareFreeAndCollectError(db, &pStmt, &zErrmsg, 
+  rc = prepareFreeAndCollectError(p->dbMain, &pStmt, &zErrmsg, 
      sqlite3_mprintf("SELECT count(*) FROM sqlite_master "
        "WHERE type='index' AND tbl_name = %Q", sqlite3_value_text(apVal[0]))
  );
@@ -3879,7 +3878,7 @@ static void rbuIndexCntFunc(
    if( rc==SQLITE_OK ){
      sqlite3_result_int(pCtx, nIndex);
    }else{
-      sqlite3_result_error(pCtx, sqlite3_errmsg(db), -1);
+      sqlite3_result_error(pCtx, sqlite3_errmsg(p->dbMain), -1);
    }
  }

@@ -4936,6 +4935,33 @@ static int rbuVfsShmUnmap(sqlite3_file *pFile, int delFlag){
  return rc;
 }

+/* 
+** A main database named zName has just been opened. The following 
+** function returns a pointer to a buffer owned by SQLite that contains
+** the name of the *-wal file this db connection will use. SQLite
+** happens to pass a pointer to this buffer when using xAccess()
+** or xOpen() to operate on the *-wal file.  
+*/
+static const char *rbuMainToWal(const char *zName, int flags){
+  int n = (int)strlen(zName);
+  const char *z = &zName[n];
+  if( flags & SQLITE_OPEN_URI ){
+    int odd = 0;
+    while( 1 ){
+      if( z[0]==0 ){
+        odd = 1 - odd;
+        if( odd && z[1]==0 ) break;
+      }
+      z++;
+    }
+    z += 2;
+  }else{
+    while( *z==0 ) z++;
+  }
+  z += (n + 8 + 1);
+  return z;
+}
+
 /*
 ** Open an rbu file handle.
 */
@@ -4984,7 +5010,7 @@ static int rbuVfsOpen(
      ** the name of the *-wal file this db connection will use. SQLite
      ** happens to pass a pointer to this buffer when using xAccess()
      ** or xOpen() to operate on the *-wal file.  */
-      pFd->zWal = sqlite3_filename_wal(zName);
+      pFd->zWal = rbuMainToWal(zName, flags);
    }
    else if( flags & SQLITE_OPEN_WAL ){
      rbu_file *pDb = rbuFindMaindb(pRbuVfs, zName, 0);
@@ -4999,7 +5025,7 @@ static int rbuVfsOpen(
          char *zCopy;
          if( rbuIsVacuum(pDb->pRbu) ){
            zBase = sqlite3_db_filename(pDb->pRbu->dbRbu, "main");
-            zBase = sqlite3_filename_wal(zBase);
+            zBase = rbuMainToWal(zBase, SQLITE_OPEN_URI);
          }
          nCopy = strlen(zBase);
          zCopy = sqlite3_malloc64(nCopy+2);
@@ -1345,11 +1345,17 @@ static int geopolyFilter(
  RtreeNode *pRoot = 0;
  int rc = SQLITE_OK;
  int iCell = 0;
+  sqlite3_stmt *pStmt;

  rtreeReference(pRtree);

  /* Reset the cursor to the same state as rtreeOpen() leaves it in. */
-  resetCursor(pCsr);
+  freeCursorConstraints(pCsr);
+  sqlite3_free(pCsr->aPoint);
+  pStmt = pCsr->pReadAux;
+  memset(pCsr, 0, sizeof(RtreeCursor));
+  pCsr->base.pVtab = (sqlite3_vtab*)pRtree;
+  pCsr->pReadAux = pStmt;

  pCsr->iStrategy = idxNum;
  if( idxNum==1 ){
@@ -1786,20 +1792,14 @@ static int sqlite3_geopoly_init(sqlite3 *db){
  };
  int i;
  for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
-    int enc;
-    if( aFunc[i].bPure ){
-      enc = SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS;
-    }else{
-      enc = SQLITE_UTF8|SQLITE_DIRECTONLY;
-    }
+    int enc = aFunc[i].bPure ? SQLITE_UTF8|SQLITE_DETERMINISTIC : SQLITE_UTF8;
    rc = sqlite3_create_function(db, aFunc[i].zName, aFunc[i].nArg,
                                 enc, 0,
                                 aFunc[i].xFunc, 0, 0);
  }
  for(i=0; i<sizeof(aAgg)/sizeof(aAgg[0]) && rc==SQLITE_OK; i++){
-    rc = sqlite3_create_function(db, aAgg[i].zName, 1, 
-              SQLITE_UTF8|SQLITE_DETERMINISTIC|SQLITE_INNOCUOUS, 0,
-              0, aAgg[i].xStep, aAgg[i].xFinal);
+    rc = sqlite3_create_function(db, aAgg[i].zName, 1, SQLITE_UTF8, 0,
+                                 0, aAgg[i].xStep, aAgg[i].xFinal);
  }
  if( rc==SQLITE_OK ){
    rc = sqlite3_create_module_v2(db, "geopoly", &geopolyModule, 0, 0);
@@ -62,7 +62,6 @@
 #else
  #include "sqlite3.h"
 #endif
-int sqlite3GetToken(const unsigned char*,int*); /* In the SQLite core */

 #ifndef SQLITE_AMALGAMATION
 #include "sqlite3rtree.h"
@@ -326,12 +325,6 @@ struct RtreeConstraint {
 #define RTREE_MATCH 0x46  /* F: Old-style sqlite3_rtree_geometry_callback() */
 #define RTREE_QUERY 0x47  /* G: New-style sqlite3_rtree_query_callback() */

-/* Special operators available only on cursors.  Needs to be consecutive
-** with the normal values above, but must be less than RTREE_MATCH.  These
-** are used in the cursor for contraints such as x=NULL (RTREE_FALSE) or
-** x<'xyz' (RTREE_TRUE) */
-#define RTREE_TRUE  0x3f  /* ? */
-#define RTREE_FALSE 0x40  /* @ */

 /* 
 ** An rtree structure node.
@@ -1065,12 +1058,9 @@ static int rtreeOpen(sqlite3_vtab *pVTab, sqlite3_vtab_cursor **ppCursor){


 /*
-** Reset a cursor back to its initial state.
+** Free the RtreeCursor.aConstraint[] array and its contents.
 */
-static void resetCursor(RtreeCursor *pCsr){
-  Rtree *pRtree = (Rtree *)(pCsr->base.pVtab);
-  int ii;
-  sqlite3_stmt *pStmt;
+static void freeCursorConstraints(RtreeCursor *pCsr){
  if( pCsr->aConstraint ){
    int i;                        /* Used to iterate through constraint array */
    for(i=0; i<pCsr->nConstraint; i++){
@@ -1083,13 +1073,6 @@ static void resetCursor(RtreeCursor *pCsr){
    sqlite3_free(pCsr->aConstraint);
    pCsr->aConstraint = 0;
  }
-  for(ii=0; ii<RTREE_CACHE_SZ; ii++) nodeRelease(pRtree, pCsr->aNode[ii]);
-  sqlite3_free(pCsr->aPoint);
-  pStmt = pCsr->pReadAux;
-  memset(pCsr, 0, sizeof(RtreeCursor));
-  pCsr->base.pVtab = (sqlite3_vtab*)pRtree;
-  pCsr->pReadAux = pStmt;
-
 }

 /* 
@@ -1097,10 +1080,13 @@ static void resetCursor(RtreeCursor *pCsr){
 */
 static int rtreeClose(sqlite3_vtab_cursor *cur){
  Rtree *pRtree = (Rtree *)(cur->pVtab);
+  int ii;
  RtreeCursor *pCsr = (RtreeCursor *)cur;
  assert( pRtree->nCursor>0 );
-  resetCursor(pCsr);
+  freeCursorConstraints(pCsr);
  sqlite3_finalize(pCsr->pReadAux);
+  sqlite3_free(pCsr->aPoint);
+  for(ii=0; ii<RTREE_CACHE_SZ; ii++) nodeRelease(pRtree, pCsr->aNode[ii]);
  sqlite3_free(pCsr);
  pRtree->nCursor--;
  nodeBlobReset(pRtree);
@@ -1258,12 +1244,9 @@ static void rtreeNonleafConstraint(
  pCellData += 8 + 4*(p->iCoord&0xfe);

  assert(p->op==RTREE_LE || p->op==RTREE_LT || p->op==RTREE_GE 
-      || p->op==RTREE_GT || p->op==RTREE_EQ || p->op==RTREE_TRUE
-      || p->op==RTREE_FALSE );
+      || p->op==RTREE_GT || p->op==RTREE_EQ );
  assert( ((((char*)pCellData) - (char*)0)&3)==0 );  /* 4-byte aligned */
  switch( p->op ){
-    case RTREE_TRUE:  return;   /* Always satisfied */
-    case RTREE_FALSE: break;    /* Never satisfied */
    case RTREE_LE:
    case RTREE_LT:
    case RTREE_EQ:
@@ -1301,19 +1284,16 @@ static void rtreeLeafConstraint(
  RtreeDValue xN;      /* Coordinate value converted to a double */

  assert(p->op==RTREE_LE || p->op==RTREE_LT || p->op==RTREE_GE 
-      || p->op==RTREE_GT || p->op==RTREE_EQ || p->op==RTREE_TRUE
-      || p->op==RTREE_FALSE );
+      || p->op==RTREE_GT || p->op==RTREE_EQ );
  pCellData += 8 + p->iCoord*4;
  assert( ((((char*)pCellData) - (char*)0)&3)==0 );  /* 4-byte aligned */
  RTREE_DECODE_COORD(eInt, pCellData, xN);
  switch( p->op ){
-    case RTREE_TRUE:  return;   /* Always satisfied */
-    case RTREE_FALSE: break;    /* Never satisfied */
-    case RTREE_LE:    if( xN <= p->u.rValue ) return;  break;
-    case RTREE_LT:    if( xN <  p->u.rValue ) return;  break;
-    case RTREE_GE:    if( xN >= p->u.rValue ) return;  break;
-    case RTREE_GT:    if( xN >  p->u.rValue ) return;  break;
-    default:          if( xN == p->u.rValue ) return;  break;
+    case RTREE_LE: if( xN <= p->u.rValue ) return;  break;
+    case RTREE_LT: if( xN <  p->u.rValue ) return;  break;
+    case RTREE_GE: if( xN >= p->u.rValue ) return;  break;
+    case RTREE_GT: if( xN >  p->u.rValue ) return;  break;
+    default:       if( xN == p->u.rValue ) return;  break;
  }
  *peWithin = NOT_WITHIN;
 }
@@ -1806,11 +1786,17 @@ static int rtreeFilter(
  int ii;
  int rc = SQLITE_OK;
  int iCell = 0;
+  sqlite3_stmt *pStmt;

  rtreeReference(pRtree);

  /* Reset the cursor to the same state as rtreeOpen() leaves it in. */
-  resetCursor(pCsr);
+  freeCursorConstraints(pCsr);
+  sqlite3_free(pCsr->aPoint);
+  pStmt = pCsr->pReadAux;
+  memset(pCsr, 0, sizeof(RtreeCursor));
+  pCsr->base.pVtab = (sqlite3_vtab*)pRtree;
+  pCsr->pReadAux = pStmt;

  pCsr->iStrategy = idxNum;
  if( idxNum==1 ){
@@ -1819,15 +1805,7 @@ static int rtreeFilter(
    RtreeSearchPoint *p;     /* Search point for the leaf */
    i64 iRowid = sqlite3_value_int64(argv[0]);
    i64 iNode = 0;
-    int eType = sqlite3_value_numeric_type(argv[0]);
-    if( eType==SQLITE_INTEGER
-     || (eType==SQLITE_FLOAT && sqlite3_value_double(argv[0])==iRowid)
-    ){
-      rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
-    }else{
-      rc = SQLITE_OK;
-      pLeaf = 0;
-    }
+    rc = findLeafNode(pRtree, iRowid, &pLeaf, &iNode);
    if( rc==SQLITE_OK && pLeaf!=0 ){
      p = rtreeSearchPointNew(pCsr, RTREE_ZERO, 0);
      assert( p!=0 );  /* Always returns pCsr->sPoint */
@@ -1857,7 +1835,6 @@ static int rtreeFilter(
                || (idxStr && (int)strlen(idxStr)==argc*2) );
        for(ii=0; ii<argc; ii++){
          RtreeConstraint *p = &pCsr->aConstraint[ii];
-          int eType = sqlite3_value_numeric_type(argv[ii]);
          p->op = idxStr[ii*2];
          p->iCoord = idxStr[ii*2+1]-'0';
          if( p->op>=RTREE_MATCH ){
@@ -1872,21 +1849,12 @@ static int rtreeFilter(
            p->pInfo->nCoord = pRtree->nDim2;
            p->pInfo->anQueue = pCsr->anQueue;
            p->pInfo->mxLevel = pRtree->iDepth + 1;
-          }else if( eType==SQLITE_INTEGER || eType==SQLITE_FLOAT ){
+          }else{
 #ifdef SQLITE_RTREE_INT_ONLY
            p->u.rValue = sqlite3_value_int64(argv[ii]);
 #else
            p->u.rValue = sqlite3_value_double(argv[ii]);
 #endif
-          }else{
-            p->u.rValue = RTREE_ZERO;
-            if( eType==SQLITE_NULL ){
-              p->op = RTREE_FALSE;
-            }else if( p->op==RTREE_LT || p->op==RTREE_LE ){
-              p->op = RTREE_TRUE;
-            }else{
-              p->op = RTREE_FALSE;
-            }
          }
        }
      }
@@ -3663,14 +3631,6 @@ static int getNodeSize(
  return rc;
 }

-/*
-** Return the length of a token
-*/
-static int rtreeTokenLength(const char *z){
-  int dummy = 0;
-  return sqlite3GetToken((const unsigned char*)z,&dummy);
-}
-
 /* 
 ** This function is the implementation of both the xConnect and xCreate
 ** methods of the r-tree virtual table.
@@ -3707,8 +3667,8 @@ static int rtreeInit(
  };

  assert( RTREE_MAX_AUX_COLUMN<256 ); /* Aux columns counted by a u8 */
-  if( argc<6 || argc>RTREE_MAX_AUX_COLUMN+3 ){
-    *pzErr = sqlite3_mprintf("%s", aErrMsg[2 + (argc>=6)]);
+  if( argc>RTREE_MAX_AUX_COLUMN+3 ){
+    *pzErr = sqlite3_mprintf("%s", aErrMsg[3]);
    return SQLITE_ERROR;
  }

@@ -3736,20 +3696,16 @@ static int rtreeInit(
  ** the r-tree table schema.
  */
  pSql = sqlite3_str_new(db);
-  sqlite3_str_appendf(pSql, "CREATE TABLE x(%.*s INT", 
-                      rtreeTokenLength(argv[3]), argv[3]);
+  sqlite3_str_appendf(pSql, "CREATE TABLE x(%s", argv[3]);
  for(ii=4; ii<argc; ii++){
-    const char *zArg = argv[ii];
-    if( zArg[0]=='+' ){
+    if( argv[ii][0]=='+' ){
      pRtree->nAux++;
-      sqlite3_str_appendf(pSql, ",%.*s", rtreeTokenLength(zArg+1), zArg+1);
+      sqlite3_str_appendf(pSql, ",%s", argv[ii]+1);
    }else if( pRtree->nAux>0 ){
      break;
    }else{
-      static const char *azFormat[] = {",%.*s REAL", ",%.*s INT"};
      pRtree->nDim2++;
-      sqlite3_str_appendf(pSql, azFormat[eCoordType],
-                          rtreeTokenLength(zArg), zArg);
+      sqlite3_str_appendf(pSql, ",%s", argv[ii]);
    }
  }
  sqlite3_str_appendf(pSql, ");");
@@ -112,9 +112,6 @@ for {set nCol 1} {$nCol<[llength $cols]} {incr nCol} {

  catchsql { DROP TABLE t1 }
 }
-do_catchsql_test rtree-1.3.1000 {
-  CREATE VIRTUAL TABLE t1000 USING rtree;
-} {1 {Too few columns for an rtree table}}

 # Like execsql except display output as integer where that can be
 # done without loss of information.
@@ -377,43 +374,13 @@ do_test rtree-8.1.1 {
    INSERT INTO t6 VALUES(2, 4, 6);
  }
 } {}
-do_test rtree-8.1.2 { execsql { SELECT ii FROM t6 WHERE x1>2 } }   {1 2}
-do_test rtree-8.1.3 { execsql { SELECT ii FROM t6 WHERE x1>3 } }   {2}
-do_test rtree-8.1.4 { execsql { SELECT ii FROM t6 WHERE x1>4 } }   {}
-do_test rtree-8.1.5 { execsql { SELECT ii FROM t6 WHERE x1>5 } }   {}
-do_test rtree-8.1.6 { execsql { SELECT ii FROM t6 WHERE x1>''} }   {}
-do_test rtree-8.1.7 { execsql { SELECT ii FROM t6 WHERE x1>null}}  {}
-do_test rtree-8.1.8 { execsql { SELECT ii FROM t6 WHERE x1>'2'} }   {1 2}
-do_test rtree-8.1.9 { execsql { SELECT ii FROM t6 WHERE x1>'3'} }   {2}
-do_test rtree-8.2.2 { execsql { SELECT ii FROM t6 WHERE x1>=2 } }  {1 2}
-do_test rtree-8.2.3 { execsql { SELECT ii FROM t6 WHERE x1>=3 } }  {1 2}
-do_test rtree-8.2.4 { execsql { SELECT ii FROM t6 WHERE x1>=4 } }  {2}
-do_test rtree-8.2.5 { execsql { SELECT ii FROM t6 WHERE x1>=5 } }  {}
-do_test rtree-8.2.6 { execsql { SELECT ii FROM t6 WHERE x1>=''} }  {}
-do_test rtree-8.2.7 { execsql { SELECT ii FROM t6 WHERE x1>=null}} {}
-do_test rtree-8.2.8 { execsql { SELECT ii FROM t6 WHERE x1>='4'} } {2}
-do_test rtree-8.2.9 { execsql { SELECT ii FROM t6 WHERE x1>='5'} } {}
-do_test rtree-8.3.2 { execsql { SELECT ii FROM t6 WHERE x1<2 } }   {}
-do_test rtree-8.3.3 { execsql { SELECT ii FROM t6 WHERE x1<3 } }   {}
-do_test rtree-8.3.4 { execsql { SELECT ii FROM t6 WHERE x1<4 } }   {1}
-do_test rtree-8.3.5 { execsql { SELECT ii FROM t6 WHERE x1<5 } }   {1 2}
-do_test rtree-8.3.6 { execsql { SELECT ii FROM t6 WHERE x1<''} }   {1 2}
-do_test rtree-8.3.7 { execsql { SELECT ii FROM t6 WHERE x1<null}}  {}
-do_test rtree-8.3.8 { execsql { SELECT ii FROM t6 WHERE x1<'3'} }  {}
-do_test rtree-8.3.9 { execsql { SELECT ii FROM t6 WHERE x1<'4'} }  {1}
-do_test rtree-8.4.2 { execsql { SELECT ii FROM t6 WHERE x1<=2 } }  {}
-do_test rtree-8.4.3 { execsql { SELECT ii FROM t6 WHERE x1<=3 } }  {1}
-do_test rtree-8.4.4 { execsql { SELECT ii FROM t6 WHERE x1<=4 } }  {1 2}
-do_test rtree-8.4.5 { execsql { SELECT ii FROM t6 WHERE x1<=5 } }  {1 2}
-do_test rtree-8.4.6 { execsql { SELECT ii FROM t6 WHERE x1<=''} }  {1 2}
-do_test rtree-8.4.7 { execsql { SELECT ii FROM t6 WHERE x1<=null}} {}
-do_test rtree-8.5.2 { execsql { SELECT ii FROM t6 WHERE x1=2 } }   {}
-do_test rtree-8.5.3 { execsql { SELECT ii FROM t6 WHERE x1=3 } }   {1}
-do_test rtree-8.5.4 { execsql { SELECT ii FROM t6 WHERE x1=4 } }   {2}
-do_test rtree-8.5.5 { execsql { SELECT ii FROM t6 WHERE x1=5 } }   {}
-do_test rtree-8.5.6 { execsql { SELECT ii FROM t6 WHERE x1=''} }   {}
-do_test rtree-8.5.7 { execsql { SELECT ii FROM t6 WHERE x1=null}}  {}
-
+do_test rtree-8.1.2 { execsql { SELECT ii FROM t6 WHERE x1>2 } } {1 2}
+do_test rtree-8.1.3 { execsql { SELECT ii FROM t6 WHERE x1>3 } } {2}
+do_test rtree-8.1.4 { execsql { SELECT ii FROM t6 WHERE x1>4 } } {}
+do_test rtree-8.1.5 { execsql { SELECT ii FROM t6 WHERE x1>5 } } {}
+do_test rtree-8.1.6 { execsql { SELECT ii FROM t6 WHERE x1<3 } } {}
+do_test rtree-8.1.7 { execsql { SELECT ii FROM t6 WHERE x1<4 } } {1}
+do_test rtree-8.1.8 { execsql { SELECT ii FROM t6 WHERE x1<5 } } {1 2}

 #----------------------------------------------------------------------------
 # Test cases rtree-9.*
@@ -611,29 +578,15 @@ do_execsql_test 14.5 {
  1 0.0 0.0
  2 52.0 81.0
 }
-do_execsql_test 14.6 {
-  INSERT INTO t10 VALUES(0,10,20);
-  SELECT * FROM t10 WHERE ii=NULL;
-} {}
-do_execsql_test 14.7 {
-  SELECT * FROM t10 WHERE ii='xyz';
-} {}
-do_execsql_test 14.8 {
-  SELECT * FROM t10 WHERE ii='0.0';
-} {0 10.0 20.0}
-do_execsql_test 14.9 {
-  SELECT * FROM t10 WHERE ii=0.0;
-} {0 10.0 20.0}

-
-do_execsql_test 14.104 {
+do_execsql_test 14.4 {
  DROP TABLE t10;
  CREATE VIRTUAL TABLE t10 USING rtree_i32(ii, x1, x2);
  INSERT INTO t10 VALUES(1, 'one', 'two');
  INSERT INTO t10 VALUES(2, '52xyz', '81...');
  INSERT INTO t10 VALUES(3, 42.3, 49.9);
 }
-do_execsql_test 14.105 {
+do_execsql_test 14.5 {
  SELECT * FROM t10;
 } {
  1 0 0
@@ -708,26 +661,5 @@ do_execsql_test 17.2 {
  REINDEX;
 } {}

-reset_db
-do_execsql_test 18.0 {
-  CREATE VIRTUAL TABLE rt0 USING rtree(c0, c1, c2);
-  INSERT INTO rt0(c0,c1,c2) VALUES(9,2,3);
-  SELECT c0 FROM rt0 WHERE rt0.c1 > '-1'; 
-  SELECT rt0.c1 > '-1' FROM rt0;
-} {9 1}
-
 expand_all_sql db
-
-# 2020-02-28 ticket e63b4d1a65546532
-reset_db
-do_execsql_test 19.0 {
-  CREATE VIRTUAL TABLE rt0 USING rtree(a,b,c);
-  INSERT INTO rt0(a,b,c) VALUES(0,0.0,0.0);
-  CREATE VIEW v0(x) AS SELECT DISTINCT rt0.b FROM rt0;
-  SELECT v0.x FROM v0, rt0;
-} {0.0}
-do_execsql_test 19.1 {
-  SELECT v0.x FROM v0, rt0 WHERE v0.x = rt0.b;
-} {0.0}
-
 finish_test
@@ -33,13 +33,12 @@ if {[info exists G(isquick)] && $G(isquick)} {
 }

 foreach module {rtree_i32 rtree} {
-  if {$module=="rtree_i32"} {set etype INT} {set etype REAL}
  for {set nDim 1} {$nDim <= 5} {incr nDim} {
  
    do_test rtree2-$module.$nDim.1 {
      set cols [list]
      foreach c [list c0 c1 c2 c3 c4 c5 c6 c7 c8 c9] {
-        lappend cols "$c $etype"
+        lappend cols "$c REAL"
      }
      set cols [join [lrange $cols 0 [expr {$nDim*2-1}]] ", "]
      execsql " 
@@ -177,7 +177,7 @@ do_execsql_test 4.3 {
 #
 reset_db
 do_execsql_test 5.1 {
-  CREATE TABLE t1(x INT PRIMARY KEY, y);
+  CREATE TABLE t1(x PRIMARY KEY, y);
  CREATE VIRTUAL TABLE rt USING rtree(id, x1, x2, +d1);

  INSERT INTO t1(x) VALUES(1);
@@ -43,33 +43,10 @@ do_execsql_test rtreeH-101 {
 do_execsql_test rtreeH-102 {
  SELECT * FROM t1 WHERE rowid=5;
 } {5 40.0 60.0 40.0 60.0 center {}}
-do_execsql_test rtreeH-102b {
-  SELECT * FROM t1 WHERE rowid=5.0;
-} {5 40.0 60.0 40.0 60.0 center {}}
-do_execsql_test rtreeH-102c {
-  SELECT * FROM t1 WHERE rowid='5';
-} {5 40.0 60.0 40.0 60.0 center {}}
-do_execsql_test rtreeH-102d {
-  SELECT * FROM t1 WHERE rowid='0005';
-} {5 40.0 60.0 40.0 60.0 center {}}
-do_execsql_test rtreeH-102e {
-  SELECT * FROM t1 WHERE rowid='+5.0e+0';
-} {5 40.0 60.0 40.0 60.0 center {}}
 do_execsql_test rtreeH-103 {
  SELECT * FROM t1 WHERE label='center';
 } {5 40.0 60.0 40.0 60.0 center {}}

-do_execsql_test rtreeH-104 {
-  SELECT * FROM t1 WHERE rowid='+5.0e+0x';
-} {}
-do_execsql_test rtreeH-105 {
-  SELECT * FROM t1 WHERE rowid=x'35';
-} {}
-do_execsql_test rtreeH-106 {
-  SELECT * FROM t1 WHERE rowid=null;
-} {}
-
-
 do_rtree_integrity_test rtreeH-110 t1

 do_execsql_test rtreeH-120 {
@@ -1,74 +0,0 @@
-# 2019-12-05
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-# Additional test cases
-
-if {![info exists testdir]} {
-  set testdir [file join [file dirname [info script]] .. .. test]
-} 
-source [file join [file dirname [info script]] rtree_util.tcl]
-source $testdir/tester.tcl
-ifcapable !rtree { finish_test ; return }
-
-# The following is a test of rowvalue handling on virtual tables that
-# deal with inequalities and that set the OMIT flag on terms of the
-# WHERE clause.  This is not specific to rtree.  We just use rtree because
-# it is a convenient test platform since it has all the right
-# characteristics.
-#
-do_execsql_test rtreeI-1.10 {
-  CREATE TABLE t1(a);
-  INSERT INTO t1 VALUES(2);
-  CREATE VIRTUAL TABLE t2 USING rtree(id,x0,x1);
-  INSERT INTO t2(id,x0,x1) VALUES(1,2,3);
-} {}
-do_execsql_test rtreeI-1.20 {
-  SELECT 123 FROM t1, t2 WHERE (a,0)>(x0,0);
-} {}
-do_execsql_test rtreeI-1.21 {
-  SELECT 123 FROM t1, t2 WHERE (a,0.1)>(x0,0);
-} {123}
-do_execsql_test rtreeI-1.22 {
-  SELECT 123 FROM t1, t2 WHERE (a,0)>=(x0,0);
-} {123}
-do_execsql_test rtreeI-1.23 {
-  SELECT 123 FROM t1, t2 WHERE (a,0)<=(x0,0);
-} {123}
-do_execsql_test rtreeI-1.24 {
-  SELECT 123 FROM t1, t2 WHERE (a,0)<(x0,0);
-} {}
-do_execsql_test rtreeI-1.30 {
-  SELECT 123 FROM t1, t2 WHERE (x0,0)<(a,0);
-} {}
-do_execsql_test rtreeI-1.31 {
-  SELECT 123 FROM t1, t2 WHERE (x0,0)<(a,0.1);
-} {123}
-do_execsql_test rtreeI-1.40 {
-  SELECT 123 FROM t1, t2 WHERE x1<5 AND id<99 AND (a,0)>(x0,0);
-} {}
-do_execsql_test rtreeI-1.41 {
-  SELECT 123 FROM t1, t2 WHERE x1<5 AND id<99 AND (a,0.5)>(x0,0);
-} {123}
-do_execsql_test rtreeI-1.42 {
-  SELECT 123 FROM t1, t2 WHERE x1<5 AND id<99 AND (a,0)>=(x0,0);
-} {123}
-do_execsql_test rtreeI-1.43 {
-  SELECT 123 FROM t1, t2 WHERE x1<5 AND id<99 AND (a,0)<(x0,0);
-} {}
-do_execsql_test rtreeI-1.50 {
-  SELECT 123 FROM t1, t2 WHERE 5>x1 AND 99>id AND (x0,0)<(a,0);
-} {}
-do_execsql_test rtreeI-1.51 {
-  SELECT 123 FROM t1, t2 WHERE 5>x1 AND 99>id AND (x0,0)<(a,0.5);
-} {123}
-
-
-
-finish_test
@@ -465,7 +465,6 @@ do_test rtreefuzz001-100 {
 | end c1b.db
  }]
  catchsql {
-     PRAGMA writable_schema = 1;
     SELECT rtreecheck('t1');
  }
 } {1 {SQL logic error}}
@@ -1041,7 +1040,6 @@ do_test rtreefuzz001-500 {
 |   2880: ff ff ff 06 00 00 00 0c 00 00 00 01 00 00 00 0b   ................
 |   2896: 00 00 00 00 00 00 00 02 40 00 00 00 00 00 00 00   ........@.......
 | end crash-2e81f5dce5cbd4.db}]
-  execsql { PRAGMA writable_schema = 1;}
  catchsql {UPDATE t1 SET ex= ex ISNULL}
 } {1 {database disk image is malformed}}

@@ -34,51 +34,5 @@ do_test 1.0 {
  compare_db db db2
 } {}

-#------------------------------------------------------------------------
-db2 close
-reset_db
-
-do_execsql_test 2.0 {
-  CREATE TABLE t1(a INTEGER PRIMARY KEY, b, c);
-  INSERT INTO main.t1 VALUES(1, 2, 3), (4, 5, 6), (7, 8, 9);
-}
-
-do_test 2.1 {
-  sqlite3session S db main
-  S attach *
-  db eval {
-    BEGIN;
-      INSERT INTO t1 VALUES(10, 11, 12);
-      DELETE FROM t1 WHERE a=1;
-      UPDATE t1 SET b='five', c='six' WHERE a=4;
-  }
-
-  set C [S changeset]
-  db eval ROLLBACK
-  S delete
-  set {} {}
-} {}
-
-do_execsql_test 2.2 {
-  CREATE TEMP TABLE t1(a INTEGER PRIMARY KEY, b, c);
-  INSERT INTO temp.t1 VALUES(1, 2, 3), (4, 5, 6), (7, 8, 9);
-}
-
-set ::conflict [list]
-proc xConflict {args} { lappend ::conflict $args ; return "" }
-do_test 2.3 {
-  sqlite3changeset_apply db $C xConflict
-  set ::conflict
-} {}
-do_execsql_test 2.4 {
-  SELECT * FROM main.t1;
-  SELECT '****';
-  SELECT * FROM temp.t1;
-} {
-  4 five six 7 8 9 10 11 12
-  ****
-  1 2 3 4 5 6 7 8 9
-}
-

 finish_test
@@ -3513,7 +3513,7 @@ static int sessionDeleteRow(
  SessionBuffer buf = {0, 0, 0};
  int nPk = 0;

-  sessionAppendStr(&buf, "DELETE FROM main.", &rc);
+  sessionAppendStr(&buf, "DELETE FROM ", &rc);
  sessionAppendIdent(&buf, zTab, &rc);
  sessionAppendStr(&buf, " WHERE ", &rc);

@@ -3596,7 +3596,7 @@ static int sessionUpdateRow(
  SessionBuffer buf = {0, 0, 0};

  /* Append "UPDATE tbl SET " */
-  sessionAppendStr(&buf, "UPDATE main.", &rc);
+  sessionAppendStr(&buf, "UPDATE ", &rc);
  sessionAppendIdent(&buf, zTab, &rc);
  sessionAppendStr(&buf, " SET ", &rc);

@@ -200,7 +200,7 @@ int sqlite3session_attach(
 ** The second argument (xFilter) is the "filter callback". For changes to rows 
 ** in tables that are not attached to the Session object, the filter is called
 ** to determine whether changes to the table's rows should be tracked or not. 
-** If xFilter returns 0, changes are not tracked. Note that once a table is 
+** If xFilter returns 0, changes is not tracked. Note that once a table is 
 ** attached, xFilter will not be called again.
 */
 void sqlite3session_table_filter(
@@ -374,7 +374,7 @@ int sqlite3session_changeset(
 ** It an error if database zFrom does not exist or does not contain the
 ** required compatible table.
 **
-** If the operation is successful, SQLITE_OK is returned. Otherwise, an SQLite
+** If the operation successful, SQLITE_OK is returned. Otherwise, an SQLite
 ** error code. In this case, if argument pzErrMsg is not NULL, *pzErrMsg
 ** may be set to point to a buffer containing an English language error 
 ** message. It is the responsibility of the caller to free this buffer using
@@ -511,7 +511,7 @@ int sqlite3changeset_start_v2(
 ** CAPI3REF: Advance A Changeset Iterator
 ** METHOD: sqlite3_changeset_iter
 **
-** This function may only be used with iterators created by the function
+** This function may only be used with iterators created by function
 ** [sqlite3changeset_start()]. If it is called on an iterator passed to
 ** a conflict-handler callback by [sqlite3changeset_apply()], SQLITE_MISUSE
 ** is returned and the call has no effect.
@@ -927,8 +927,8 @@ int sqlite3changegroup_new(sqlite3_changegroup **pp);
 ** case, this function fails with SQLITE_SCHEMA. If the input changeset
 ** appears to be corrupt and the corruption is detected, SQLITE_CORRUPT is
 ** returned. Or, if an out-of-memory condition occurs during processing, this
-** function returns SQLITE_NOMEM. In all cases, if an error occurs the state
-** of the final contents of the changegroup is undefined.
+** function returns SQLITE_NOMEM. In all cases, if an error occurs the
+** final contents of the changegroup is undefined.
 **
 ** If no error occurs, SQLITE_OK is returned.
 */
@@ -1103,7 +1103,7 @@ void sqlite3changegroup_delete(sqlite3_changegroup*);
 **
 ** It is safe to execute SQL statements, including those that write to the
 ** table that the callback related to, from within the xConflict callback.
-** This can be used to further customize the application's conflict
+** This can be used to further customize the applications conflict
 ** resolution strategy.
 **
 ** All changes made by these functions are enclosed in a savepoint transaction.
@@ -1413,7 +1413,7 @@ int sqlite3rebaser_configure(
 **
 ** Argument pIn must point to a buffer containing a changeset nIn bytes
 ** in size. This function allocates and populates a buffer with a copy
-** of the changeset rebased according to the configuration of the
+** of the changeset rebased rebased according to the configuration of the
 ** rebaser object passed as the first argument. If successful, (*ppOut)
 ** is set to point to the new buffer containing the rebased changeset and 
 ** (*pnOut) to its size in bytes and SQLITE_OK returned. It is the
@@ -40,7 +40,7 @@ static sqlite3_stmt *sqlite3UserAuthPrepare(
  char *zSql;
  int rc;
  va_list ap;
-  u64 savedFlags = db->flags;
+  int savedFlags = db->flags;

  va_start(ap, zFormat);
  zSql = sqlite3_vmprintf(zFormat, ap);
@@ -70,12 +70,11 @@ LIBOBJ+= vdbe.o parse.o \
         notify.o opcodes.o os.o os_unix.o os_win.o \
         pager.o pcache.o pcache1.o pragma.o prepare.o printf.o \
         random.o resolve.o rowset.o rtree.o \
-         select.o sqlite3rbu.o status.o stmt.o \
+         select.o shathree.o sqlite3rbu.o status.o stmt.o \
         table.o threads.o tokenize.o treeview.o trigger.o \
         update.o upsert.o userauth.o util.o vacuum.o \
         vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
-	 vdbetrace.o vdbevtab.o \
-         wal.o walker.o where.o wherecode.o whereexpr.o \
+	 vdbetrace.o wal.o walker.o where.o wherecode.o whereexpr.o \
         utf.o vtab.o window.o

 LIBOBJ += sqlite3session.o
@@ -174,7 +173,6 @@ SRC = \
  $(TOP)/src/vdbemem.c \
  $(TOP)/src/vdbesort.c \
  $(TOP)/src/vdbetrace.c \
-  $(TOP)/src/vdbevtab.c \
  $(TOP)/src/vdbeInt.h \
  $(TOP)/src/vtab.c \
  $(TOP)/src/vxworks.h \
@@ -244,6 +242,7 @@ SRC += \
  $(TOP)/ext/rbu/sqlite3rbu.h
 SRC += \
  $(TOP)/ext/misc/json1.c \
+  $(TOP)/ext/misc/shathree.c \
  $(TOP)/ext/misc/stmt.c


@@ -522,16 +521,18 @@ TESTOPTS = --verbose=file --output=test-out.txt
 # Extra compiler options for various shell tools
 #
 SHELL_OPT += -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
+SHELL_OPT += -DSQLITE_ENABLE_SHA3
 SHELL_OPT += -DSQLITE_ENABLE_RTREE
 SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
 SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
 SHELL_OPT += -DSQLITE_ENABLE_DBPAGE_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
-SHELL_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 SHELL_OPT += -DSQLITE_ENABLE_OFFSET_SQL_FUNC
-FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
+SHELL_OPT += -DSQLITE_INTROSPECTION_PRAGMAS
+FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_SHA3
 FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
+FUZZCHECK_OPT += -DSQLITE_ENABLE_SHA3
 FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
 FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
 FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
@@ -539,7 +540,6 @@ FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
 FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
 FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
 FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
-FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 DBFUZZ_OPT =
 KV_OPT = -DSQLITE_THREADSAFE=0 -DSQLITE_DIRECT_OVERFLOW_READ
 ST_OPT = -DSQLITE_THREADSAFE=0
@@ -590,7 +590,6 @@ DBFUZZ2_OPTS = \
  -DSQLITE_ENABLE_DESERIALIZE \
  -DSQLITE_DEBUG \
  -DSQLITE_ENABLE_DBSTAT_VTAB \
-  -DSQLITE_ENABLE_BYTECODE_VTAB \
  -DSQLITE_ENABLE_RTREE \
  -DSQLITE_ENABLE_FTS4 \
  -DSQLITE_ENABLE_FTS5
@@ -738,7 +737,6 @@ SHELL_SRC = \
 	$(TOP)/ext/misc/fileio.c \
 	$(TOP)/ext/misc/completion.c \
 	$(TOP)/ext/misc/sqlar.c \
-        $(TOP)/ext/misc/uint.c \
 	$(TOP)/ext/expert/sqlite3expert.c \
 	$(TOP)/ext/expert/sqlite3expert.h \
 	$(TOP)/ext/misc/zipfile.c \
@@ -819,6 +817,9 @@ fts5.o:	fts5.c
 json1.o:	$(TOP)/ext/misc/json1.c
 	$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c

+shathree.o:	$(TOP)/ext/misc/shathree.c
+	$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/misc/shathree.c
+
 stmt.o:	$(TOP)/ext/misc/stmt.c
 	$(TCCX) -DSQLITE_CORE -c $(TOP)/ext/misc/stmt.c

@@ -900,7 +901,6 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
 TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
-TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
 TESTFIXTURE_FLAGS += -DTCLSH_INIT_PROC=sqlite3TestInit

 testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
@@ -941,6 +941,10 @@ fuzztest:	fuzzcheck$(EXE) $(FUZZDATA) sessionfuzz$(EXE) $(TOP)/test/sessionfuzz-
 	./fuzzcheck$(EXE) $(FUZZDATA)
 	./sessionfuzz run $(TOP)/test/sessionfuzz-data1.db

+fastfuzztest:	fuzzcheck$(EXE) $(FUZZDATA) sessionfuzz$(EXE) $(TOP)/test/sessionfuzz-data1.db
+	./fuzzcheck$(EXE) --limit-mem 100M $(FUZZDATA)
+	./sessionfuzz run $(TOP)/test/sessionfuzz-data1.db
+
 valgrindfuzz:	fuzzcheck$(EXE) $(FUZZDATA) sessionfuzz$(EXE) $(TOP)/test/sessionfuzz-data1.db
 	valgrind ./fuzzcheck$(EXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
 	valgrind ./sessionfuzz run $(TOP)/test/sessionfuzz-data1.db
@@ -958,7 +962,7 @@ quicktest:	./testfixture$(EXE)

 # The default test case.  Runs most of the faster standard TCL tests,
 # and fuzz tests, and sqlite3_analyzer and sqldiff tests.
-test:	fuzztest sourcetest $(TESTPROGS) tcltest
+test:	fastfuzztest sourcetest $(TESTPROGS) tcltest

 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.
@@ -1 +1 @@
-baa720e4a88f268ed95337daab5f434fd3263b00f09101cddc6424765bf3b722
+1e0f4869dedabec03b6eafeffa5ed3e43b70f2ca5b27816bb8a56dba7b5fd94f
@@ -31,8 +31,9 @@
 static int isAlterableTable(Parse *pParse, Table *pTab){
  if( 0==sqlite3StrNICmp(pTab->zName, "sqlite_", 7) 
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-   || ( (pTab->tabFlags & TF_Shadow)!=0
-        && sqlite3ReadOnlyShadowTables(pParse->db)
+   || ( (pTab->tabFlags & TF_Shadow) 
+     && (pParse->db->flags & SQLITE_Defensive)
+     && pParse->db->nVdbeExec==0
   )
 #endif
  ){
@@ -297,6 +298,14 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
  }
 #endif

+  /* If the default value for the new column was specified with a 
+  ** literal NULL, then set pDflt to 0. This simplifies checking
+  ** for an SQL NULL default below.
+  */
+  assert( pDflt==0 || pDflt->op==TK_SPAN );
+  if( pDflt && pDflt->pLeft->op==TK_NULL ){
+    pDflt = 0;
+  }

  /* Check that the new column is not specified as PRIMARY KEY or UNIQUE.
  ** If there is a NOT NULL constraint, then the default value for the
@@ -310,49 +319,35 @@ void sqlite3AlterFinishAddColumn(Parse *pParse, Token *pColDef){
    sqlite3ErrorMsg(pParse, "Cannot add a UNIQUE column");
    return;
  }
-  if( (pCol->colFlags & COLFLAG_GENERATED)==0 ){
-    /* If the default value for the new column was specified with a 
-    ** literal NULL, then set pDflt to 0. This simplifies checking
-    ** for an SQL NULL default below.
-    */
-    assert( pDflt==0 || pDflt->op==TK_SPAN );
-    if( pDflt && pDflt->pLeft->op==TK_NULL ){
-      pDflt = 0;
-    }
-    if( (db->flags&SQLITE_ForeignKeys) && pNew->pFKey && pDflt ){
-      sqlite3ErrorMsg(pParse, 
-          "Cannot add a REFERENCES column with non-NULL default value");
-      return;
-    }
-    if( pCol->notNull && !pDflt ){
-      sqlite3ErrorMsg(pParse, 
-          "Cannot add a NOT NULL column with default value NULL");
-      return;
-    }
-
-    /* Ensure the default expression is something that sqlite3ValueFromExpr()
-    ** can handle (i.e. not CURRENT_TIME etc.)
-    */
-    if( pDflt ){
-      sqlite3_value *pVal = 0;
-      int rc;
-      rc = sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_BLOB, &pVal);
-      assert( rc==SQLITE_OK || rc==SQLITE_NOMEM );
-      if( rc!=SQLITE_OK ){
-        assert( db->mallocFailed == 1 );
-        return;
-      }
-      if( !pVal ){
-        sqlite3ErrorMsg(pParse,"Cannot add a column with non-constant default");
-        return;
-      }
-      sqlite3ValueFree(pVal);
-    }
-  }else if( pCol->colFlags & COLFLAG_STORED ){
-    sqlite3ErrorMsg(pParse, "cannot add a STORED column");
+  if( (db->flags&SQLITE_ForeignKeys) && pNew->pFKey && pDflt ){
+    sqlite3ErrorMsg(pParse, 
+        "Cannot add a REFERENCES column with non-NULL default value");
+    return;
+  }
+  if( pCol->notNull && !pDflt ){
+    sqlite3ErrorMsg(pParse, 
+        "Cannot add a NOT NULL column with default value NULL");
    return;
  }

+  /* Ensure the default expression is something that sqlite3ValueFromExpr()
+  ** can handle (i.e. not CURRENT_TIME etc.)
+  */
+  if( pDflt ){
+    sqlite3_value *pVal = 0;
+    int rc;
+    rc = sqlite3ValueFromExpr(db, pDflt, SQLITE_UTF8, SQLITE_AFF_BLOB, &pVal);
+    assert( rc==SQLITE_OK || rc==SQLITE_NOMEM );
+    if( rc!=SQLITE_OK ){
+      assert( db->mallocFailed == 1 );
+      return;
+    }
+    if( !pVal ){
+      sqlite3ErrorMsg(pParse, "Cannot add a column with non-constant default");
+      return;
+    }
+    sqlite3ValueFree(pVal);
+  }

  /* Modify the CREATE TABLE statement. */
  zCol = sqlite3DbStrNDup(db, (char*)pColDef->z, pColDef->n);
@@ -440,7 +435,6 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
    goto exit_begin_add_column;
  }

-  sqlite3MayAbort(pParse);
  assert( pTab->addColOffset>0 );
  iDb = sqlite3SchemaToIndex(db, pTab->pSchema);

@@ -469,7 +463,6 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){
  for(i=0; i<pNew->nCol; i++){
    Column *pCol = &pNew->aCol[i];
    pCol->zName = sqlite3DbStrDup(db, pCol->zName);
-    pCol->hName = sqlite3StrIHash(pCol->zName);
    pCol->zColl = 0;
    pCol->pDflt = 0;
  }
@@ -698,14 +691,12 @@ void *sqlite3RenameTokenMap(Parse *pParse, void *pPtr, Token *pToken){
  RenameToken *pNew;
  assert( pPtr || pParse->db->mallocFailed );
  renameTokenCheckAll(pParse, pPtr);
-  if( ALWAYS(pParse->eParseMode!=PARSE_MODE_UNMAP) ){
-    pNew = sqlite3DbMallocZero(pParse->db, sizeof(RenameToken));
-    if( pNew ){
-      pNew->p = pPtr;
-      pNew->t = *pToken;
-      pNew->pNext = pParse->pRename;
-      pParse->pRename = pNew;
-    }
+  pNew = sqlite3DbMallocZero(pParse->db, sizeof(RenameToken));
+  if( pNew ){
+    pNew->p = pPtr;
+    pNew->t = *pToken;
+    pNew->pNext = pParse->pRename;
+    pParse->pRename = pNew;
  }

  return pPtr;
@@ -736,54 +727,17 @@ static int renameUnmapExprCb(Walker *pWalker, Expr *pExpr){
  return WRC_Continue;
 }

-/*
-** Iterate through the Select objects that are part of WITH clauses attached
-** to select statement pSelect.
-*/
-static void renameWalkWith(Walker *pWalker, Select *pSelect){
-  With *pWith = pSelect->pWith;
-  if( pWith ){
-    int i;
-    for(i=0; i<pWith->nCte; i++){
-      Select *p = pWith->a[i].pSelect;
-      NameContext sNC;
-      memset(&sNC, 0, sizeof(sNC));
-      sNC.pParse = pWalker->pParse;
-      sqlite3SelectPrep(sNC.pParse, p, &sNC);
-      sqlite3WalkSelect(pWalker, p);
-      sqlite3RenameExprlistUnmap(pWalker->pParse, pWith->a[i].pCols);
-    }
-  }
-}
-
-/*
-** Unmap all tokens in the IdList object passed as the second argument.
-*/
-static void unmapColumnIdlistNames(
-  Parse *pParse,
-  IdList *pIdList
-){
-  if( pIdList ){
-    int ii;
-    for(ii=0; ii<pIdList->nId; ii++){
-      sqlite3RenameTokenRemap(pParse, 0, (void*)pIdList->a[ii].zName);
-    }
-  }
-}
-
 /*
 ** Walker callback used by sqlite3RenameExprUnmap().
 */
 static int renameUnmapSelectCb(Walker *pWalker, Select *p){
  Parse *pParse = pWalker->pParse;
  int i;
-  if( pParse->nErr ) return WRC_Abort;
-  if( NEVER(p->selFlags & SF_View) ) return WRC_Prune;
  if( ALWAYS(p->pEList) ){
    ExprList *pList = p->pEList;
    for(i=0; i<pList->nExpr; i++){
-      if( pList->a[i].zEName && pList->a[i].eEName==ENAME_NAME ){
-        sqlite3RenameTokenRemap(pParse, 0, (void*)pList->a[i].zEName);
+      if( pList->a[i].zName ){
+        sqlite3RenameTokenRemap(pParse, 0, (void*)pList->a[i].zName);
      }
    }
  }
@@ -791,12 +745,8 @@ static int renameUnmapSelectCb(Walker *pWalker, Select *p){
    SrcList *pSrc = p->pSrc;
    for(i=0; i<pSrc->nSrc; i++){
      sqlite3RenameTokenRemap(pParse, 0, (void*)pSrc->a[i].zName);
-      if( sqlite3WalkExpr(pWalker, pSrc->a[i].pOn) ) return WRC_Abort;
-      unmapColumnIdlistNames(pParse, pSrc->a[i].pUsing);
    }
  }
-
-  renameWalkWith(pWalker, p);
  return WRC_Continue;
 }

@@ -804,15 +754,12 @@ static int renameUnmapSelectCb(Walker *pWalker, Select *p){
 ** Remove all nodes that are part of expression pExpr from the rename list.
 */
 void sqlite3RenameExprUnmap(Parse *pParse, Expr *pExpr){
-  u8 eMode = pParse->eParseMode;
  Walker sWalker;
  memset(&sWalker, 0, sizeof(Walker));
  sWalker.pParse = pParse;
  sWalker.xExprCallback = renameUnmapExprCb;
  sWalker.xSelectCallback = renameUnmapSelectCb;
-  pParse->eParseMode = PARSE_MODE_UNMAP;
  sqlite3WalkExpr(&sWalker, pExpr);
-  pParse->eParseMode = eMode;
 }

 /*
@@ -828,9 +775,7 @@ void sqlite3RenameExprlistUnmap(Parse *pParse, ExprList *pEList){
    sWalker.xExprCallback = renameUnmapExprCb;
    sqlite3WalkExprList(&sWalker, pEList);
    for(i=0; i<pEList->nExpr; i++){
-      if( ALWAYS(pEList->a[i].eEName==ENAME_NAME) ){
-        sqlite3RenameTokenRemap(pParse, 0, (void*)pEList->a[i].zEName);
-      }
+      sqlite3RenameTokenRemap(pParse, 0, (void*)pEList->a[i].zName);
    }
  }
 }
@@ -868,13 +813,30 @@ static void renameTokenFind(Parse *pParse, struct RenameCtx *pCtx, void *pPtr){
  }
 }

+/*
+** Iterate through the Select objects that are part of WITH clauses attached
+** to select statement pSelect.
+*/
+static void renameWalkWith(Walker *pWalker, Select *pSelect){
+  if( pSelect->pWith ){
+    int i;
+    for(i=0; i<pSelect->pWith->nCte; i++){
+      Select *p = pSelect->pWith->a[i].pSelect;
+      NameContext sNC;
+      memset(&sNC, 0, sizeof(sNC));
+      sNC.pParse = pWalker->pParse;
+      sqlite3SelectPrep(sNC.pParse, p, &sNC);
+      sqlite3WalkSelect(pWalker, p);
+    }
+  }
+}
+
 /*
 ** This is a Walker select callback. It does nothing. It is only required
 ** because without a dummy callback, sqlite3WalkExpr() and similar do not
 ** descend into sub-select statements.
 */
 static int renameColumnSelectCb(Walker *pWalker, Select *p){
-  if( p->selFlags & SF_View ) return WRC_Prune;
  renameWalkWith(pWalker, p);
  return WRC_Continue;
 }
@@ -968,11 +930,8 @@ static void renameColumnElistNames(
  if( pEList ){
    int i;
    for(i=0; i<pEList->nExpr; i++){
-      char *zName = pEList->a[i].zEName;
-      if( ALWAYS(pEList->a[i].eEName==ENAME_NAME)
-       && ALWAYS(zName!=0)
-       && 0==sqlite3_stricmp(zName, zOld)
-      ){
+      char *zName = pEList->a[i].zName;
+      if( 0==sqlite3_stricmp(zName, zOld) ){
        renameTokenFind(pParse, pCtx, (void*)zName);
      }
    }
@@ -1001,7 +960,6 @@ static void renameColumnIdlistNames(
  }
 }

-
 /*
 ** Parse the SQL statement zSql using Parse object (*p). The Parse object
 ** is initialized by this function before it is used.
@@ -1009,6 +967,7 @@ static void renameColumnIdlistNames(
 static int renameParseSql(
  Parse *p,                       /* Memory to use for Parse object */
  const char *zDb,                /* Name of schema SQL belongs to */
+  int bTable,                     /* 1 -> RENAME TABLE, 0 -> RENAME COLUMN */
  sqlite3 *db,                    /* Database handle */
  const char *zSql,               /* SQL to parse */
  int bTemp                       /* True if SQL is from temp schema */
@@ -1022,7 +981,7 @@ static int renameParseSql(
  ** occurs and the parse does not result in a new table, index or
  ** trigger object, the database must be corrupt. */
  memset(p, 0, sizeof(Parse));
-  p->eParseMode = PARSE_MODE_RENAME;
+  p->eParseMode = (bTable ? PARSE_MODE_RENAME_TABLE : PARSE_MODE_RENAME_COLUMN);
  p->db = db;
  p->nQueryLoop = 1;
  rc = sqlite3RunParser(p, zSql, &zErr);
@@ -1329,7 +1288,7 @@ static void renameColumnFunc(
 #ifndef SQLITE_OMIT_AUTHORIZATION
  db->xAuth = 0;
 #endif
-  rc = renameParseSql(&sParse, zDb, db, zSql, bTemp);
+  rc = renameParseSql(&sParse, zDb, 0, db, zSql, bTemp);

  /* Find tokens that need to be replaced. */
  memset(&sWalker, 0, sizeof(Walker));
@@ -1343,9 +1302,8 @@ static void renameColumnFunc(
  if( sParse.pNewTable ){
    Select *pSelect = sParse.pNewTable->pSelect;
    if( pSelect ){
-      pSelect->selFlags &= ~SF_View;
      sParse.rc = SQLITE_OK;
-      sqlite3SelectPrep(&sParse, pSelect, 0);
+      sqlite3SelectPrep(&sParse, sParse.pNewTable->pSelect, 0);
      rc = (db->mallocFailed ? SQLITE_NOMEM : sParse.rc);
      if( rc==SQLITE_OK ){
        sqlite3WalkSelect(&sWalker, pSelect);
@@ -1372,11 +1330,6 @@ static void renameColumnFunc(
          sqlite3WalkExprList(&sWalker, pIdx->aColExpr);
        }
      }
-#ifndef SQLITE_OMIT_GENERATED_COLUMNS
-      for(i=0; i<sParse.pNewTable->nCol; i++){
-        sqlite3WalkExpr(&sWalker, sParse.pNewTable->aCol[i].pDflt);
-      }
-#endif

      for(pFKey=sParse.pNewTable->pFKey; pFKey; pFKey=pFKey->pNextFrom){
        for(i=0; i<pFKey->nCol; i++){
@@ -1462,7 +1415,6 @@ static int renameTableSelectCb(Walker *pWalker, Select *pSelect){
  int i;
  RenameCtx *p = pWalker->u.pRename;
  SrcList *pSrc = pSelect->pSrc;
-  if( pSelect->selFlags & SF_View ) return WRC_Prune;
  if( pSrc==0 ){
    assert( pWalker->pParse->db->mallocFailed );
    return WRC_Abort;
@@ -1533,7 +1485,7 @@ static void renameTableFunc(
    sWalker.xSelectCallback = renameTableSelectCb;
    sWalker.u.pRename = &sCtx;

-    rc = renameParseSql(&sParse, zDb, db, zInput, bTemp);
+    rc = renameParseSql(&sParse, zDb, 1, db, zInput, bTemp);

    if( rc==SQLITE_OK ){
      int isLegacy = (db->flags & SQLITE_LegacyAlter);
@@ -1542,19 +1494,13 @@ static void renameTableFunc(

        if( pTab->pSelect ){
          if( isLegacy==0 ){
-            Select *pSelect = pTab->pSelect;
            NameContext sNC;
            memset(&sNC, 0, sizeof(sNC));
            sNC.pParse = &sParse;

-            assert( pSelect->selFlags & SF_View );
-            pSelect->selFlags &= ~SF_View;
            sqlite3SelectPrep(&sParse, pTab->pSelect, &sNC);
-            if( sParse.nErr ){
-              rc = sParse.rc;
-            }else{
-              sqlite3WalkSelect(&sWalker, pTab->pSelect);
-            }
+            if( sParse.nErr ) rc = sParse.rc;
+            sqlite3WalkSelect(&sWalker, pTab->pSelect);
          }
        }else{
          /* Modify any FK definitions to point to the new table. */
@@ -1675,7 +1621,7 @@ static void renameTableTest(
  if( zDb && zInput ){
    int rc;
    Parse sParse;
-    rc = renameParseSql(&sParse, zDb, db, zInput, bTemp);
+    rc = renameParseSql(&sParse, zDb, 1, db, zInput, bTemp);
    if( rc==SQLITE_OK ){
      if( isLegacy==0 && sParse.pNewTable && sParse.pNewTable->pSelect ){
        NameContext sNC;
@@ -256,9 +256,9 @@ static void openStatTable(
 ** share an instance of the following structure to hold their state
 ** information.
 */
-typedef struct StatAccum StatAccum;
-typedef struct StatSample StatSample;
-struct StatSample {
+typedef struct Stat4Accum Stat4Accum;
+typedef struct Stat4Sample Stat4Sample;
+struct Stat4Sample {
  tRowcnt *anEq;                  /* sqlite_stat4.nEq */
  tRowcnt *anDLt;                 /* sqlite_stat4.nDLt */
 #ifdef SQLITE_ENABLE_STAT4
@@ -273,29 +273,27 @@ struct StatSample {
  u32 iHash;                      /* Tiebreaker hash */
 #endif
 };                                                    
-struct StatAccum {
-  sqlite3 *db;              /* Database connection, for malloc() */
+struct Stat4Accum {
  tRowcnt nRow;             /* Number of rows in the entire table */
+  tRowcnt nPSample;         /* How often to do a periodic sample */
  int nCol;                 /* Number of columns in index + pk/rowid */
  int nKeyCol;              /* Number of index columns w/o the pk/rowid */
-  StatSample current;       /* Current row as a StatSample */
-#ifdef SQLITE_ENABLE_STAT4
-  tRowcnt nPSample;         /* How often to do a periodic sample */
  int mxSample;             /* Maximum number of samples to accumulate */
+  Stat4Sample current;      /* Current row as a Stat4Sample */
  u32 iPrn;                 /* Pseudo-random number used for sampling */
-  StatSample *aBest;        /* Array of nCol best samples */
+  Stat4Sample *aBest;       /* Array of nCol best samples */
  int iMin;                 /* Index in a[] of entry with minimum score */
  int nSample;              /* Current number of samples */
  int nMaxEqZero;           /* Max leading 0 in anEq[] for any a[] entry */
  int iGet;                 /* Index of current sample accessed by stat_get() */
-  StatSample *a;            /* Array of mxSample StatSample objects */
-#endif
+  Stat4Sample *a;           /* Array of mxSample Stat4Sample objects */
+  sqlite3 *db;              /* Database connection, for malloc() */
 };

-/* Reclaim memory used by a StatSample
+/* Reclaim memory used by a Stat4Sample
 */
 #ifdef SQLITE_ENABLE_STAT4
-static void sampleClear(sqlite3 *db, StatSample *p){
+static void sampleClear(sqlite3 *db, Stat4Sample *p){
  assert( db!=0 );
  if( p->nRowid ){
    sqlite3DbFree(db, p->u.aRowid);
@@ -307,7 +305,7 @@ static void sampleClear(sqlite3 *db, StatSample *p){
 /* Initialize the BLOB value of a ROWID
 */
 #ifdef SQLITE_ENABLE_STAT4
-static void sampleSetRowid(sqlite3 *db, StatSample *p, int n, const u8 *pData){
+static void sampleSetRowid(sqlite3 *db, Stat4Sample *p, int n, const u8 *pData){
  assert( db!=0 );
  if( p->nRowid ) sqlite3DbFree(db, p->u.aRowid);
  p->u.aRowid = sqlite3DbMallocRawNN(db, n);
@@ -323,7 +321,7 @@ static void sampleSetRowid(sqlite3 *db, StatSample *p, int n, const u8 *pData){
 /* Initialize the INTEGER value of a ROWID.
 */
 #ifdef SQLITE_ENABLE_STAT4
-static void sampleSetRowidInt64(sqlite3 *db, StatSample *p, i64 iRowid){
+static void sampleSetRowidInt64(sqlite3 *db, Stat4Sample *p, i64 iRowid){
  assert( db!=0 );
  if( p->nRowid ) sqlite3DbFree(db, p->u.aRowid);
  p->nRowid = 0;
@@ -336,7 +334,7 @@ static void sampleSetRowidInt64(sqlite3 *db, StatSample *p, i64 iRowid){
 ** Copy the contents of object (*pFrom) into (*pTo).
 */
 #ifdef SQLITE_ENABLE_STAT4
-static void sampleCopy(StatAccum *p, StatSample *pTo, StatSample *pFrom){
+static void sampleCopy(Stat4Accum *p, Stat4Sample *pTo, Stat4Sample *pFrom){
  pTo->isPSample = pFrom->isPSample;
  pTo->iCol = pFrom->iCol;
  pTo->iHash = pFrom->iHash;
@@ -352,10 +350,10 @@ static void sampleCopy(StatAccum *p, StatSample *pTo, StatSample *pFrom){
 #endif

 /*
-** Reclaim all memory of a StatAccum structure.
+** Reclaim all memory of a Stat4Accum structure.
 */
-static void statAccumDestructor(void *pOld){
-  StatAccum *p = (StatAccum*)pOld;
+static void stat4Destructor(void *pOld){
+  Stat4Accum *p = (Stat4Accum*)pOld;
 #ifdef SQLITE_ENABLE_STAT4
  int i;
  for(i=0; i<p->nCol; i++) sampleClear(p->db, p->aBest+i);
@@ -383,9 +381,9 @@ static void statAccumDestructor(void *pOld){
 ** PRIMARY KEY of the table.  The covering index that implements the
 ** original WITHOUT ROWID table as N==K as a special case.
 **
-** This routine allocates the StatAccum object in heap memory. The return 
-** value is a pointer to the StatAccum object.  The datatype of the
-** return value is BLOB, but it is really just a pointer to the StatAccum
+** This routine allocates the Stat4Accum object in heap memory. The return 
+** value is a pointer to the Stat4Accum object.  The datatype of the
+** return value is BLOB, but it is really just a pointer to the Stat4Accum
 ** object.
 */
 static void statInit(
@@ -393,7 +391,7 @@ static void statInit(
  int argc,
  sqlite3_value **argv
 ){
-  StatAccum *p;
+  Stat4Accum *p;
  int nCol;                       /* Number of columns in index being sampled */
  int nKeyCol;                    /* Number of key columns */
  int nColUp;                     /* nCol rounded up for alignment */
@@ -412,13 +410,13 @@ static void statInit(
  assert( nKeyCol<=nCol );
  assert( nKeyCol>0 );

-  /* Allocate the space required for the StatAccum object */
+  /* Allocate the space required for the Stat4Accum object */
  n = sizeof(*p) 
-    + sizeof(tRowcnt)*nColUp                  /* StatAccum.anEq */
-    + sizeof(tRowcnt)*nColUp                  /* StatAccum.anDLt */
+    + sizeof(tRowcnt)*nColUp                  /* Stat4Accum.anEq */
+    + sizeof(tRowcnt)*nColUp                  /* Stat4Accum.anDLt */
 #ifdef SQLITE_ENABLE_STAT4
-    + sizeof(tRowcnt)*nColUp                  /* StatAccum.anLt */
-    + sizeof(StatSample)*(nCol+mxSample)      /* StatAccum.aBest[], a[] */
+    + sizeof(tRowcnt)*nColUp                  /* Stat4Accum.anLt */
+    + sizeof(Stat4Sample)*(nCol+mxSample)     /* Stat4Accum.aBest[], a[] */
    + sizeof(tRowcnt)*3*nColUp*(nCol+mxSample)
 #endif
  ;
@@ -447,8 +445,8 @@ static void statInit(
    p->current.anLt = &p->current.anEq[nColUp];
    p->iPrn = 0x689e962d*(u32)nCol ^ 0xd0944565*(u32)sqlite3_value_int(argv[2]);
  
-    /* Set up the StatAccum.a[] and aBest[] arrays */
-    p->a = (struct StatSample*)&p->current.anLt[nColUp];
+    /* Set up the Stat4Accum.a[] and aBest[] arrays */
+    p->a = (struct Stat4Sample*)&p->current.anLt[nColUp];
    p->aBest = &p->a[mxSample];
    pSpace = (u8*)(&p->a[mxSample+nCol]);
    for(i=0; i<(mxSample+nCol); i++){
@@ -468,7 +466,7 @@ static void statInit(
  ** only the pointer (the 2nd parameter) matters.  The size of the object
  ** (given by the 3rd parameter) is never used and can be any positive
  ** value. */
-  sqlite3_result_blob(context, p, sizeof(*p), statAccumDestructor);
+  sqlite3_result_blob(context, p, sizeof(*p), stat4Destructor);
 }
 static const FuncDef statInitFuncdef = {
  2+IsStat4,       /* nArg */
@@ -495,9 +493,9 @@ static const FuncDef statInitFuncdef = {
 ** the anEq[] array from pSample->anEq[pSample->iCol+1] onwards are valid. 
 */
 static int sampleIsBetterPost(
-  StatAccum *pAccum, 
-  StatSample *pNew, 
-  StatSample *pOld
+  Stat4Accum *pAccum, 
+  Stat4Sample *pNew, 
+  Stat4Sample *pOld
 ){
  int nCol = pAccum->nCol;
  int i;
@@ -519,9 +517,9 @@ static int sampleIsBetterPost(
 ** the anEq[] array from pSample->anEq[pSample->iCol] onwards are valid. 
 */
 static int sampleIsBetter(
-  StatAccum *pAccum, 
-  StatSample *pNew, 
-  StatSample *pOld
+  Stat4Accum *pAccum, 
+  Stat4Sample *pNew, 
+  Stat4Sample *pOld
 ){
  tRowcnt nEqNew = pNew->anEq[pNew->iCol];
  tRowcnt nEqOld = pOld->anEq[pOld->iCol];
@@ -541,21 +539,21 @@ static int sampleIsBetter(
 ** Copy the contents of sample *pNew into the p->a[] array. If necessary,
 ** remove the least desirable sample from p->a[] to make room.
 */
-static void sampleInsert(StatAccum *p, StatSample *pNew, int nEqZero){
-  StatSample *pSample = 0;
+static void sampleInsert(Stat4Accum *p, Stat4Sample *pNew, int nEqZero){
+  Stat4Sample *pSample = 0;
  int i;

  assert( IsStat4 || nEqZero==0 );

-  /* StatAccum.nMaxEqZero is set to the maximum number of leading 0
-  ** values in the anEq[] array of any sample in StatAccum.a[]. In
+  /* Stat4Accum.nMaxEqZero is set to the maximum number of leading 0
+  ** values in the anEq[] array of any sample in Stat4Accum.a[]. In
  ** other words, if nMaxEqZero is n, then it is guaranteed that there
-  ** are no samples with StatSample.anEq[m]==0 for (m>=n). */
+  ** are no samples with Stat4Sample.anEq[m]==0 for (m>=n). */
  if( nEqZero>p->nMaxEqZero ){
    p->nMaxEqZero = nEqZero;
  }
  if( pNew->isPSample==0 ){
-    StatSample *pUpgrade = 0;
+    Stat4Sample *pUpgrade = 0;
    assert( pNew->anEq[pNew->iCol]>0 );

    /* This sample is being added because the prefix that ends in column 
@@ -564,7 +562,7 @@ static void sampleInsert(StatAccum *p, StatSample *pNew, int nEqZero){
    ** this one. Instead, upgrade the priority of the highest priority
    ** existing sample that shares this prefix.  */
    for(i=p->nSample-1; i>=0; i--){
-      StatSample *pOld = &p->a[i];
+      Stat4Sample *pOld = &p->a[i];
      if( pOld->anEq[pNew->iCol]==0 ){
        if( pOld->isPSample ) return;
        assert( pOld->iCol>pNew->iCol );
@@ -583,7 +581,7 @@ static void sampleInsert(StatAccum *p, StatSample *pNew, int nEqZero){

  /* If necessary, remove sample iMin to make room for the new sample. */
  if( p->nSample>=p->mxSample ){
-    StatSample *pMin = &p->a[p->iMin];
+    Stat4Sample *pMin = &p->a[p->iMin];
    tRowcnt *anEq = pMin->anEq;
    tRowcnt *anLt = pMin->anLt;
    tRowcnt *anDLt = pMin->anDLt;
@@ -626,20 +624,20 @@ find_new_min:
 }
 #endif /* SQLITE_ENABLE_STAT4 */

-#ifdef SQLITE_ENABLE_STAT4
 /*
 ** Field iChng of the index being scanned has changed. So at this point
 ** p->current contains a sample that reflects the previous row of the
 ** index. The value of anEq[iChng] and subsequent anEq[] elements are
 ** correct at this point.
 */
-static void samplePushPrevious(StatAccum *p, int iChng){
+static void samplePushPrevious(Stat4Accum *p, int iChng){
+#ifdef SQLITE_ENABLE_STAT4
  int i;

  /* Check if any samples from the aBest[] array should be pushed
  ** into IndexSample.a[] at this point.  */
  for(i=(p->nCol-2); i>=iChng; i--){
-    StatSample *pBest = &p->aBest[i];
+    Stat4Sample *pBest = &p->aBest[i];
    pBest->anEq[i] = p->current.anEq[i];
    if( p->nSample<p->mxSample || sampleIsBetter(p, pBest, &p->a[p->iMin]) ){
      sampleInsert(p, pBest, i);
@@ -663,20 +661,25 @@ static void samplePushPrevious(StatAccum *p, int iChng){
    }
    p->nMaxEqZero = iChng;
  }
+#endif
+
+#ifndef SQLITE_ENABLE_STAT4
+  UNUSED_PARAMETER( p );
+  UNUSED_PARAMETER( iChng );
+#endif
 }
-#endif /* SQLITE_ENABLE_STAT4 */

 /*
 ** Implementation of the stat_push SQL function:  stat_push(P,C,R)
 ** Arguments:
 **
-**    P     Pointer to the StatAccum object created by stat_init()
+**    P     Pointer to the Stat4Accum object created by stat_init()
 **    C     Index of left-most column to differ from previous row
 **    R     Rowid for the current row.  Might be a key record for
 **          WITHOUT ROWID tables.
 **
 ** This SQL function always returns NULL.  It's purpose it to accumulate
-** statistical data and/or samples in the StatAccum object about the
+** statistical data and/or samples in the Stat4Accum object about the
 ** index being analyzed.  The stat_get() SQL function will later be used to
 ** extract relevant information for constructing the sqlite_statN tables.
 **
@@ -690,7 +693,7 @@ static void statPush(
  int i;

  /* The three function arguments */
-  StatAccum *p = (StatAccum*)sqlite3_value_blob(argv[0]);
+  Stat4Accum *p = (Stat4Accum*)sqlite3_value_blob(argv[0]);
  int iChng = sqlite3_value_int(argv[1]);

  UNUSED_PARAMETER( argc );
@@ -703,9 +706,7 @@ static void statPush(
    for(i=0; i<p->nCol; i++) p->current.anEq[i] = 1;
  }else{
    /* Second and subsequent calls get processed here */
-#ifdef SQLITE_ENABLE_STAT4
    samplePushPrevious(p, iChng);
-#endif

    /* Update anDLt[], anLt[] and anEq[] to reflect the values that apply
    ** to the current row of the index. */
@@ -774,15 +775,15 @@ static const FuncDef statPushFuncdef = {
 /*
 ** Implementation of the stat_get(P,J) SQL function.  This routine is
 ** used to query statistical information that has been gathered into
-** the StatAccum object by prior calls to stat_push().  The P parameter
-** has type BLOB but it is really just a pointer to the StatAccum object.
+** the Stat4Accum object by prior calls to stat_push().  The P parameter
+** has type BLOB but it is really just a pointer to the Stat4Accum object.
 ** The content to returned is determined by the parameter J
 ** which is one of the STAT_GET_xxxx values defined above.
 **
 ** The stat_get(P,J) function is not available to generic SQL.  It is
 ** inserted as part of a manually constructed bytecode program.  (See
 ** the callStatGet() routine below.)  It is guaranteed that the P
-** parameter will always be a pointer to a StatAccum object, never a
+** parameter will always be a poiner to a Stat4Accum object, never a
 ** NULL.
 **
 ** If STAT4 is not enabled, then J is always
@@ -795,7 +796,7 @@ static void statGet(
  int argc,
  sqlite3_value **argv
 ){
-  StatAccum *p = (StatAccum*)sqlite3_value_blob(argv[0]);
+  Stat4Accum *p = (Stat4Accum*)sqlite3_value_blob(argv[0]);
 #ifdef SQLITE_ENABLE_STAT4
  /* STAT4 has a parameter on this routine. */
  int eCall = sqlite3_value_int(argv[1]);
@@ -816,7 +817,7 @@ static void statGet(
    ** the index. The first integer in the list is the total number of 
    ** entries in the index. There is one additional integer in the list 
    ** for each indexed column. This additional integer is an estimate of
-    ** the number of rows matched by a equality query on the index using
+    ** the number of rows matched by a stabbing query on the index using
    ** a key with the corresponding number of fields. In other words,
    ** if the index is on columns (a,b) and the sqlite_stat1 value is 
    ** "100 10 2", then SQLite estimates that:
@@ -859,7 +860,7 @@ static void statGet(
      p->iGet = 0;
    }
    if( p->iGet<p->nSample ){
-      StatSample *pS = p->a + p->iGet;
+      Stat4Sample *pS = p->a + p->iGet;
      if( pS->nRowid==0 ){
        sqlite3_result_int64(context, pS->u.iRowid);
      }else{
@@ -915,17 +916,18 @@ static const FuncDef statGetFuncdef = {
  {0}
 };

-static void callStatGet(Parse *pParse, int regStat4, int iParam, int regOut){
+static void callStatGet(Vdbe *v, int regStat4, int iParam, int regOut){
+  assert( regOut!=regStat4 && regOut!=regStat4+1 );
 #ifdef SQLITE_ENABLE_STAT4
-  sqlite3VdbeAddOp2(pParse->pVdbe, OP_Integer, iParam, regStat4+1);
+  sqlite3VdbeAddOp2(v, OP_Integer, iParam, regStat4+1);
 #elif SQLITE_DEBUG
  assert( iParam==STAT_GET_STAT1 );
 #else
  UNUSED_PARAMETER( iParam );
 #endif
-  assert( regOut!=regStat4 && regOut!=regStat4+1 );
-  sqlite3VdbeAddFunctionCall(pParse, 0, regStat4, regOut, 1+IsStat4,
-                             &statGetFuncdef, 0);
+  sqlite3VdbeAddOp4(v, OP_Function0, 0, regStat4, regOut,
+                    (char*)&statGetFuncdef, P4_FUNCDEF);
+  sqlite3VdbeChangeP5(v, 1 + IsStat4);
 }

 /*
@@ -950,7 +952,7 @@ static void analyzeOneTable(
  int iDb;                     /* Index of database containing pTab */
  u8 needTableCnt = 1;         /* True to count the table */
  int regNewRowid = iMem++;    /* Rowid for the inserted record */
-  int regStat4 = iMem++;       /* Register to hold StatAccum object */
+  int regStat4 = iMem++;       /* Register to hold Stat4Accum object */
  int regChng = iMem++;        /* Index of changed index field */
 #ifdef SQLITE_ENABLE_STAT4
  int regRowid = iMem++;       /* Rowid argument passed to stat_push() */
@@ -1093,8 +1095,9 @@ static void analyzeOneTable(
 #endif
    sqlite3VdbeAddOp2(v, OP_Integer, nCol, regStat4+1);
    sqlite3VdbeAddOp2(v, OP_Integer, pIdx->nKeyCol, regStat4+2);
-    sqlite3VdbeAddFunctionCall(pParse, 0, regStat4+1, regStat4, 2+IsStat4,
-                               &statInitFuncdef, 0);
+    sqlite3VdbeAddOp4(v, OP_Function0, 0, regStat4+1, regStat4,
+                     (char*)&statInitFuncdef, P4_FUNCDEF);
+    sqlite3VdbeChangeP5(v, 2+IsStat4);

    /* Implementation of the following:
    **
@@ -1179,7 +1182,7 @@ static void analyzeOneTable(
      int j, k, regKey;
      regKey = sqlite3GetTempRange(pParse, pPk->nKeyCol);
      for(j=0; j<pPk->nKeyCol; j++){
-        k = sqlite3TableColumnToIndex(pIdx, pPk->aiColumn[j]);
+        k = sqlite3ColumnOfIndex(pIdx, pPk->aiColumn[j]);
        assert( k>=0 && k<pIdx->nColumn );
        sqlite3VdbeAddOp3(v, OP_Column, iIdxCur, k, regKey+j);
        VdbeComment((v, "%s", pTab->aCol[pPk->aiColumn[j]].zName));
@@ -1189,12 +1192,13 @@ static void analyzeOneTable(
    }
 #endif
    assert( regChng==(regStat4+1) );
-    sqlite3VdbeAddFunctionCall(pParse, 1, regStat4, regTemp, 2+IsStat4,
-                               &statPushFuncdef, 0);
+    sqlite3VdbeAddOp4(v, OP_Function0, 1, regStat4, regTemp,
+                     (char*)&statPushFuncdef, P4_FUNCDEF);
+    sqlite3VdbeChangeP5(v, 2+IsStat4);
    sqlite3VdbeAddOp2(v, OP_Next, iIdxCur, addrNextRow); VdbeCoverage(v);

    /* Add the entry to the stat1 table. */
-    callStatGet(pParse, regStat4, STAT_GET_STAT1, regStat1);
+    callStatGet(v, regStat4, STAT_GET_STAT1, regStat1);
    assert( "BBB"[0]==SQLITE_AFF_TEXT );
    sqlite3VdbeAddOp4(v, OP_MakeRecord, regTabname, 3, regTemp, "BBB", 0);
    sqlite3VdbeAddOp2(v, OP_NewRowid, iStatCur, regNewRowid);
@@ -1220,12 +1224,12 @@ static void analyzeOneTable(
      pParse->nMem = MAX(pParse->nMem, regCol+nCol);

      addrNext = sqlite3VdbeCurrentAddr(v);
-      callStatGet(pParse, regStat4, STAT_GET_ROWID, regSampleRowid);
+      callStatGet(v, regStat4, STAT_GET_ROWID, regSampleRowid);
      addrIsNull = sqlite3VdbeAddOp1(v, OP_IsNull, regSampleRowid);
      VdbeCoverage(v);
-      callStatGet(pParse, regStat4, STAT_GET_NEQ, regEq);
-      callStatGet(pParse, regStat4, STAT_GET_NLT, regLt);
-      callStatGet(pParse, regStat4, STAT_GET_NDLT, regDLt);
+      callStatGet(v, regStat4, STAT_GET_NEQ, regEq);
+      callStatGet(v, regStat4, STAT_GET_NLT, regLt);
+      callStatGet(v, regStat4, STAT_GET_NDLT, regDLt);
      sqlite3VdbeAddOp4Int(v, seekOp, iTabCur, addrNext, regSampleRowid, 0);
      VdbeCoverage(v);
      for(i=0; i<nCol; i++){
@@ -1446,9 +1450,7 @@ static void decodeIntArray(
      if( sqlite3_strglob("unordered*", z)==0 ){
        pIndex->bUnordered = 1;
      }else if( sqlite3_strglob("sz=[0-9]*", z)==0 ){
-        int sz = sqlite3Atoi(z+3);
-        if( sz<2 ) sz = 2;
-        pIndex->szIdxRow = sqlite3LogEst(sz);
+        pIndex->szIdxRow = sqlite3LogEst(sqlite3Atoi(z+3));
      }else if( sqlite3_strglob("noskipscan*", z)==0 ){
        pIndex->noSkipScan = 1;
      }
@@ -1850,9 +1852,9 @@ int sqlite3AnalysisLoad(sqlite3 *db, int iDb){
  /* Load the statistics from the sqlite_stat4 table. */
 #ifdef SQLITE_ENABLE_STAT4
  if( rc==SQLITE_OK ){
-    DisableLookaside;
+    db->lookaside.bDisable++;
    rc = loadStat4(db, sInfo.zDatabase);
-    EnableLookaside;
+    db->lookaside.bDisable--;
  }
  for(i=sqliteHashFirst(&pSchema->idxHash); i; i=sqliteHashNext(i)){
    Index *pIdx = sqliteHashData(i);
@@ -45,17 +45,6 @@ static int resolveAttachExpr(NameContext *pName, Expr *pExpr)
  return rc;
 }

-/*
-** Return true if zName points to a name that may be used to refer to
-** database iDb attached to handle db.
-*/
-int sqlite3DbIsNamed(sqlite3 *db, int iDb, const char *zName){
-  return (
-      sqlite3StrICmp(db->aDb[iDb].zDbSName, zName)==0
-   || (iDb==0 && sqlite3StrICmp("main", zName)==0)
-  );
-}
-
 /*
 ** An SQL user-function registered to do the work of an ATTACH statement. The
 ** three arguments to the function come directly from an attach statement:
@@ -128,8 +117,9 @@ static void attachFunc(
      goto attach_error;
    }
    for(i=0; i<db->nDb; i++){
-      assert( zName );
-      if( sqlite3DbIsNamed(db, i, zName) ){
+      char *z = db->aDb[i].zDbSName;
+      assert( z && zName );
+      if( sqlite3StrICmp(z, zName)==0 ){
        zErrDyn = sqlite3MPrintf(db, "database %s is already in use", zName);
        goto attach_error;
      }
@@ -197,7 +187,43 @@ static void attachFunc(
  if( rc==SQLITE_OK && pNew->zDbSName==0 ){
    rc = SQLITE_NOMEM_BKPT;
  }
-  sqlite3_free_filename( zPath );
+
+
+#ifdef SQLITE_HAS_CODEC
+  if( rc==SQLITE_OK ){
+    extern int sqlite3CodecAttach(sqlite3*, int, const void*, int);
+    extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);
+    int nKey;
+    char *zKey;
+    int t = sqlite3_value_type(argv[2]);
+    switch( t ){
+      case SQLITE_INTEGER:
+      case SQLITE_FLOAT:
+        zErrDyn = sqlite3DbStrDup(db, "Invalid key value");
+        rc = SQLITE_ERROR;
+        break;
+        
+      case SQLITE_TEXT:
+      case SQLITE_BLOB:
+        nKey = sqlite3_value_bytes(argv[2]);
+        zKey = (char *)sqlite3_value_blob(argv[2]);
+        rc = sqlite3CodecAttach(db, db->nDb-1, zKey, nKey);
+        break;
+
+      case SQLITE_NULL:
+        /* No key specified.  Use the key from URI filename, or if none,
+        ** use the key from the main database. */
+        if( sqlite3CodecQueryParameters(db, zName, zPath)==0 ){
+          sqlite3CodecGetKey(db, 0, (void**)&zKey, &nKey);
+          if( nKey || sqlite3BtreeGetOptimalReserve(db->aDb[0].pBt)>0 ){
+            rc = sqlite3CodecAttach(db, db->nDb-1, zKey, nKey);
+          }
+        }
+        break;
+    }
+  }
+#endif
+  sqlite3_free( zPath );

  /* If the file was opened successfully, read the schema for the new database.
  ** If this fails, or if opening the file failed, then close the file and 
@@ -273,7 +299,6 @@ static void detachFunc(
  sqlite3 *db = sqlite3_context_db_handle(context);
  int i;
  Db *pDb = 0;
-  HashElem *pEntry;
  char zErr[128];

  UNUSED_PARAMETER(NotUsed);
@@ -282,7 +307,7 @@ static void detachFunc(
  for(i=0; i<db->nDb; i++){
    pDb = &db->aDb[i];
    if( pDb->pBt==0 ) continue;
-    if( sqlite3DbIsNamed(db, i, zName) ) break;
+    if( sqlite3StrICmp(pDb->zDbSName, zName)==0 ) break;
  }

  if( i>=db->nDb ){
@@ -298,18 +323,6 @@ static void detachFunc(
    goto detach_error;
  }

-  /* If any TEMP triggers reference the schema being detached, move those
-  ** triggers to reference the TEMP schema itself. */
-  assert( db->aDb[1].pSchema );
-  pEntry = sqliteHashFirst(&db->aDb[1].pSchema->trigHash);
-  while( pEntry ){
-    Trigger *pTrig = (Trigger*)sqliteHashData(pEntry);
-    if( pTrig->pTabSchema==pDb->pSchema ){
-      pTrig->pTabSchema = pTrig->pSchema;
-    }
-    pEntry = sqliteHashNext(pEntry);
-  }
-
  sqlite3BtreeClose(pDb->pBt);
  pDb->pBt = 0;
  pDb->pSchema = 0;
@@ -375,8 +388,11 @@ static void codeAttach(

  assert( v || db->mallocFailed );
  if( v ){
-    sqlite3VdbeAddFunctionCall(pParse, 0, regArgs+3-pFunc->nArg, regArgs+3,
-                               pFunc->nArg, pFunc, 0);
+    sqlite3VdbeAddOp4(v, OP_Function0, 0, regArgs+3-pFunc->nArg, regArgs+3,
+                      (char *)pFunc, P4_FUNCDEF);
+    assert( pFunc->nArg==-1 || (pFunc->nArg&0xff)==pFunc->nArg );
+    sqlite3VdbeChangeP5(v, (u8)(pFunc->nArg));
+ 
    /* Code an OP_Expire. For an ATTACH statement, set P1 to true (expire this
    ** statement only). For DETACH, set it to false (expire all existing
    ** statements).
@@ -451,7 +467,7 @@ void sqlite3FixInit(
  pFix->pSchema = db->aDb[iDb].pSchema;
  pFix->zType = zType;
  pFix->pName = pName;
-  pFix->bTemp = (iDb==1);
+  pFix->bVarOnly = (iDb==1);
 }

 /*
@@ -473,24 +489,22 @@ int sqlite3FixSrcList(
  SrcList *pList       /* The Source list to check and modify */
 ){
  int i;
+  const char *zDb;
  struct SrcList_item *pItem;
-  sqlite3 *db = pFix->pParse->db;
-  int iDb = sqlite3FindDbName(db, pFix->zDb);

  if( NEVER(pList==0) ) return 0;
-
+  zDb = pFix->zDb;
  for(i=0, pItem=pList->a; i<pList->nSrc; i++, pItem++){
-    if( pFix->bTemp==0 ){
-      if( pItem->zDatabase && iDb!=sqlite3FindDbName(db, pItem->zDatabase) ){
+    if( pFix->bVarOnly==0 ){
+      if( pItem->zDatabase && sqlite3StrICmp(pItem->zDatabase, zDb) ){
        sqlite3ErrorMsg(pFix->pParse,
            "%s %T cannot reference objects in database %s",
            pFix->zType, pFix->pName, pItem->zDatabase);
        return 1;
      }
-      sqlite3DbFree(db, pItem->zDatabase);
+      sqlite3DbFree(pFix->pParse->db, pItem->zDatabase);
      pItem->zDatabase = 0;
      pItem->pSchema = pFix->pSchema;
-      pItem->fg.fromDDL = 1;
    }
 #if !defined(SQLITE_OMIT_VIEW) || !defined(SQLITE_OMIT_TRIGGER)
    if( sqlite3FixSelect(pFix, pItem->pSelect) ) return 1;
@@ -546,7 +560,6 @@ int sqlite3FixExpr(
  Expr *pExpr        /* The expression to be fixed to one database */
 ){
  while( pExpr ){
-    if( !pFix->bTemp ) ExprSetProperty(pExpr, EP_FromDDL);
    if( pExpr->op==TK_VARIABLE ){
      if( pFix->pParse->db->init.busy ){
        pExpr->op = TK_NULL;
@@ -235,6 +235,13 @@ static int backupOnePage(
  int nDestPgsz = sqlite3BtreeGetPageSize(p->pDest);
  const int nCopy = MIN(nSrcPgsz, nDestPgsz);
  const i64 iEnd = (i64)iSrcPg*(i64)nSrcPgsz;
+#ifdef SQLITE_HAS_CODEC
+  /* Use BtreeGetReserveNoMutex() for the source b-tree, as although it is
+  ** guaranteed that the shared-mutex is held by this thread, handle
+  ** p->pSrc may not actually be the owner.  */
+  int nSrcReserve = sqlite3BtreeGetReserveNoMutex(p->pSrc);
+  int nDestReserve = sqlite3BtreeGetOptimalReserve(p->pDest);
+#endif
  int rc = SQLITE_OK;
  i64 iOff;

@@ -251,6 +258,26 @@ static int backupOnePage(
    rc = SQLITE_READONLY;
  }

+#ifdef SQLITE_HAS_CODEC
+  /* Backup is not possible if the page size of the destination is changing
+  ** and a codec is in use.
+  */
+  if( nSrcPgsz!=nDestPgsz && sqlite3PagerGetCodec(pDestPager)!=0 ){
+    rc = SQLITE_READONLY;
+  }
+
+  /* Backup is not possible if the number of bytes of reserve space differ
+  ** between source and destination.  If there is a difference, try to
+  ** fix the destination to agree with the source.  If that is not possible,
+  ** then the backup cannot proceed.
+  */
+  if( nSrcReserve!=nDestReserve ){
+    u32 newPgsz = nSrcPgsz;
+    rc = sqlite3PagerSetPagesize(pDestPager, &newPgsz, nSrcReserve);
+    if( rc==SQLITE_OK && newPgsz!=(u32)nSrcPgsz ) rc = SQLITE_READONLY;
+  }
+#endif
+
  /* This loop runs once for each destination page spanned by the source 
  ** page. For each iteration, variable iOff is set to the byte offset
  ** of the destination page.
@@ -746,6 +773,10 @@ int sqlite3BtreeCopyFile(Btree *pTo, Btree *pFrom){
  b.pDest = pTo;
  b.iNext = 1;

+#ifdef SQLITE_HAS_CODEC
+  sqlite3PagerAlignReserve(sqlite3BtreePager(pTo), sqlite3BtreePager(pFrom));
+#endif
+
  /* 0x7FFFFFFF is the hard limit for the number of pages in a database
  ** file. By passing this as the number of pages to copy to
  ** sqlite3_backup_step(), we can guarantee that the copy finishes 
@@ -611,7 +611,7 @@ static int btreeSetHasContent(BtShared *pBt, Pgno pgno){
 */
 static int btreeGetHasContent(BtShared *pBt, Pgno pgno){
  Bitvec *p = pBt->pHasContent;
-  return p && (pgno>sqlite3BitvecSize(p) || sqlite3BitvecTestNotNull(p, pgno));
+  return (p && (pgno>sqlite3BitvecSize(p) || sqlite3BitvecTest(p, pgno)));
 }

 /*
@@ -699,9 +699,6 @@ static int saveCursorPosition(BtCursor *pCur){
  assert( 0==pCur->pKey );
  assert( cursorHoldsMutex(pCur) );

-  if( pCur->curFlags & BTCF_Pinned ){
-    return SQLITE_CONSTRAINT_PINNED;
-  }
  if( pCur->eState==CURSOR_SKIPNEXT ){
    pCur->eState = CURSOR_VALID;
  }else{
@@ -1458,7 +1455,7 @@ static int defragmentPage(MemPage *pPage, int nMaxFrag){
          if( iFree2+sz2 > usableSize ) return SQLITE_CORRUPT_PAGE(pPage);
          memmove(&data[iFree+sz+sz2], &data[iFree+sz], iFree2-(iFree+sz));
          sz += sz2;
-        }else if( NEVER(iFree+sz>usableSize) ){
+        }else if( iFree+sz>usableSize ){
          return SQLITE_CORRUPT_PAGE(pPage);
        }

@@ -1650,10 +1647,8 @@ static int allocateSpace(MemPage *pPage, int nByte, int *pIdx){
  if( (data[hdr+2] || data[hdr+1]) && gap+2<=top ){
    u8 *pSpace = pageFindSlot(pPage, nByte, &rc);
    if( pSpace ){
-      int g2;
      assert( pSpace+nByte<=data+pPage->pBt->usableSize );
-      *pIdx = g2 = (int)(pSpace-data);
-      if( NEVER(g2<=gap) ){
+      if( (*pIdx = (int)(pSpace-data))<=gap ){
        return SQLITE_CORRUPT_PAGE(pPage);
      }else{
        return SQLITE_OK;
@@ -1731,12 +1726,12 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
  }else{
    while( (iFreeBlk = get2byte(&data[iPtr]))<iStart ){
      if( iFreeBlk<iPtr+4 ){
-        if( iFreeBlk==0 ) break; /* TH3: corrupt082.100 */
+        if( iFreeBlk==0 ) break;
        return SQLITE_CORRUPT_PAGE(pPage);
      }
      iPtr = iFreeBlk;
    }
-    if( iFreeBlk>pPage->pBt->usableSize-4 ){ /* TH3: corrupt081.100 */
+    if( iFreeBlk>pPage->pBt->usableSize-4 ){
      return SQLITE_CORRUPT_PAGE(pPage);
    }
    assert( iFreeBlk>iPtr || iFreeBlk==0 );
@@ -1751,7 +1746,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
      nFrag = iFreeBlk - iEnd;
      if( iEnd>iFreeBlk ) return SQLITE_CORRUPT_PAGE(pPage);
      iEnd = iFreeBlk + get2byte(&data[iFreeBlk+2]);
-      if( NEVER(iEnd > pPage->pBt->usableSize) ){
+      if( iEnd > pPage->pBt->usableSize ){
        return SQLITE_CORRUPT_PAGE(pPage);
      }
      iSize = iEnd - iStart;
@@ -1779,8 +1774,7 @@ static int freeSpace(MemPage *pPage, u16 iStart, u16 iSize){
    /* The new freeblock is at the beginning of the cell content area,
    ** so just extend the cell content area rather than create another
    ** freelist entry */
-    if( iStart<x ) return SQLITE_CORRUPT_PAGE(pPage);
-    if( iPtr!=hdr+1 ) return SQLITE_CORRUPT_PAGE(pPage);
+    if( iStart<x || iPtr!=hdr+1 ) return SQLITE_CORRUPT_PAGE(pPage);
    put2byte(&data[hdr+1], iFreeBlk);
    put2byte(&data[hdr+5], iEnd);
  }else{
@@ -1900,7 +1894,7 @@ static int btreeComputeFreeSpace(MemPage *pPage){
  nFree = data[hdr+7] + top;  /* Init nFree to non-freeblock free space */
  if( pc>0 ){
    u32 next, size;
-    if( pc<top ){
+    if( pc<iCellFirst ){
      /* EVIDENCE-OF: R-55530-52930 In a well-formed b-tree page, there will
      ** always be at least one cell before the first freeblock.
      */
@@ -2137,12 +2131,12 @@ static MemPage *btreePageLookup(BtShared *pBt, Pgno pgno){
 ** error, return ((unsigned int)-1).
 */
 static Pgno btreePagecount(BtShared *pBt){
-  assert( (pBt->nPage & 0x80000000)==0 || CORRUPT_DB );
  return pBt->nPage;
 }
 u32 sqlite3BtreeLastPage(Btree *p){
  assert( sqlite3BtreeHoldsMutex(p) );
-  return btreePagecount(p->pBt) & 0x7fffffff;
+  assert( ((p->pBt->nPage)&0x80000000)==0 );
+  return btreePagecount(p->pBt);
 }

 /*
@@ -2409,13 +2403,9 @@ int sqlite3BtreeOpen(
        rc = sqlite3OsFullPathname(pVfs, zFilename,
                                   nFullPathname, zFullPathname);
        if( rc ){
-          if( rc==SQLITE_OK_SYMLINK ){
-            rc = SQLITE_OK;
-          }else{
-            sqlite3_free(zFullPathname);
-            sqlite3_free(p);
-            return rc;
-          }
+          sqlite3_free(zFullPathname);
+          sqlite3_free(p);
+          return rc;
        }
      }
 #if SQLITE_THREADSAFE
@@ -2857,11 +2847,11 @@ int sqlite3BtreeSetPagerFlags(
 int sqlite3BtreeSetPageSize(Btree *p, int pageSize, int nReserve, int iFix){
  int rc = SQLITE_OK;
  BtShared *pBt = p->pBt;
-  assert( nReserve>=-1 && nReserve<=254 );
+  assert( nReserve>=-1 && nReserve<=255 );
  sqlite3BtreeEnter(p);
-  if( nReserve>=0 ){
-    pBt->nReserveWanted = nReserve + 1;
-  }
+#if SQLITE_HAS_CODEC
+  if( nReserve>pBt->optimalReserve ) pBt->optimalReserve = (u8)nReserve;
+#endif
  if( pBt->btsFlags & BTS_PAGESIZE_FIXED ){
    sqlite3BtreeLeave(p);
    return SQLITE_READONLY;
@@ -2914,15 +2904,17 @@ int sqlite3BtreeGetReserveNoMutex(Btree *p){
 ** are intentually left unused.  This is the "reserved" space that is
 ** sometimes used by extensions.
 **
-** The value returned is the larger of the current reserve size and
-** the latest reserve size requested by SQLITE_FILECTRL_RESERVE_BYTES.
-** The amount of reserve can only grow - never shrink.
+** If SQLITE_HAS_MUTEX is defined then the number returned is the
+** greater of the current reserved space and the maximum requested
+** reserve space.
 */
-int sqlite3BtreeGetRequestedReserve(Btree *p){
+int sqlite3BtreeGetOptimalReserve(Btree *p){
  int n;
  sqlite3BtreeEnter(p);
-  n = ((int)p->pBt->nReserveWanted) - 1;
-  if( n<0 ) n = sqlite3BtreeGetReserveNoMutex(p);
+  n = sqlite3BtreeGetReserveNoMutex(p);
+#ifdef SQLITE_HAS_CODEC
+  if( n<p->pBt->optimalReserve ) n = p->pBt->optimalReserve;
+#endif
  sqlite3BtreeLeave(p);
  return n;
 }
@@ -4373,9 +4365,8 @@ static int btreeCursor(
  /* The following assert statements verify that if this is a sharable 
  ** b-tree database, the connection is holding the required table locks, 
  ** and that no other connection has any open cursor that conflicts with 
-  ** this lock.  The iTable<1 term disables the check for corrupt schemas. */
-  assert( hasSharedCacheTableLock(p, iTable, pKeyInfo!=0, (wrFlag?2:1))
-          || iTable<1 );
+  ** this lock.  */
+  assert( hasSharedCacheTableLock(p, iTable, pKeyInfo!=0, (wrFlag?2:1)) );
  assert( wrFlag==0 || !hasReadConflicts(p, iTable) );

  /* Assert that the caller has opened the required transaction. */
@@ -4388,13 +4379,9 @@ static int btreeCursor(
    allocateTempSpace(pBt);
    if( pBt->pTmpSpace==0 ) return SQLITE_NOMEM_BKPT;
  }
-  if( iTable<=1 ){
-    if( iTable<1 ){
-      return SQLITE_CORRUPT_BKPT;
-    }else if( btreePagecount(pBt)==0 ){
-      assert( wrFlag==0 );
-      iTable = 0;
-    }
+  if( iTable==1 && btreePagecount(pBt)==0 ){
+    assert( wrFlag==0 );
+    iTable = 0;
  }

  /* Now that no other errors can occur, finish filling in the BtCursor
@@ -4419,19 +4406,6 @@ static int btreeCursor(
  pCur->eState = CURSOR_INVALID;
  return SQLITE_OK;
 }
-static int btreeCursorWithLock(
-  Btree *p,                              /* The btree */
-  int iTable,                            /* Root page of table to open */
-  int wrFlag,                            /* 1 to write. 0 read-only */
-  struct KeyInfo *pKeyInfo,              /* First arg to comparison function */
-  BtCursor *pCur                         /* Space for new cursor */
-){
-  int rc;
-  sqlite3BtreeEnter(p);
-  rc = btreeCursor(p, iTable, wrFlag, pKeyInfo, pCur);
-  sqlite3BtreeLeave(p);
-  return rc;
-}
 int sqlite3BtreeCursor(
  Btree *p,                                   /* The btree */
  int iTable,                                 /* Root page of table to open */
@@ -4439,11 +4413,15 @@ int sqlite3BtreeCursor(
  struct KeyInfo *pKeyInfo,                   /* First arg to xCompare() */
  BtCursor *pCur                              /* Write new cursor here */
 ){
-  if( p->sharable ){
-    return btreeCursorWithLock(p, iTable, wrFlag, pKeyInfo, pCur);
+  int rc;
+  if( iTable<1 ){
+    rc = SQLITE_CORRUPT_BKPT;
  }else{
-    return btreeCursor(p, iTable, wrFlag, pKeyInfo, pCur);
+    sqlite3BtreeEnter(p);
+    rc = btreeCursor(p, iTable, wrFlag, pKeyInfo, pCur);
+    sqlite3BtreeLeave(p);
  }
+  return rc;
 }

 /*
@@ -4566,18 +4544,6 @@ i64 sqlite3BtreeIntegerKey(BtCursor *pCur){
  return pCur->info.nKey;
 }

-/*
-** Pin or unpin a cursor.
-*/
-void sqlite3BtreeCursorPin(BtCursor *pCur){
-  assert( (pCur->curFlags & BTCF_Pinned)==0 );
-  pCur->curFlags |= BTCF_Pinned;
-}
-void sqlite3BtreeCursorUnpin(BtCursor *pCur){
-  assert( (pCur->curFlags & BTCF_Pinned)!=0 );
-  pCur->curFlags &= ~BTCF_Pinned;
-}
-
 #ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
 /*
 ** Return the offset into the database file for the start of the
@@ -4913,7 +4879,6 @@ static int accessPayload(
          assert( aWrite>=pBufStart );                         /* due to (6) */
          memcpy(aSave, aWrite, 4);
          rc = sqlite3OsRead(fd, aWrite, a+4, (i64)pBt->pageSize*(nextPage-1));
-          if( rc && nextPage>pBt->nPage ) rc = SQLITE_CORRUPT_BKPT;
          nextPage = get4byte(aWrite);
          memcpy(aWrite, aSave, 4);
        }else
@@ -5734,11 +5699,8 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){
  ** to be invalid here. This can only occur if a second cursor modifies
  ** the page while cursor pCur is holding a reference to it. Which can
  ** only happen if the database is corrupt in such a way as to link the
-  ** page into more than one b-tree structure.
-  **
-  ** Update 2019-12-23: appears to long longer be possible after the
-  ** addition of anotherValidCursor() condition on balance_deeper().  */
-  harmless( idx>pPage->nCell );
+  ** page into more than one b-tree structure. */
+  testcase( idx>pPage->nCell );

  if( idx>=pPage->nCell ){
    if( !pPage->leaf ){
@@ -6937,7 +6899,7 @@ static int rebuildPage(

  assert( i<iEnd );
  j = get2byte(&aData[hdr+5]);
-  if( NEVER(j>(u32)usableSize) ){ j = 0; }
+  if( j>(u32)usableSize ){ j = 0; }
  memcpy(&pTmp[j], &aData[j], usableSize - j);

  for(k=0; pCArray->ixNx[k]<=i && ALWAYS(k<NB*2); k++){}
@@ -6963,7 +6925,7 @@ static int rebuildPage(
    if( pData < pCellptr ) return SQLITE_CORRUPT_BKPT;
    memcpy(pData, pCell, sz);
    assert( sz==pPg->xCellSize(pPg, pCell) || CORRUPT_DB );
-    testcase( sz!=pPg->xCellSize(pPg,pCell) )
+    testcase( sz!=pPg->xCellSize(pPg,pCell) );
    i++;
    if( i>=iEnd ) break;
    if( pCArray->ixNx[k]<=i ){
@@ -7029,8 +6991,7 @@ static int pageInsertArray(
  while( 1 /*Exit by break*/ ){
    int sz, rc;
    u8 *pSlot;
-    assert( pCArray->szCell[i]!=0 );
-    sz = pCArray->szCell[i];
+    sz = cachedCellSize(pCArray, i);
    if( (aData[1]==0 && aData[2]==0) || (pSlot = pageFindSlot(pPg,sz,&rc))==0 ){
      if( (pData - pBegin)<sz ) return 1;
      pData -= sz;
@@ -7191,7 +7152,6 @@ static int editPage(
        memmove(&pCellptr[2], pCellptr, (nCell - iCell) * 2);
      }
      nCell++;
-      cachedCellSize(pCArray, iCell+iNew);
      if( pageInsertArray(
            pPg, pBegin, &pData, pCellptr,
            iCell+iNew, 1, pCArray
@@ -7714,7 +7674,7 @@ static int balance_nonroot(
    */
    memset(&b.szCell[b.nCell], 0, sizeof(b.szCell[0])*(limit+pOld->nOverflow));
    if( pOld->nOverflow>0 ){
-      if( NEVER(limit<pOld->aiOvfl[0]) ){
+      if( limit<pOld->aiOvfl[0] ){
        rc = SQLITE_CORRUPT_BKPT;
        goto balance_cleanup;
      }
@@ -8327,30 +8287,6 @@ static int balance_deeper(MemPage *pRoot, MemPage **ppChild){
  return SQLITE_OK;
 }

-/*
-** Return SQLITE_CORRUPT if any cursor other than pCur is currently valid
-** on the same B-tree as pCur.
-**
-** This can if a database is corrupt with two or more SQL tables
-** pointing to the same b-tree.  If an insert occurs on one SQL table
-** and causes a BEFORE TRIGGER to do a secondary insert on the other SQL
-** table linked to the same b-tree.  If the secondary insert causes a
-** rebalance, that can change content out from under the cursor on the
-** first SQL table, violating invariants on the first insert.
-*/
-static int anotherValidCursor(BtCursor *pCur){
-  BtCursor *pOther;
-  for(pOther=pCur->pBt->pCursor; pOther; pOther=pOther->pNext){
-    if( pOther!=pCur
-     && pOther->eState==CURSOR_VALID
-     && pOther->pPage==pCur->pPage
-    ){
-      return SQLITE_CORRUPT_BKPT;
-    }
-  }
-  return SQLITE_OK;
-}
-
 /*
 ** The page that pCur currently points to has just been modified in
 ** some way. This function figures out if this modification means the
@@ -8378,7 +8314,7 @@ static int balance(BtCursor *pCur){
    if( pPage->nOverflow==0 && pPage->nFree<=nMin ){
      break;
    }else if( (iPage = pCur->iPage)==0 ){
-      if( pPage->nOverflow && (rc = anotherValidCursor(pCur))==SQLITE_OK ){
+      if( pPage->nOverflow ){
        /* The root page of the b-tree is overfull. In this case call the
        ** balance_deeper() function to create a new child for the root-page
        ** and copy the current contents of the root-page to it. The
@@ -8539,9 +8475,7 @@ static int btreeOverwriteCell(BtCursor *pCur, const BtreePayload *pX){
  Pgno ovflPgno;                      /* Next overflow page to write */
  u32 ovflPageSize;                   /* Size to write on overflow page */

-  if( pCur->info.pPayload + pCur->info.nLocal > pPage->aDataEnd
-   || pCur->info.pPayload < pPage->aData + pPage->cellOffset
-  ){
+  if( pCur->info.pPayload + pCur->info.nLocal > pPage->aDataEnd ){
    return SQLITE_CORRUPT_BKPT;
  }
  /* Overwrite the local portion first */
@@ -8674,6 +8608,7 @@ int sqlite3BtreeInsert(
    if( flags & BTREE_SAVEPOSITION ){
      assert( pCur->curFlags & BTCF_ValidNKey );
      assert( pX->nKey==pCur->info.nKey );
+      assert( pCur->info.nSize!=0 );
      assert( loc==0 );
    }
 #endif
@@ -8748,9 +8683,7 @@ int sqlite3BtreeInsert(
    }

  }
-  assert( pCur->eState==CURSOR_VALID 
-       || (pCur->eState==CURSOR_INVALID && loc)
-       || CORRUPT_DB );
+  assert( pCur->eState==CURSOR_VALID || (pCur->eState==CURSOR_INVALID && loc) );

  pPage = pCur->pPage;
  assert( pPage->intKey || pX->nKey>=0 );
@@ -8783,8 +8716,6 @@ int sqlite3BtreeInsert(
      memcpy(newCell, oldCell, 4);
    }
    rc = clearCell(pPage, oldCell, &info);
-    testcase( pCur->curFlags & BTCF_ValidOvfl );
-    invalidateOverflowCache(pCur);
    if( info.nSize==szNew && info.nLocal==info.nPayload 
     && (!ISAUTOVACUUM || szNew<pPage->minLocal)
    ){
@@ -9521,7 +9452,7 @@ int sqlite3BtreeUpdateMeta(Btree *p, int idx, u32 iMeta){
 ** Otherwise, if an error is encountered (i.e. an IO error or database
 ** corruption) an SQLite error code is returned.
 */
-int sqlite3BtreeCount(sqlite3 *db, BtCursor *pCur, i64 *pnEntry){
+int sqlite3BtreeCount(BtCursor *pCur, i64 *pnEntry){
  i64 nEntry = 0;                      /* Value to return in *pnEntry */
  int rc;                              /* Return code */

@@ -9534,7 +9465,7 @@ int sqlite3BtreeCount(sqlite3 *db, BtCursor *pCur, i64 *pnEntry){
  /* Unless an error occurs, the following loop runs one iteration for each
  ** page in the B-Tree structure (not including overflow pages). 
  */
-  while( rc==SQLITE_OK && !AtomicLoad(&db->u1.isInterrupted) ){
+  while( rc==SQLITE_OK ){
    int iIdx;                          /* Index of child node in parent */
    MemPage *pPage;                    /* Current page of the b-tree */

@@ -9660,7 +9591,6 @@ static int checkRef(IntegrityCk *pCheck, Pgno iPage){
    checkAppendMsg(pCheck, "2nd reference to page %d", iPage);
    return 1;
  }
-  if( AtomicLoad(&pCheck->db->u1.isInterrupted) ) return 1;
  setPageReferenced(pCheck, iPage);
  return 0;
 }
@@ -10104,7 +10034,6 @@ end_of_check:
 ** returned.  If a memory allocation error occurs, NULL is returned.
 */
 char *sqlite3BtreeIntegrityCheck(
-  sqlite3 *db,  /* Database connection that is running the check */
  Btree *p,     /* The btree to be checked */
  int *aRoot,   /* An array of root pages numbers for individual trees */
  int nRoot,    /* Number of entries in aRoot[] */
@@ -10122,7 +10051,6 @@ char *sqlite3BtreeIntegrityCheck(
  assert( p->inTrans>TRANS_NONE && pBt->inTransaction>TRANS_NONE );
  VVA_ONLY( nRef = sqlite3PagerRefcount(pBt->pPager) );
  assert( nRef>=0 );
-  sCheck.db = db;
  sCheck.pBt = pBt;
  sCheck.pPager = pBt->pPager;
  sCheck.nPage = btreePagecount(sCheck.pBt);
@@ -74,7 +74,7 @@ int sqlite3BtreeGetPageSize(Btree*);
 int sqlite3BtreeMaxPageCount(Btree*,int);
 u32 sqlite3BtreeLastPage(Btree*);
 int sqlite3BtreeSecureDelete(Btree*,int);
-int sqlite3BtreeGetRequestedReserve(Btree*);
+int sqlite3BtreeGetOptimalReserve(Btree*);
 int sqlite3BtreeGetReserveNoMutex(Btree *p);
 int sqlite3BtreeSetAutoVacuum(Btree *, int);
 int sqlite3BtreeGetAutoVacuum(Btree *);
@@ -306,8 +306,6 @@ int sqlite3BtreeNext(BtCursor*, int flags);
 int sqlite3BtreeEof(BtCursor*);
 int sqlite3BtreePrevious(BtCursor*, int flags);
 i64 sqlite3BtreeIntegerKey(BtCursor*);
-void sqlite3BtreeCursorPin(BtCursor*);
-void sqlite3BtreeCursorUnpin(BtCursor*);
 #ifdef SQLITE_ENABLE_OFFSET_SQL_FUNC
 i64 sqlite3BtreeOffset(BtCursor*);
 #endif
@@ -316,7 +314,7 @@ const void *sqlite3BtreePayloadFetch(BtCursor*, u32 *pAmt);
 u32 sqlite3BtreePayloadSize(BtCursor*);
 sqlite3_int64 sqlite3BtreeMaxRecordSize(BtCursor*);

-char *sqlite3BtreeIntegrityCheck(sqlite3*,Btree*,int*aRoot,int nRoot,int,int*);
+char *sqlite3BtreeIntegrityCheck(Btree*, int *aRoot, int nRoot, int, int*);
 struct Pager *sqlite3BtreePager(Btree*);
 i64 sqlite3BtreeRowCountEst(BtCursor*);

@@ -337,7 +335,7 @@ int sqlite3BtreeCursorIsValid(BtCursor*);
 int sqlite3BtreeCursorIsValidNN(BtCursor*);

 #ifndef SQLITE_OMIT_BTREECOUNT
-int sqlite3BtreeCount(sqlite3*, BtCursor*, i64*);
+int sqlite3BtreeCount(BtCursor *, i64 *);
 #endif

 #ifdef SQLITE_TEST
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
drh	e7b4f4888f	Fix the build for compilation using separate files rather than the amalgamation. FossilOrigin-Name: 1e0f4869dedabec03b6eafeffa5ed3e43b70f2ca5b27816bb8a56dba7b5fd94f	2019-08-12 15:37:28 +00:00
drh	ee1eaeaaad	Make the sha3 extension part of the amalgamation, enabled using SQLITE_ENABLE_SHA3. FossilOrigin-Name: a48a7b78597c1551fd4e29b9a733ab8c8a60ad82721b90d7f645987ca65cee6e	2019-08-12 15:19:24 +00:00
@@ -1 +1 @@
 .32.0
 .30.0