Ensure that the "push-down" optimization does not push constraints down into compound queries if any of the component queries uses window functions.

FossilOrigin-Name: 2011e83213284b9b5d88a084b35febf026b2276ac9e5f4d439cc22771064444a
ALWAYS() and NEVER() macros added due to unreachable branches arising
2020-06-05 14:53:15 +00:00 · 2020-06-05 14:25:45 +00:00 · 2020-06-05 14:10:23 +00:00
535 changed files with 11097 additions and 44837 deletions
@@ -165,7 +165,6 @@ LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
 ###############################################################################

 USE_AMALGAMATION = @USE_AMALGAMATION@
-AMALGAMATION_LINE_MACROS = @AMALGAMATION_LINE_MACROS@

 # Object files for the SQLite library (non-amalgamation).
 #
@@ -433,7 +432,7 @@ TESTSRC = \
  $(TOP)/ext/fts3/fts3_term.c \
  $(TOP)/ext/fts3/fts3_test.c  \
  $(TOP)/ext/session/test_session.c \
-  $(TOP)/ext/rbu/test_rbu.c 
+  $(TOP)/ext/rbu/test_rbu.c

 # Statically linked extensions
 #
@@ -441,12 +440,9 @@ TESTSRC += \
  $(TOP)/ext/expert/sqlite3expert.c \
  $(TOP)/ext/expert/test_expert.c \
  $(TOP)/ext/misc/amatch.c \
-  $(TOP)/ext/misc/appendvfs.c \
  $(TOP)/ext/misc/carray.c \
-  $(TOP)/ext/misc/cksumvfs.c \
  $(TOP)/ext/misc/closure.c \
  $(TOP)/ext/misc/csv.c \
-  $(TOP)/ext/misc/decimal.c \
  $(TOP)/ext/misc/eval.c \
  $(TOP)/ext/misc/explain.c \
  $(TOP)/ext/misc/fileio.c \
@@ -468,8 +464,7 @@ TESTSRC += \
  $(TOP)/ext/misc/unionvtab.c \
  $(TOP)/ext/misc/wholenumber.c \
  $(TOP)/ext/misc/zipfile.c \
-  $(TOP)/ext/userauth/userauth.c \
-  $(TOP)/ext/rtree/test_rtreedoc.c
+  $(TOP)/ext/userauth/userauth.c

 # Source code to the library files needed by the test fixture
 #
@@ -523,8 +518,7 @@ TESTSRC2 = \
  $(TOP)/ext/fts3/fts3_write.c \
  $(TOP)/ext/async/sqlite3async.c \
  $(TOP)/ext/session/sqlite3session.c \
-  $(TOP)/ext/misc/stmt.c \
-  fts5.c
+  $(TOP)/ext/misc/stmt.c

 # Header files used by all library source files.
 #
@@ -618,13 +612,15 @@ 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
 FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
 FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
 FUZZCHECK_OPT += -DSQLITE_PRINTF_PRECISION_LIMIT=1000
+FUZZCHECK_OPT += -DSQLITE_ENABLE_DESERIALIZE
 FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS4
 FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS3_PARENTHESIS
-FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
+#FUZZCHECK_OPT += -DSQLITE_ENABLE_FTS5
 FUZZCHECK_OPT += -DSQLITE_ENABLE_RTREE
 FUZZCHECK_OPT += -DSQLITE_ENABLE_GEOPOLY
 FUZZCHECK_OPT += -DSQLITE_ENABLE_DBSTAT_VTAB
@@ -695,6 +691,7 @@ dbfuzz$(TEXE):	$(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
 DBFUZZ2_OPTS = \
  -DSQLITE_THREADSAFE=0 \
  -DSQLITE_OMIT_LOAD_EXTENSION \
+  -DSQLITE_ENABLE_DESERIALIZE \
  -DSQLITE_DEBUG \
  -DSQLITE_ENABLE_DBSTAT_VTAB \
  -DSQLITE_ENABLE_BYTECODE_VTAB \
@@ -758,7 +755,7 @@ mptest:	mptester$(TEXE)
 	touch .target_source

 sqlite3.c:	.target_source $(TOP)/tool/mksqlite3c.tcl
-	$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_LINE_MACROS)
+	$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
 	cp tsrc/sqlite3ext.h .
 	cp $(TOP)/ext/session/sqlite3session.h .

@@ -1070,12 +1067,6 @@ parse.c:	$(TOP)/src/parse.y lemon$(BEXE)
 sqlite3.h:	$(TOP)/src/sqlite.h.in $(TOP)/manifest mksourceid$(BEXE) $(TOP)/VERSION
 	$(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h

-sqlite3rc.h:	$(TOP)/src/sqlite3.rc $(TOP)/VERSION
-	echo '#ifndef SQLITE_RESOURCE_VERSION' >$@
-	echo -n '#define SQLITE_RESOURCE_VERSION ' >>$@
-	cat $(TOP)/VERSION | $(TCLSH_CMD) $(TOP)/tool/replace.tcl exact . , >>$@
-	echo '#endif' >>sqlite3rc.h
-
 keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
 	$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
 	./mkkeywordhash$(BEXE) >keywordhash.h
@@ -1084,13 +1075,9 @@ keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
 SHELL_SRC = \
 	$(TOP)/src/shell.c.in \
        $(TOP)/ext/misc/appendvfs.c \
-	$(TOP)/ext/misc/completion.c \
-        $(TOP)/ext/misc/decimal.c \
-	$(TOP)/ext/misc/fileio.c \
-        $(TOP)/ext/misc/ieee754.c \
-        $(TOP)/ext/misc/regexp.c \
-        $(TOP)/ext/misc/series.c \
 	$(TOP)/ext/misc/shathree.c \
+	$(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 \
@@ -1235,7 +1222,7 @@ 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_CKSUMVFS_STATIC
+TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE

 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 TESTFIXTURE_SRC1 = sqlite3.c
@@ -1251,10 +1238,7 @@ coretestprogs:	$(TESTPROGS)
 testprogs:	coretestprogs srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)

 # A very detailed test running most or all test cases
-fulltest:	alltest fuzztest
-
-# Run most or all tcl test cases
-alltest:	$(TESTPROGS)
+fulltest:	$(TESTPROGS) fuzztest
 	./testfixture$(TEXE) $(TOP)/test/all.test $(TESTOPTS)

 # Really really long testing
@@ -1271,7 +1255,7 @@ fuzztest:	fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) $(TOP)/test/sessionfuz
 	./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 $(FUZZDATA)
+	valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
 	valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db

 # The veryquick.test TCL tests.
@@ -1382,9 +1366,6 @@ wordcount$(TEXE):	$(TOP)/test/wordcount.c sqlite3.lo
 speedtest1$(TEXE):	$(TOP)/test/speedtest1.c sqlite3.c
 	$(LTLINK) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(TLIBS)

-startup$(TEXE):	$(TOP)/test/startup.c sqlite3.c
-	$(CC) -Os -g -DSQLITE_THREADSAFE=0 -o $@ $(TOP)/test/startup.c sqlite3.c $(TLIBS)
-
 KV_OPT += -DSQLITE_DIRECT_OVERFLOW_READ

 kvtest$(TEXE):	$(TOP)/test/kvtest.c sqlite3.c
@@ -1410,10 +1391,10 @@ checksymbols: sqlite3.o
 # a tarball named for the version number.  Ex:  sqlite-autoconf-3110000.tar.gz.
 # The snapshot-tarball target builds a tarball named by the SHA1 hash
 #
-amalgamation-tarball: sqlite3.c sqlite3rc.h
+amalgamation-tarball: sqlite3.c
 	TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --normal

-snapshot-tarball: sqlite3.c sqlite3rc.h
+snapshot-tarball: sqlite3.c
 	TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --snapshot

 # The next two rules are used to support the "threadtest" target. Building
@@ -1433,9 +1414,6 @@ threadtest3$(TEXE): sqlite3.lo $(THREADTEST3_SRC)
 threadtest: threadtest3$(TEXE)
 	./threadtest3$(TEXE)

-threadtest5: sqlite3.c $(TOP)/test/threadtest5.c
-	$(LTLINK) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(TLIBS)
-
 releasetest:
 	$(TCLSH_CMD) $(TOP)/test/releasetest.tcl

@@ -1489,7 +1467,6 @@ clean:
 	rm -f sqldiff sqldiff.exe
 	rm -f dbhash dbhash.exe
 	rm -f fts5.* fts5parse.*
-	rm -f threadtest5

 distclean:	clean
 	rm -f config.h config.log config.status libtool Makefile sqlite3.pc
@@ -235,9 +235,8 @@ DEBUG = 0
 !ENDIF

 # <<mark>>
-# By default, use --linemacros=1 argument to the mksqlite3c.tcl tool, which
-# is used to build the amalgamation. This can be turned off to ease debug
-# of the amalgamation away from the source tree.
+# Disable use of the --linemacros argument to the mksqlite3c.tcl tool, which
+# is used to build the amalgamation.
 #
 !IFNDEF NO_LINEMACROS
 NO_LINEMACROS = 0
@@ -368,6 +367,7 @@ 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_ENABLE_DESERIALIZE=1
 !ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF
@@ -380,9 +380,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
 !ENDIF

-# Always enable math functions on Windows
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MATH_FUNCTIONS
-
 # Should the rbu extension be enabled?  If so, add compilation options
 # to enable it.
 #
@@ -789,9 +786,9 @@ MKSQLITE3C_TOOL = $(TOP)\tool\mksqlite3c.tcl

 !IFNDEF MKSQLITE3C_ARGS
 !IF $(DEBUG)>1 && $(NO_LINEMACROS)==0
-MKSQLITE3C_ARGS = --linemacros=1
+MKSQLITE3C_ARGS = --linemacros
 !ELSE
-MKSQLITE3C_ARGS = --linemacros=0
+MKSQLITE3C_ARGS =
 !ENDIF
 !IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
 MKSQLITE3C_ARGS = $(MKSQLITE3C_ARGS) --useapicall
@@ -1552,7 +1549,7 @@ TESTSRC = \
  $(TOP)\ext\fts3\fts3_term.c \
  $(TOP)\ext\fts3\fts3_test.c \
  $(TOP)\ext\rbu\test_rbu.c \
-  $(TOP)\ext\session\test_session.c 
+  $(TOP)\ext\session\test_session.c

 # Statically linked extensions.
 #
@@ -1560,12 +1557,9 @@ TESTEXT = \
  $(TOP)\ext\expert\sqlite3expert.c \
  $(TOP)\ext\expert\test_expert.c \
  $(TOP)\ext\misc\amatch.c \
-  $(TOP)\ext\misc\appendvfs.c \
  $(TOP)\ext\misc\carray.c \
-  $(TOP)\ext\misc\cksumvfs.c \
  $(TOP)\ext\misc\closure.c \
  $(TOP)\ext\misc\csv.c \
-  $(TOP)\ext\misc\decimal.c \
  $(TOP)\ext\misc\eval.c \
  $(TOP)\ext\misc\explain.c \
  $(TOP)\ext\misc\fileio.c \
@@ -1585,9 +1579,7 @@ TESTEXT = \
  $(TOP)\ext\misc\spellfix.c \
  $(TOP)\ext\misc\totype.c \
  $(TOP)\ext\misc\unionvtab.c \
-  $(TOP)\ext\misc\wholenumber.c \
-  $(TOP)\ext\rtree\test_rtreedoc.c \
-  fts5.c
+  $(TOP)\ext\misc\wholenumber.c

 # If use of zlib is enabled, add the "zipfile.c" source file.
 #
@@ -1690,6 +1682,7 @@ FUZZDATA = \
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
 !ENDIF

 # <<mark>>
@@ -1698,8 +1691,8 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
 MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
 FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
 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_DESERIALIZE
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS4
-FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_FTS5
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_RTREE
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_GEOPOLY
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_ENABLE_DBSTAT_VTAB
@@ -2210,13 +2203,9 @@ keywordhash.h:	$(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
 SHELL_SRC = \
 	$(TOP)\src\shell.c.in \
 	$(TOP)\ext\misc\appendvfs.c \
-	$(TOP)\ext\misc\completion.c \
-	$(TOP)\ext\misc\decimal.c \
-	$(TOP)\ext\misc\fileio.c \
-	$(TOP)\ext\misc\ieee754.c \
-	$(TOP)\ext\misc\regexp.c \
-	$(TOP)\ext\misc\series.c \
 	$(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 \
@@ -2393,7 +2382,7 @@ 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_CKSUMVFS_STATIC=1
+TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)

 TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
@@ -2438,9 +2427,7 @@ coretestprogs:	$(TESTPROGS)

 testprogs:	coretestprogs srcck1.exe fuzzcheck.exe sessionfuzz.exe

-fulltest:	alltest fuzztest
-
-alltest:	$(TESTPROGS)
+fulltest:	$(TESTPROGS) fuzztest
 	@set PATH=$(LIBTCLPATH);$(PATH)
 	.\testfixture.exe $(TOP)\test\all.test $(TESTOPTS)

@@ -2590,17 +2577,6 @@ rbu.exe:	$(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C) $(SQLITE3H
 	$(LTLINK) $(NO_WARN) -DSQLITE_ENABLE_RBU \
 		$(TOP)\ext\rbu\rbu.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)

-THREADTEST3_SRC = \
-  $(TOP)\test\threadtest3.c \
-  $(TOP)\test\tt3_checkpoint.c \
-  $(TOP)\test\tt3_index.c \
-  $(TOP)\test\tt3_vacuum.c \
-  $(TOP)\test\tt3_stress.c \
-  $(TOP)\test\tt3_lookaside1.c
-
-threadtest3.exe: $(THREADTEST3_SRC) $(TOP)\src\test_multiplex.c $(SQLITE3C) $(SQLITE3H)
-	$(LTLINK) $(NO_WARN) $(TOP)\test\threadtest3.c $(TOP)\src\test_multiplex.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
-
 LSMDIR=$(TOP)\ext\lsm1
 !INCLUDE $(LSMDIR)\Makefile.msc

@@ -2638,7 +2614,7 @@ clean:
 	del /Q sqlite-*-output.vsix 2>NUL
 	del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe dbhash.exe 2>NUL
 	del /Q sqltclsh.* 2>NUL
-	del /Q dbfuzz.exe sessionfuzz.exe threadtest3.exe 2>NUL
+	del /Q dbfuzz.exe sessionfuzz.exe 2>NUL
 	del /Q kvtest.exe ossshell.exe scrub.exe 2>NUL
 	del /Q showshm.exe sqlite3_checker.* sqlite3_expert.exe 2>NUL
 	del /Q fts5.* fts5parse.* 2>NUL
@@ -55,11 +55,11 @@ a stand-alone program.  To install, simply download or build the single
 executable file and put that file someplace on your $PATH.)
 Then run commands like this:

-        mkdir -p ~/sqlite ~/Fossils
+        mkdir ~/sqlite
        cd ~/sqlite
-        fossil clone https://www.sqlite.org/src ~/Fossils/sqlite.fossil
-        fossil open ~/Fossils/sqlite.fossil
-
+        fossil clone https://www.sqlite.org/src sqlite.fossil
+        fossil open sqlite.fossil
+    
 After setting up a repository using the steps above, you can always
 update to the lastest version using:

@@ -68,7 +68,7 @@ update to the lastest version using:

 Or type "fossil ui" to get a web-based user interface.

-## Compiling for Unix-like systems
+## Compiling

 First create a directory in which to place
 the build products.  It is recommended, but not required, that the
@@ -94,22 +94,22 @@ script does not work out for you, there is a generic makefile named
 can copy and edit to suit your needs.  Comments on the generic makefile
 show what changes are needed.

-## Using MSVC for Windows systems
+## Using MSVC

 On Windows, all applicable build products can be compiled with MSVC.
 First open the command prompt window associated with the desired compiler
 version (e.g. "Developer Command Prompt for VS2013").  Next, use NMAKE
 with the provided "Makefile.msc" to build one of the supported targets.

-For example, from the parent directory of the source subtree named "sqlite":
+For example:

        mkdir bld
        cd bld
-        nmake /f ..\sqlite\Makefile.msc TOP=..\sqlite
-        nmake /f ..\sqlite\Makefile.msc sqlite3.c TOP=..\sqlite
-        nmake /f ..\sqlite\Makefile.msc sqlite3.dll TOP=..\sqlite
-        nmake /f ..\sqlite\Makefile.msc sqlite3.exe TOP=..\sqlite
-        nmake /f ..\sqlite\Makefile.msc test TOP=..\sqlite
+        nmake /f Makefile.msc TOP=..\sqlite
+        nmake /f Makefile.msc sqlite3.c TOP=..\sqlite
+        nmake /f Makefile.msc sqlite3.dll TOP=..\sqlite
+        nmake /f Makefile.msc sqlite3.exe TOP=..\sqlite
+        nmake /f Makefile.msc test TOP=..\sqlite

 There are several build options that can be set via the NMAKE command
 line.  For example, to build for WinRT, simply add "FOR_WINRT=1" argument
@@ -1 +1 @@
-3.37.0
+3.33.0
@@ -13,7 +13,7 @@ sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_D

 include_HEADERS = sqlite3.h sqlite3ext.h

-EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc sqlite3rc.h README.txt Replace.cs Makefile.fallback
+EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs Makefile.fallback
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = sqlite3.pc

@@ -290,6 +290,7 @@ 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_ENABLE_DESERIALIZE=1
 !ENDIF
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF
@@ -302,9 +303,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
 !ENDIF

-# Always enable math functions on Windows
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_MATH_FUNCTIONS
-
 # Should the rbu extension be enabled?  If so, add compilation options
 # to enable it.
 #
@@ -959,6 +957,7 @@ LIBRESOBJS =
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DESERIALIZE=1
 !ENDIF


@@ -87,9 +87,7 @@ AC_SUBST(READLINE_LIBS)
 AC_ARG_ENABLE(threadsafe, [AS_HELP_STRING(
  [--enable-threadsafe], [build a thread-safe library [default=yes]])], 
  [], [enable_threadsafe=yes])
-if test x"$enable_threadsafe" == "xno"; then
-  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_THREADSAFE=0"
-else
+if test x"$enable_threadsafe" != "xno"; then
  BUILD_CFLAGS="$BUILD_CFLAGS -D_REENTRANT=1 -DSQLITE_THREADSAFE=1"
  AC_SEARCH_LIBS(pthread_create, pthread)
  AC_SEARCH_LIBS(pthread_mutexattr_init, pthread)
@@ -111,34 +109,14 @@ AC_MSG_CHECKING([for whether to support dynamic extensions])
 AC_MSG_RESULT($enable_dynamic_extensions)
 #-----------------------------------------------------------------------

-#-----------------------------------------------------------------------
-#   --enable-math
-#
-AC_ARG_ENABLE(math, [AS_HELP_STRING(
-  [--enable-math], [SQL math functions [default=yes]])],
-  [], [enable_math=yes])
-AC_MSG_CHECKING([SQL math functions])
-if test x"$enable_math" = "xyes"; then
-  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_MATH_FUNCTIONS"
-  AC_MSG_RESULT([enabled])
-  AC_SEARCH_LIBS(ceil, m)
-else
-  AC_MSG_RESULT([disabled])
-fi
-#-----------------------------------------------------------------------
-
 #-----------------------------------------------------------------------
 #   --enable-fts4
 #
 AC_ARG_ENABLE(fts4, [AS_HELP_STRING(
  [--enable-fts4], [include fts4 support [default=yes]])], 
  [], [enable_fts4=yes])
-AC_MSG_CHECKING([FTS4 extension])
 if test x"$enable_fts4" = "xyes"; then
  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_FTS4"
-  AC_MSG_RESULT([enabled])
-else
-  AC_MSG_RESULT([disabled])
 fi
 #-----------------------------------------------------------------------

@@ -148,12 +126,8 @@ fi
 AC_ARG_ENABLE(fts3, [AS_HELP_STRING(
  [--enable-fts3], [include fts3 support [default=no]])], 
  [], [])
-AC_MSG_CHECKING([FTS3 extension])
 if test x"$enable_fts3" = "xyes" -a x"$enable_fts4" = "xno"; then
  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_FTS3"
-  AC_MSG_RESULT([enabled])
-else
-  AC_MSG_RESULT([disabled])
 fi
 #-----------------------------------------------------------------------

@@ -163,13 +137,9 @@ fi
 AC_ARG_ENABLE(fts5, [AS_HELP_STRING(
  [--enable-fts5], [include fts5 support [default=yes]])], 
  [], [enable_fts5=yes])
-AC_MSG_CHECKING([FTS5 extension])
 if test x"$enable_fts5" = "xyes"; then
-  AC_MSG_RESULT([enabled])
  AC_SEARCH_LIBS(log, m)
  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_FTS5"
-else
-  AC_MSG_RESULT([disabled])
 fi
 #-----------------------------------------------------------------------

@@ -179,12 +149,8 @@ fi
 AC_ARG_ENABLE(json1, [AS_HELP_STRING(
  [--enable-json1], [include json1 support [default=yes]])], 
  [],[enable_json1=yes])
-AC_MSG_CHECKING([JSON functions])
 if test x"$enable_json1" = "xyes"; then
  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_JSON1"
-  AC_MSG_RESULT([enabled])
-else
-  AC_MSG_RESULT([disabled])
 fi
 #-----------------------------------------------------------------------

@@ -194,12 +160,8 @@ fi
 AC_ARG_ENABLE(rtree, [AS_HELP_STRING(
  [--enable-rtree], [include rtree support [default=yes]])], 
  [], [enable_rtree=yes])
-AC_MSG_CHECKING([RTREE extension])
 if test x"$enable_rtree" = "xyes"; then
  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY"
-  AC_MSG_RESULT([enabled])
-else
-  AC_MSG_RESULT([disabled])
 fi
 #-----------------------------------------------------------------------

@@ -209,12 +171,8 @@ fi
 AC_ARG_ENABLE(session, [AS_HELP_STRING(
  [--enable-session], [enable the session extension [default=no]])], 
  [], [])
-AC_MSG_CHECKING([Session extension])
 if test x"$enable_session" = "xyes"; then
  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_ENABLE_SESSION -DSQLITE_ENABLE_PREUPDATE_HOOK"
-  AC_MSG_RESULT([enabled])
-else
-  AC_MSG_RESULT([disabled])
 fi
 #-----------------------------------------------------------------------

@@ -224,13 +182,9 @@ fi
 AC_ARG_ENABLE(debug, [AS_HELP_STRING(
  [--enable-debug], [build with debugging features enabled [default=no]])], 
  [], [])
-AC_MSG_CHECKING([Build type])
 if test x"$enable_debug" = "xyes"; then
  BUILD_CFLAGS="$BUILD_CFLAGS -DSQLITE_DEBUG -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE"
  CFLAGS="-g -O0"
-  AC_MSG_RESULT([debug])
-else
-  AC_MSG_RESULT([release])
 fi
 #-----------------------------------------------------------------------

@@ -153,7 +153,7 @@ Please `cd` to its location first.
 #
 #-------------------------------------------------------------------------

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

 # nmakehelp -V <file> <tag> will search the file for tag, skips until a
@@ -14,10 +14,13 @@

 #define _CRT_SECURE_NO_DEPRECATE
 #include <windows.h>
-#ifdef _MSC_VER
+#define NO_SHLWAPI_GDI
+#define NO_SHLWAPI_STREAM
+#define NO_SHLWAPI_REG
+#include <shlwapi.h>
 #pragma comment (lib, "user32.lib")
 #pragma comment (lib, "kernel32.lib")
-#endif
+#pragma comment (lib, "shlwapi.lib")
 #include <stdio.h>
 #include <math.h>

@@ -36,15 +39,15 @@
 #endif


+
 /* protos */

 static int CheckForCompilerFeature(const char *option);
-static int CheckForLinkerFeature(char **options, int count);
+static int CheckForLinkerFeature(const char *option);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
-static int LocateDependency(const char *keyfile);
-static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
+static const char *GetVersionFromFile(const char *filename, const char *match);
 static DWORD WINAPI ReadFromPipe(LPVOID args);

 /* globals */
@@ -56,8 +59,8 @@ typedef struct {
    char buffer[STATICBUFFERSIZE];
 } pipeinfo;

-pipeinfo Out = {INVALID_HANDLE_VALUE, ""};
-pipeinfo Err = {INVALID_HANDLE_VALUE, ""};
+pipeinfo Out = {INVALID_HANDLE_VALUE, '\0'};
+pipeinfo Err = {INVALID_HANDLE_VALUE, '\0'};

 /*
 * exitcodes: 0 == no, 1 == yes, 2 == error
@@ -71,7 +74,6 @@ main(
    char msg[300];
    DWORD dwWritten;
    int chars;
-    const char *s;

    /*
     * Make sure children (cl.exe and link.exe) are kept quiet.
@@ -100,16 +102,16 @@ main(
 	    }
 	    return CheckForCompilerFeature(argv[2]);
 	case 'l':
-	    if (argc < 3) {
+	    if (argc != 3) {
 		chars = snprintf(msg, sizeof(msg) - 1,
-	       		"usage: %s -l <linker option> ?<mandatory option> ...?\n"
+	       		"usage: %s -l <linker option>\n"
 			"Tests for whether link.exe supports an option\n"
 			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
 		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
 			&dwWritten, NULL);
 		return 2;
 	    }
-	    return CheckForLinkerFeature(&argv[2], argc-2);
+	    return CheckForLinkerFeature(argv[2]);
 	case 'f':
 	    if (argc == 2) {
 		chars = snprintf(msg, sizeof(msg) - 1,
@@ -151,13 +153,8 @@ main(
 		    &dwWritten, NULL);
 		return 0;
 	    }
-	    s = GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0');
-	    if (s && *s) {
-		printf("%s\n", s);
-		return 0;
-	    } else
-		return 1; /* Version not found. Return non-0 exit code */
-
+	    printf("%s\n", GetVersionFromFile(argv[2], argv[3]));
+	    return 0;
 	case 'Q':
 	    if (argc != 3) {
 		chars = snprintf(msg, sizeof(msg) - 1,
@@ -169,18 +166,6 @@ main(
 		return 2;
 	    }
 	    return QualifyPath(argv[2]);
-
-	case 'L':
-	    if (argc != 3) {
-		chars = snprintf(msg, sizeof(msg) - 1,
-		    "usage: %s -L keypath\n"
-		    "Emit the fully qualified path of directory containing keypath\n"
-		    "exitcodes: 0 == success, 1 == not found, 2 == error\n", argv[0]);
-		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
-		    &dwWritten, NULL);
-		return 2;
-	    }
-	    return LocateDependency(argv[2]);
 	}
    }
    chars = snprintf(msg, sizeof(msg) - 1,
@@ -275,7 +260,7 @@ CheckForCompilerFeature(
 		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);

 	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars],
 		(300-chars), 0);
 	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
 	return 2;
@@ -328,8 +313,7 @@ CheckForCompilerFeature(

 static int
 CheckForLinkerFeature(
-    char **options,
-    int count)
+    const char *option)
 {
    STARTUPINFO si;
    PROCESS_INFORMATION pi;
@@ -338,8 +322,7 @@ CheckForLinkerFeature(
    char msg[300];
    BOOL ok;
    HANDLE hProcess, h, pipeThreads[2];
-    int i;
-    char cmdline[255];
+    char cmdline[100];

    hProcess = GetCurrentProcess();

@@ -385,11 +368,7 @@ CheckForLinkerFeature(
     * Append our option for testing.
     */

-    for (i = 0; i < count; i++) {
-	lstrcat(cmdline, " \"");
-	lstrcat(cmdline, options[i]);
-	lstrcat(cmdline, "\"");
-    }
+    lstrcat(cmdline, option);

    ok = CreateProcess(
 	    NULL,	    /* Module name. */
@@ -409,7 +388,7 @@ CheckForLinkerFeature(
 		"Tried to launch: \"%s\", but got error [%u]: ", cmdline, err);

 	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS|
-		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPSTR)&msg[chars],
+		FORMAT_MESSAGE_MAX_WIDTH_MASK, 0L, err, 0, (LPVOID)&msg[chars],
 		(300-chars), 0);
 	WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, lstrlen(msg), &err,NULL);
 	return 2;
@@ -454,9 +433,7 @@ CheckForLinkerFeature(
    return !(strstr(Out.buffer, "LNK1117") != NULL ||
 	    strstr(Err.buffer, "LNK1117") != NULL ||
 	    strstr(Out.buffer, "LNK4044") != NULL ||
-	    strstr(Err.buffer, "LNK4044") != NULL ||
-	    strstr(Out.buffer, "LNK4224") != NULL ||
-	    strstr(Err.buffer, "LNK4224") != NULL);
+	    strstr(Err.buffer, "LNK4044") != NULL);
 }

 static DWORD WINAPI
@@ -502,9 +479,9 @@ IsIn(
 static const char *
 GetVersionFromFile(
    const char *filename,
-    const char *match,
-    int numdots)
+    const char *match)
 {
+    size_t cbBuffer = 100;
    static char szBuffer[100];
    char *szResult = NULL;
    FILE *fp = fopen(filename, "rt");
@@ -514,17 +491,16 @@ GetVersionFromFile(
 	 * Read data until we see our match string.
 	 */

-	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
+	while (fgets(szBuffer, cbBuffer, fp) != NULL) {
 	    LPSTR p, q;

 	    p = strstr(szBuffer, match);
 	    if (p != NULL) {
 		/*
-		 * Skip to first digit after the match.
+		 * Skip to first digit.
 		 */

-		p += strlen(match);
-		while (*p && !isdigit((unsigned char)*p)) {
+		while (*p && !isdigit(*p)) {
 		    ++p;
 		}

@@ -533,13 +509,13 @@ GetVersionFromFile(
 		 */

 		q = p;
-		while (*q && (strchr("0123456789.ab", *q)) && (((!strchr(".ab", *q)
-			    && !strchr("ab", q[-1])) || --numdots))) {
+		while (*q && (isalnum(*q) || *q == '.')) {
 		    ++q;
 		}

-		*q = 0;
-		szResult = p;
+		memcpy(szBuffer, p, q - p);
+		szBuffer[q-p] = 0;
+		szResult = szBuffer;
 		break;
 	    }
 	}
@@ -562,7 +538,7 @@ typedef struct list_item_t {
 static list_item_t *
 list_insert(list_item_t **listPtrPtr, const char *key, const char *value)
 {
-    list_item_t *itemPtr = (list_item_t *)malloc(sizeof(list_item_t));
+    list_item_t *itemPtr = malloc(sizeof(list_item_t));
    if (itemPtr) {
 	itemPtr->key = strdup(key);
 	itemPtr->value = strdup(value);
@@ -611,7 +587,9 @@ SubstituteFile(
    const char *substitutions,
    const char *filename)
 {
+    size_t cbBuffer = 1024;
    static char szBuffer[1024], szCopy[1024];
+    char *szResult = NULL;
    list_item_t *substPtr = NULL;
    FILE *fp, *sp;

@@ -624,7 +602,7 @@ SubstituteFile(

 	sp = fopen(substitutions, "rt");
 	if (sp != NULL) {
-	    while (fgets(szBuffer, sizeof(szBuffer), sp) != NULL) {
+	    while (fgets(szBuffer, cbBuffer, sp) != NULL) {
 		unsigned char *ks, *ke, *vs, *ve;
 		ks = (unsigned char*)szBuffer;
 		while (ks && *ks && isspace(*ks)) ++ks;
@@ -641,7 +619,7 @@ SubstituteFile(
 	}

 	/* debug: dump the list */
-#ifndef NDEBUG
+#ifdef _DEBUG
 	{
 	    int n = 0;
 	    list_item_t *p = NULL;
@@ -650,12 +628,12 @@ SubstituteFile(
 	    }
 	}
 #endif
-
+	
 	/*
 	 * Run the substitutions over each line of the input
 	 */
-
-	while (fgets(szBuffer, sizeof(szBuffer), fp) != NULL) {
+	
+	while (fgets(szBuffer, cbBuffer, fp) != NULL) {
 	    list_item_t *p = NULL;
 	    for (p = substPtr; p != NULL; p = p->nextPtr) {
 		char *m = strstr(szBuffer, p->key);
@@ -672,26 +650,15 @@ SubstituteFile(
 		    memcpy(szBuffer, szCopy, sizeof(szCopy));
 		}
 	    }
-	    printf("%s", szBuffer);
+	    printf(szBuffer);
 	}
-
+	
 	list_free(&substPtr);
    }
    fclose(fp);
    return 0;
 }

-BOOL FileExists(LPCTSTR szPath)
-{
-#ifndef INVALID_FILE_ATTRIBUTES
-    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
-#endif
-    DWORD pathAttr = GetFileAttributes(szPath);
-    return (pathAttr != INVALID_FILE_ATTRIBUTES &&
-	    !(pathAttr & FILE_ATTRIBUTE_DIRECTORY));
-}
-
-
 /*
 * QualifyPath --
 *
@@ -705,105 +672,17 @@ QualifyPath(
    const char *szPath)
 {
    char szCwd[MAX_PATH + 1];
-
-    GetFullPathName(szPath, sizeof(szCwd)-1, szCwd, NULL);
+    char szTmp[MAX_PATH + 1];
+    char *p;
+    GetCurrentDirectory(MAX_PATH, szCwd);
+    while ((p = strchr(szPath, '/')) && *p)
+	*p = '\\';
+    PathCombine(szTmp, szCwd, szPath);
+    PathCanonicalize(szCwd, szTmp);
    printf("%s\n", szCwd);
    return 0;
 }

-/*
- * Implements LocateDependency for a single directory. See that command
- * for an explanation.
- * Returns 0 if found after printing the directory.
- * Returns 1 if not found but no errors.
- * Returns 2 on any kind of error
- * Basically, these are used as exit codes for the process.
- */
-static int LocateDependencyHelper(const char *dir, const char *keypath)
-{
-    HANDLE hSearch;
-    char path[MAX_PATH+1];
-    size_t dirlen;
-    int keylen, ret;
-    WIN32_FIND_DATA finfo;
-
-    if (dir == NULL || keypath == NULL)
-	return 2; /* Have no real error reporting mechanism into nmake */
-    dirlen = strlen(dir);
-    if ((dirlen + 3) > sizeof(path))
-	return 2;
-    strncpy(path, dir, dirlen);
-    strncpy(path+dirlen, "\\*", 3);	/* Including terminating \0 */
-    keylen = strlen(keypath);
-
-#if 0 /* This function is not available in Visual C++ 6 */
-    /*
-     * Use numerics 0 -> FindExInfoStandard,
-     * 1 -> FindExSearchLimitToDirectories,
-     * as these are not defined in Visual C++ 6
-     */
-    hSearch = FindFirstFileEx(path, 0, &finfo, 1, NULL, 0);
-#else
-    hSearch = FindFirstFile(path, &finfo);
-#endif
-    if (hSearch == INVALID_HANDLE_VALUE)
-	return 1; /* Not found */
-
-    /* Loop through all subdirs checking if the keypath is under there */
-    ret = 1; /* Assume not found */
-    do {
-	int sublen;
-	/*
-	 * We need to check it is a directory despite the
-	 * FindExSearchLimitToDirectories in the above call. See SDK docs
-	 */
-	if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
-	    continue;
-	sublen = strlen(finfo.cFileName);
-	if ((dirlen+1+sublen+1+keylen+1) > sizeof(path))
-	    continue;		/* Path does not fit, assume not matched */
-	strncpy(path+dirlen+1, finfo.cFileName, sublen);
-	path[dirlen+1+sublen] = '\\';
-	strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
-	if (FileExists(path)) {
-	    /* Found a match, print to stdout */
-	    path[dirlen+1+sublen] = '\0';
-	    QualifyPath(path);
-	    ret = 0;
-	    break;
-	}
-    } while (FindNextFile(hSearch, &finfo));
-    FindClose(hSearch);
-    return ret;
-}
-
-/*
- * LocateDependency --
- *
- *	Locates a dependency for a package.
- *        keypath - a relative path within the package directory
- *          that is used to confirm it is the correct directory.
- *	The search path for the package directory is currently only
- *      the parent and grandparent of the current working directory.
- *      If found, the command prints
- *         name_DIRPATH=<full path of located directory>
- *      and returns 0. If not found, does not print anything and returns 1.
- */
-static int LocateDependency(const char *keypath)
-{
-    size_t i;
-    int ret;
-    static const char *paths[] = {"..", "..\\..", "..\\..\\.."};
-
-    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
-	ret = LocateDependencyHelper(paths[i], keypath);
-	if (ret == 0)
-	    return ret;
-    }
-    return ret;
-}
-
-
 /*
 * Local variables:
 *   mode: c
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.37.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.33.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.37.0'
-PACKAGE_STRING='sqlite 3.37.0'
+PACKAGE_VERSION='3.33.0'
+PACKAGE_STRING='sqlite 3.33.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''

@@ -774,7 +774,6 @@ USE_GCOV
 OPT_FEATURE_FLAGS
 HAVE_ZLIB
 USE_AMALGAMATION
-AMALGAMATION_LINE_MACROS
 TARGET_DEBUG
 TARGET_HAVE_EDITLINE
 TARGET_HAVE_READLINE
@@ -800,6 +799,7 @@ TEMP_STORE
 ALLOWRELEASE
 SQLITE_THREADSAFE
 BUILD_CC
+VERSION_NUMBER
 RELEASE
 VERSION
 program_prefix
@@ -903,12 +903,10 @@ with_readline_lib
 with_readline_inc
 enable_debug
 enable_amalgamation
-amalgamation_line_macros
 enable_load_extension
-enable_math
-enable_all
 enable_memsys5
 enable_memsys3
+enable_all
 enable_fts3
 enable_fts4
 enable_fts5
@@ -1469,7 +1467,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.37.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.33.0 to adapt to many kinds of systems.

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

@@ -1534,7 +1532,7 @@ fi

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

@@ -1560,10 +1558,9 @@ Optional Features:
                          separately
  --disable-load-extension
                          Disable loading of external extensions
-  --disable-math          Disable math functions
-  --enable-all            Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions
  --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
@@ -1662,7 +1659,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-sqlite configure 3.37.0
+sqlite configure 3.33.0
 generated by GNU Autoconf 2.69

 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2081,7 +2078,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.37.0, which was
+It was created by sqlite $as_me 3.33.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  $ $0 $@
@@ -3939,13 +3936,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:3940: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3939: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3943: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3942: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3946: output\"" >&5)
+  (eval echo "\"\$as_me:3945: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -5151,7 +5148,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 5152 "configure"' > conftest.$ac_ext
+  echo '#line 5151 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -6676,11 +6673,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:6677: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6676: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:6681: \$? = $ac_status" >&5
+   echo "$as_me:6680: \$? = $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.
@@ -7015,11 +7012,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:7016: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7015: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7020: \$? = $ac_status" >&5
+   echo "$as_me:7019: \$? = $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.
@@ -7120,11 +7117,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:7121: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7120: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7125: \$? = $ac_status" >&5
+   echo "$as_me:7124: \$? = $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
@@ -7175,11 +7172,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:7176: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7175: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7180: \$? = $ac_status" >&5
+   echo "$as_me:7179: \$? = $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
@@ -9555,7 +9552,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 9556 "configure"
+#line 9555 "configure"
 #include "confdefs.h"

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

 #if HAVE_DLFCN_H
@@ -10307,13 +10304,6 @@ done
 #
 USE_AMALGAMATION=1

-#########
-# By default, amalgamation sqlite3.c will have #line directives.
-# This is a build option not shown by ./configure --help
-# To control it, use configure option: amalgamation_line_macros=?
-# where ? is no to suppress #line directives or yes to create them.
-AMALGAMATION_LINE_MACROS=--linemacros=0
-
 #########
 # See whether we can run specific tclsh versions known to work well;
 # if not, then we fall back to plain tclsh.
@@ -10375,10 +10365,8 @@ fi
 if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR='$(libdir)'
  for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do
-    if test -d $i ; then
-      TCLLIBDIR=$i
-      break
-    fi
+    TCLLIBDIR=$i
+    break
  done
  TCLLIBDIR="${TCLLIBDIR}/sqlite3"
 fi
@@ -10400,6 +10388,12 @@ RELEASE=`cat $srcdir/VERSION`
 { $as_echo "$as_me:${as_lineno-$LINENO}: Release set to $RELEASE" >&5
 $as_echo "$as_me: Release set to $RELEASE" >&6;}

+VERSION_NUMBER=`cat $srcdir/VERSION \
+                           | sed 's/[^0-9]/ /g' \
+                | awk '{printf "%d%03d%03d",$1,$2,$3}'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Version number set to $VERSION_NUMBER" >&5
+$as_echo "$as_me: Version number set to $VERSION_NUMBER" >&6;}
+

 #########
 # Locate a compiler for the build machine.  This compiler should
@@ -11260,16 +11254,10 @@ if test "${enable_debug+set}" = set; then :
  enableval=$enable_debug;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build type" >&5
-$as_echo_n "checking build type... " >&6; }
 if test "${enable_debug}" = "yes" ; then
  TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: debug" >&5
-$as_echo "debug" >&6; }
 else
  TARGET_DEBUG="-DNDEBUG"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: release" >&5
-$as_echo "release" >&6; }
 fi


@@ -11280,23 +11268,10 @@ if test "${enable_amalgamation+set}" = set; then :
  enableval=$enable_amalgamation;
 fi

-if test "${enable_amalgamation}" = "no" ; then
+if test "${enable_amalgamation}" == "no" ; then
  USE_AMALGAMATION=0
 fi

-########
-# See whether --disable
-if test "${amalgamation_line_macros+set}" = set; then :
-  enableval=$amalgamation_line_macros;
-fi
-
-if test "${amalgamation_line_macros}" = "yes" ; then
-  AMALGAMATION_LINE_MACROS=--linemacros=1
-fi
-if test "${amalgamation_line_macros}" = "no" ; then
-  AMALGAMATION_LINE_MACROS=--linemacros=0
-fi
-

 #########
 # Look for zlib.  Only needed by extensions and by the sqlite3.exe shell
@@ -11443,91 +11418,6 @@ else
  OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi

-##########
-# Do we want to support math functions
-#
-# Check whether --enable-math was given.
-if test "${enable_math+set}" = set; then :
-  enableval=$enable_math;
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support math functions" >&5
-$as_echo_n "checking whether to support math functions... " >&6; }
-if test "$enable_math" = "no"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MATH_FUNCTIONS"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ceil" >&5
-$as_echo_n "checking for library containing ceil... " >&6; }
-if ${ac_cv_search_ceil+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char ceil ();
-int
-main ()
-{
-return ceil ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' m; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ceil=$ac_res
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext
-  if ${ac_cv_search_ceil+:} false; then :
-  break
-fi
-done
-if ${ac_cv_search_ceil+:} false; then :
-
-else
-  ac_cv_search_ceil=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ceil" >&5
-$as_echo "$ac_cv_search_ceil" >&6; }
-ac_res=$ac_cv_search_ceil
-if test "$ac_res" != no; then :
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-fi
-
-
-########
-# The --enable-all 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
-
-
 ##########
 # Do we want to support memsys3 and/or memsys5
 #
@@ -11562,6 +11452,15 @@ 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.
@@ -11569,26 +11468,15 @@ if test "${enable_fts3+set}" = set; then :
  enableval=$enable_fts3;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS3" >&5
-$as_echo_n "checking whether to support FTS3... " >&6; }
 if test "${enable_fts3}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi
 # Check whether --enable-fts4 was given.
 if test "${enable_fts4+set}" = set; then :
  enableval=$enable_fts4;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS4" >&5
-$as_echo_n "checking whether to support FTS4... " >&6; }
 if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
  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; }
@@ -11646,20 +11534,13 @@ if test "$ac_res" != no; then :

 fi

-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi
 # Check whether --enable-fts5 was given.
 if test "${enable_fts5+set}" = set; then :
  enableval=$enable_fts5;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support FTS5" >&5
-$as_echo_n "checking whether to support FTS5... " >&6; }
 if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
  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; }
@@ -11717,9 +11598,6 @@ if test "$ac_res" != no; then :

 fi

-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi

 #########
@@ -11729,15 +11607,8 @@ if test "${enable_json1+set}" = set; then :
  enableval=$enable_json1;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support JSON" >&5
-$as_echo_n "checking whether to support JSON... " >&6; }
 if test "${enable_json1}" = "yes" -o "${enable_all}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi

 #########
@@ -11748,15 +11619,8 @@ if test "${enable_update_limit+set}" = set; then :
  enableval=$enable_update_limit;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support LIMIT on UPDATE and DELETE statements" >&5
-$as_echo_n "checking whether to support LIMIT on UPDATE and DELETE statements... " >&6; }
-if test "${enable_update_limit}" = "yes" ; then
+if test "${enable_udlimit}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi

 #########
@@ -11768,16 +11632,9 @@ else
  enable_geopoly=no
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support GEOPOLY" >&5
-$as_echo_n "checking whether to support GEOPOLY... " >&6; }
 if test "${enable_geopoly}" = "yes" -o "${enable_all}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_GEOPOLY"
  enable_rtree=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi

 #########
@@ -11787,15 +11644,8 @@ if test "${enable_rtree+set}" = set; then :
  enableval=$enable_rtree;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support RTREE" >&5
-$as_echo_n "checking whether to support RTREE... " >&6; }
 if test "${enable_rtree}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi

 #########
@@ -11805,16 +11655,9 @@ if test "${enable_session+set}" = set; then :
  enableval=$enable_session;
 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to support SESSION" >&5
-$as_echo_n "checking whether to support SESSION... " >&6; }
 if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
 fi

 #########
@@ -12400,7 +12243,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.37.0, which was
+This file was extended by sqlite $as_me 3.33.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -12466,7 +12309,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.37.0
+sqlite config.status 3.33.0
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

@@ -134,10 +134,8 @@ AC_ARG_VAR([TCLLIBDIR], [Where to install tcl plugin])
 if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR='$(libdir)'
  for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}` ; do
-    if test -d $i ; then
-      TCLLIBDIR=$i
-      break
-    fi
+    TCLLIBDIR=$i
+    break
  done
  TCLLIBDIR="${TCLLIBDIR}/sqlite3"
 fi
@@ -157,6 +155,11 @@ AC_SUBST(VERSION)
 RELEASE=`cat $srcdir/VERSION`
 AC_MSG_NOTICE(Release set to $RELEASE)
 AC_SUBST(RELEASE)
+VERSION_NUMBER=[`cat $srcdir/VERSION \
+                           | sed 's/[^0-9]/ /g' \
+                | awk '{printf "%d%03d%03d",$1,$2,$3}'`]
+AC_MSG_NOTICE(Version number set to $VERSION_NUMBER)
+AC_SUBST(VERSION_NUMBER)

 #########
 # Locate a compiler for the build machine.  This compiler should
@@ -555,13 +558,10 @@ AC_SEARCH_LIBS(fdatasync, [rt])
 #########
 # check for debug enabled
 AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug],[enable debugging & verbose explain]))
-AC_MSG_CHECKING([build type])
 if test "${enable_debug}" = "yes" ; then
  TARGET_DEBUG="-DSQLITE_DEBUG=1 -DSQLITE_ENABLE_SELECTTRACE -DSQLITE_ENABLE_WHERETRACE -O0"
-  AC_MSG_RESULT([debug])
 else
  TARGET_DEBUG="-DNDEBUG"
-  AC_MSG_RESULT([release])
 fi
 AC_SUBST(TARGET_DEBUG)

@@ -569,7 +569,7 @@ AC_SUBST(TARGET_DEBUG)
 # See whether we should use the amalgamation to build
 AC_ARG_ENABLE(amalgamation, AC_HELP_STRING([--disable-amalgamation],
      [Disable the amalgamation and instead build all files separately]))
-if test "${enable_amalgamation}" = "no" ; then
+if test "${enable_amalgamation}" == "no" ; then
  USE_AMALGAMATION=0
 fi
 AC_SUBST(USE_AMALGAMATION)
@@ -591,27 +591,6 @@ else
  OPT_FEATURE_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1"
 fi

-##########
-# Do we want to support math functions
-#
-AC_ARG_ENABLE(math, 
-AC_HELP_STRING([--disable-math],[Disable math functions]))
-AC_MSG_CHECKING([whether to support math functions])
-if test "$enable_math" = "no"; then
-  AC_MSG_RESULT([no])
-else
-  AC_MSG_RESULT([yes])
-  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_MATH_FUNCTIONS"
-  AC_SEARCH_LIBS(ceil, m)
-fi
-
-
-########
-# The --enable-all argument is short-hand to enable
-# multiple extensions.
-AC_ARG_ENABLE(all, AC_HELP_STRING([--enable-all],
-      [Enable FTS4, FTS5, Geopoly, JSON, RTree, Sessions]))
-
 ##########
 # Do we want to support memsys3 and/or memsys5
 #
@@ -634,47 +613,37 @@ 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],
      [Enable the FTS3 extension]))
-AC_MSG_CHECKING([whether to support FTS3])
 if test "${enable_fts3}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS3"
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
 fi
 AC_ARG_ENABLE(fts4, AC_HELP_STRING([--enable-fts4],
      [Enable the FTS4 extension]))
-AC_MSG_CHECKING([whether to support FTS4])
 if test "${enable_fts4}" = "yes" -o "${enable_all}" = "yes" ; then
-  AC_MSG_RESULT([yes])
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS4"
  AC_SEARCH_LIBS([log],[m])
-else
-  AC_MSG_RESULT([no])
 fi
 AC_ARG_ENABLE(fts5, AC_HELP_STRING([--enable-fts5],
      [Enable the FTS5 extension]))
-AC_MSG_CHECKING([whether to support FTS5])
 if test "${enable_fts5}" = "yes" -o "${enable_all}" = "yes" ; then
-  AC_MSG_RESULT([yes])
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_FTS5"
  AC_SEARCH_LIBS([log],[m])
-else
-  AC_MSG_RESULT([no])
 fi

 #########
 # See whether we should enable JSON1
 AC_ARG_ENABLE(json1, AC_HELP_STRING([--enable-json1],[Enable the JSON1 extension]))
-AC_MSG_CHECKING([whether to support JSON])
 if test "${enable_json1}" = "yes" -o "${enable_all}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_JSON1"
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
 fi

 #########
@@ -682,12 +651,8 @@ fi
 # statements.
 AC_ARG_ENABLE(update-limit, AC_HELP_STRING([--enable-update-limit],
      [Enable the UPDATE/DELETE LIMIT clause]))
-AC_MSG_CHECKING([whether to support LIMIT on UPDATE and DELETE statements])
-if test "${enable_update_limit}" = "yes" ; then
+if test "${enable_udlimit}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT"
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
 fi

 #########
@@ -695,38 +660,26 @@ fi
 AC_ARG_ENABLE(geopoly, AC_HELP_STRING([--enable-geopoly],
      [Enable the GEOPOLY extension]),
      [enable_geopoly=yes],[enable_geopoly=no])
-AC_MSG_CHECKING([whether to support GEOPOLY])
 if test "${enable_geopoly}" = "yes" -o "${enable_all}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_GEOPOLY"
  enable_rtree=yes
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
 fi

 #########
 # See whether we should enable RTREE
 AC_ARG_ENABLE(rtree, AC_HELP_STRING([--enable-rtree],
      [Enable the RTREE extension]))
-AC_MSG_CHECKING([whether to support RTREE])
 if test "${enable_rtree}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_RTREE"
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
 fi

 #########
 # See whether we should enable the SESSION extension
 AC_ARG_ENABLE(session, AC_HELP_STRING([--enable-session],
      [Enable the SESSION extension]))
-AC_MSG_CHECKING([whether to support SESSION])
 if test "${enable_session}" = "yes" -o "${enable_all}" = "yes" ; then
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_SESSION"
  OPT_FEATURE_FLAGS="${OPT_FEATURE_FLAGS} -DSQLITE_ENABLE_PREUPDATE_HOOK"
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
 fi

 #########
@@ -1,49 +0,0 @@
-
-20-11-2020
-
-# Memory Allocation In vdbesort.c
-
-Memory allocation is slightly different depending on:
-
-  * whether or not SQLITE_CONFIG_SMALL_MALLOC is set, and
-  * whether or not worker threads are enabled.
-
-## SQLITE_CONFIG_SMALL_MALLOC=0
-
-Assuming SQLITE_CONFIG_SMALL_MALLOC is not set, keys passed to the sorter are
-added to an in-memory buffer. This buffer is grown using sqlite3Realloc() as
-required it reaches the size configured for the main pager cache using "PRAGMA
-cache_size". i.e. if the user has executed "PRAGMA main.cache_size = -2048",
-then this buffer is allowed to grow up to 2MB in size.
-
-Once the buffer has grown to its threshold, keys are sorted and written to
-a temp file. If worker threads are not enabled, this is the only significant
-allocation the sorter module makes. After keys are sorted and flushed out to
-the temp file, the buffer is reused to accumulate the next batch of keys.
-
-If worker threads are available, then the buffer is passed to a worker thread
-to sort and flush once it is full, and a new buffer allocated to allow the
-main thread to continue to accumulate keys. Buffers are reused once they
-have been flushed, so in this case at most (nWorker+1) buffers are allocated
-and used, where nWorker is the number of configured worker threads.
-
-There are no other significant users of heap memory in the sorter module. 
-Once sorted buffers of keys have been flushed to disk, they are read back
-either by mapping the file (via sqlite3_file.xFetch()) or else read back
-in one page at a time.
-
-All buffers are allocated by the main thread. A sorter object is associated
-with a single database connection, to which it holds a pointer.
-
-## SQLITE_CONFIG_SMALL_MALLOC=1
-
-This case is similar to the above, except that instead of accumulating
-multiple keys in a single large buffer, sqlite3VdbeSorterWrite() stores
-keys in a regular heap-memory linked list (one allocation per element).
-List elements are freed as they are flushed to disk, either by the main
-thread or by a worker thread.
-
-Each time a key is added the sorter (and an allocation made),
-sqlite3HeapNearlyFull() is called. If it returns true, the current
-list of keys is flushed to a temporary file, even if it has not yet
-reached the size threshold.
@@ -1,88 +0,0 @@
-# Wal-Mode Blocking Locks
-
-On some Unix-like systems, SQLite may be configured to use POSIX blocking locks
-by:
-
-  * building the library with SQLITE\_ENABLE\_SETLK\_TIMEOUT defined, and 
-  * configuring a timeout in ms using the sqlite3\_busy\_timeout() API.
-
-Blocking locks may be advantageous as (a) waiting database clients do not
-need to continuously poll the database lock, and (b) using blocking locks
-facilitates transfer of OS priority between processes when a high priority
-process is blocked by a lower priority one.
-
-Only read/write clients use blocking locks. Clients that have read-only access
-to the \*-shm file nevery use blocking locks.
-
-Threads or processes that access a single database at a time never deadlock as
-a result of blocking database locks. But it is of course possible for threads
-that lock multiple databases simultaneously to do so. In most cases the OS will
-detect the deadlock and return an error.
-
-## Wal Recovery
-
-Wal database "recovery" is a process required when the number of connected
-database clients changes from zero to one. In this case, a client is 
-considered to connect to the database when it first reads data from it.
-Before recovery commences, an exclusive WRITER lock is taken. 
-
-Without blocking locks, if two clients attempt recovery simultaneously, one
-fails to obtain the WRITER lock and either invokes the busy-handler callback or
-returns SQLITE\_BUSY to the user. With blocking locks configured, the second
-client blocks on the WRITER lock.
-
-## Database Readers
-
-Usually, read-only are not blocked by any other database clients, so they 
-have no need of blocking locks.
-
-If a read-only transaction is being opened on a snapshot, the CHECKPOINTER
-lock is required briefly as part of opening the transaction (to check that a
-checkpointer is not currently overwriting the snapshot being opened). A
-blocking lock is used to obtain the CHECKPOINTER lock in this case. A snapshot
-opener may therefore block on and transfer priority to a checkpointer in some
-cases.
-
-## Database Writers
-
-A database writer must obtain the exclusive WRITER lock. It uses a blocking
-lock to do so if any of the following are true:
-
-  * the transaction is an implicit one consisting of a single DML or DDL
-    statement, or
-  * the transaction is opened using BEGIN IMMEDIATE or BEGIN EXCLUSIVE, or
-  * the first SQL statement executed following the BEGIN command is a DML or
-    DDL statement (not a read-only statement like a SELECT).
-
-In other words, in all cases except when an open read-transaction is upgraded
-to a write-transaction. In that case a non-blocking lock is used.
-
-## Database Checkpointers
-
-Database checkpointers takes the following locks, in order:
-
-  * The exclusive CHECKPOINTER lock.
-  * The exclusive WRITER lock (FULL, RESTART and TRUNCATE only).
-  * Exclusive lock on read-mark slots 1-N. These are immediately released after being taken.
-  * Exclusive lock on read-mark 0.
-  * Exclusive lock on read-mark slots 1-N again. These are immediately released
-    after being taken (RESTART and TRUNCATE only).
-
-All of the above use blocking locks.
-
-## Summary
-
-With blocking locks configured, the only cases in which clients should see an
-SQLITE\_BUSY error are:
-
-  * if the OS does not grant a blocking lock before the configured timeout
-    expires, and
-  * when an open read-transaction is upgraded to a write-transaction.
-
-In all other cases the blocking locks implementation should prevent clients
-from having to handle SQLITE\_BUSY errors and facilitate appropriate transfer
-of priorities between competing clients.
-
-Clients that lock multiple databases simultaneously must be wary of deadlock.
-
-
@@ -1704,3 +1704,4 @@ int sqlite3async_control(int op, ...){
 }

 #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_ASYNCIO) */
+
@@ -220,3 +220,4 @@ int sqlite3async_control(int op, ...);
 }  /* End of the 'extern "C"' block */
 #endif
 #endif        /* ifndef __SQLITEASYNC_H_ */
+
@@ -28,7 +28,6 @@ if {[info commands sqlite3_expert_new]==""} {
  return
 }

-
 set CLI [test_binary_name sqlite3]
 set CMD [test_binary_name sqlite3_expert]

@@ -103,7 +102,7 @@ do_setup_rec_test $tn.1 { CREATE TABLE t1(a, b, c) } {
  SELECT * FROM t1
 } {
  (no new indexes)
-  SCAN t1
+  SCAN TABLE t1
 }

 do_setup_rec_test $tn.2 {
@@ -112,7 +111,7 @@ do_setup_rec_test $tn.2 {
  SELECT * FROM t1 WHERE b>?;
 } {
  CREATE INDEX t1_idx_00000062 ON t1(b);
-  SEARCH t1 USING INDEX t1_idx_00000062 (b>?)
+  SEARCH TABLE t1 USING INDEX t1_idx_00000062 (b>?)
 }

 do_setup_rec_test $tn.3 {
@@ -121,7 +120,7 @@ do_setup_rec_test $tn.3 {
  SELECT * FROM t1 WHERE b COLLATE nocase BETWEEN ? AND ?
 } {
  CREATE INDEX t1_idx_3e094c27 ON t1(b COLLATE NOCASE);
-  SEARCH t1 USING INDEX t1_idx_3e094c27 (b>? AND b<?)
+  SEARCH TABLE t1 USING INDEX t1_idx_3e094c27 (b>? AND b<?)
 }

 do_setup_rec_test $tn.4 {
@@ -130,7 +129,7 @@ do_setup_rec_test $tn.4 {
  SELECT a FROM t1 ORDER BY b;
 } {
  CREATE INDEX t1_idx_00000062 ON t1(b);
-  SCAN t1 USING INDEX t1_idx_00000062
+  SCAN TABLE t1 USING INDEX t1_idx_00000062
 }

 do_setup_rec_test $tn.5 {
@@ -139,7 +138,7 @@ do_setup_rec_test $tn.5 {
  SELECT a FROM t1 WHERE a=? ORDER BY b;
 } {
  CREATE INDEX t1_idx_000123a7 ON t1(a, b);
-  SEARCH t1 USING COVERING INDEX t1_idx_000123a7 (a=?)
+  SEARCH TABLE t1 USING COVERING INDEX t1_idx_000123a7 (a=?)
 }

 if 0 {
@@ -149,7 +148,7 @@ do_setup_rec_test $tn.6 {
  SELECT min(a) FROM t1
 } {
  CREATE INDEX t1_idx_00000061 ON t1(a);
-  SEARCH t1 USING COVERING INDEX t1_idx_00000061
+  SEARCH TABLE t1 USING COVERING INDEX t1_idx_00000061
 }
 }

@@ -159,7 +158,7 @@ do_setup_rec_test $tn.7 {
  SELECT * FROM t1 ORDER BY a, b, c;
 } {
  CREATE INDEX t1_idx_033e95fe ON t1(a, b, c);
-  SCAN t1 USING COVERING INDEX t1_idx_033e95fe
+  SCAN TABLE t1 USING COVERING INDEX t1_idx_033e95fe
 }

 #do_setup_rec_test $tn.1.8 {
@@ -168,7 +167,7 @@ do_setup_rec_test $tn.7 {
 #  SELECT * FROM t1 ORDER BY a ASC, b COLLATE nocase DESC, c ASC;
 #} {
 #  CREATE INDEX t1_idx_5be6e222 ON t1(a, b COLLATE NOCASE DESC, c);
-#  0|0|0|SCAN t1 USING COVERING INDEX t1_idx_5be6e222
+#  0|0|0|SCAN TABLE t1 USING COVERING INDEX t1_idx_5be6e222
 #}

 do_setup_rec_test $tn.8.1 {
@@ -177,7 +176,7 @@ do_setup_rec_test $tn.8.1 {
  SELECT * FROM t1 WHERE a=?
 } {
  CREATE INDEX t1_idx_00000061 ON t1(a);
-  SEARCH t1 USING INDEX t1_idx_00000061 (a=?)
+  SEARCH TABLE t1 USING INDEX t1_idx_00000061 (a=?)
 }
 do_setup_rec_test $tn.8.2 {
  CREATE TABLE t1(a, b COLLATE nocase, c);
@@ -185,7 +184,7 @@ do_setup_rec_test $tn.8.2 {
  SELECT * FROM t1 ORDER BY a ASC, b DESC, c ASC;
 } {
  CREATE INDEX t1_idx_5cb97285 ON t1(a, b DESC, c);
-  SCAN t1 USING COVERING INDEX t1_idx_5cb97285
+  SCAN TABLE t1 USING COVERING INDEX t1_idx_5cb97285
 }


@@ -196,8 +195,8 @@ do_setup_rec_test $tn.9.1 {
 } {
  SELECT * FROM "t t" WHERE a=?
 } {
-  CREATE INDEX "t t_idx_00000061" ON "t t"(a);
-  SEARCH t t USING INDEX t t_idx_00000061 (a=?) 
+  CREATE INDEX 't t_idx_00000061' ON 't t'(a);
+  SEARCH TABLE t t USING INDEX t t_idx_00000061 (a=?) 
 }

 do_setup_rec_test $tn.9.2 {
@@ -205,8 +204,8 @@ do_setup_rec_test $tn.9.2 {
 } {
  SELECT * FROM "t t" WHERE b BETWEEN ? AND ?
 } {
-  CREATE INDEX "t t_idx_00000062" ON "t t"(b);
-  SEARCH t t USING INDEX t t_idx_00000062 (b>? AND b<?)
+  CREATE INDEX 't t_idx_00000062' ON 't t'(b);
+  SEARCH TABLE t t USING INDEX t t_idx_00000062 (b>? AND b<?)
 }

 # Columns with names that require quotes.
@@ -217,7 +216,7 @@ do_setup_rec_test $tn.10.1 {
  SELECT * FROM t3 WHERE "b b" = ?
 } {
  CREATE INDEX t3_idx_00050c52 ON t3('b b');
-  SEARCH t3 USING INDEX t3_idx_00050c52 (b b=?)
+  SEARCH TABLE t3 USING INDEX t3_idx_00050c52 (b b=?)
 }

 do_setup_rec_test $tn.10.2 {
@@ -226,7 +225,7 @@ do_setup_rec_test $tn.10.2 {
  SELECT * FROM t3 ORDER BY "b b"
 } {
  CREATE INDEX t3_idx_00050c52 ON t3('b b');
-  SCAN t3 USING INDEX t3_idx_00050c52
+  SCAN TABLE t3 USING INDEX t3_idx_00050c52
 }

 # Transitive constraints
@@ -239,8 +238,8 @@ do_setup_rec_test $tn.11.1 {
 } {
  CREATE INDEX t5_idx_000123a7 ON t5(a, b);
  CREATE INDEX t6_idx_00000063 ON t6(c);
-  SEARCH t6 USING INDEX t6_idx_00000063 (c=?) 
-  SEARCH t5 USING COVERING INDEX t5_idx_000123a7 (a=? AND b=?)
+  SEARCH TABLE t6 USING INDEX t6_idx_00000063 (c=?) 
+  SEARCH TABLE t5 USING COVERING INDEX t5_idx_000123a7 (a=? AND b=?)
 }

 # OR terms.
@@ -254,9 +253,9 @@ do_setup_rec_test $tn.12.1 {
  CREATE INDEX t7_idx_00000061 ON t7(a);
  MULTI-INDEX OR
    INDEX 1
-      SEARCH t7 USING INDEX t7_idx_00000061 (a=?) 
+      SEARCH TABLE t7 USING INDEX t7_idx_00000061 (a=?) 
    INDEX 2
-      SEARCH t7 USING INDEX t7_idx_00000062 (b=?)
+      SEARCH TABLE t7 USING INDEX t7_idx_00000062 (b=?)
 }

 # rowid terms.
@@ -267,7 +266,7 @@ do_setup_rec_test $tn.13.1 {
  SELECT * FROM t8 WHERE rowid=?
 } {
  (no new indexes)
-  SEARCH t8 USING INTEGER PRIMARY KEY (rowid=?)
+  SEARCH TABLE t8 USING INTEGER PRIMARY KEY (rowid=?)
 }
 do_setup_rec_test $tn.13.2 {
  CREATE TABLE t8(a, b);
@@ -275,7 +274,7 @@ do_setup_rec_test $tn.13.2 {
  SELECT * FROM t8 ORDER BY rowid
 } {
  (no new indexes)
-  SCAN t8
+  SCAN TABLE t8
 }
 do_setup_rec_test $tn.13.3 {
  CREATE TABLE t8(a, b);
@@ -283,7 +282,7 @@ do_setup_rec_test $tn.13.3 {
  SELECT * FROM t8 WHERE a=? ORDER BY rowid
 } {
  CREATE INDEX t8_idx_00000061 ON t8(a); 
-  SEARCH t8 USING INDEX t8_idx_00000061 (a=?)
+  SEARCH TABLE t8 USING INDEX t8_idx_00000061 (a=?)
 }

 # Triggers
@@ -298,7 +297,7 @@ do_setup_rec_test $tn.14 {
  INSERT INTO t9 VALUES(?, ?, ?);
 } {
  CREATE INDEX t10_idx_00000062 ON t10(b); 
-  SEARCH t10 USING INDEX t10_idx_00000062 (b=?)
+  SEARCH TABLE t10 USING INDEX t10_idx_00000062 (b=?)
 }

 do_setup_rec_test $tn.15 {
@@ -314,8 +313,8 @@ do_setup_rec_test $tn.15 {
  SELECT * FROM t2, t1 WHERE b=? AND d=? AND t2.rowid=t1.rowid
 } {
  CREATE INDEX t2_idx_00000064 ON t2(d);
-  SEARCH t2 USING INDEX t2_idx_00000064 (d=?) 
-  SEARCH t1 USING INTEGER PRIMARY KEY (rowid=?)
+  SEARCH TABLE t2 USING INDEX t2_idx_00000064 (d=?) 
+  SEARCH TABLE t1 USING INTEGER PRIMARY KEY (rowid=?)
 }

 do_setup_rec_test $tn.16 {
@@ -324,71 +323,7 @@ do_setup_rec_test $tn.16 {
  SELECT * FROM t1 WHERE b IS NOT NULL;
 } {
  (no new indexes)
-  SCAN t1
-}
-
-do_setup_rec_test $tn.17.1 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a=?
-} {
-  (no new indexes)
-  SEARCH example USING INDEX sqlite_autoindex_example_1 (A=?)
-}
-do_setup_rec_test $tn.17.2 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE b=?
-} {
-  CREATE INDEX example_idx_00000042 ON example(B);
-  SEARCH example USING INDEX example_idx_00000042 (B=?)
-}
-do_setup_rec_test $tn.17.3 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a=? AND b=?
-} {
-  (no new indexes)
-  SEARCH example USING INDEX sqlite_autoindex_example_1 (A=? AND B=?)
-}
-do_setup_rec_test $tn.17.4 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a=? AND b>?
-} {
-  (no new indexes)
-  SEARCH example USING INDEX sqlite_autoindex_example_1 (A=? AND B>?)
-}
-do_setup_rec_test $tn.17.5 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a>? AND b=?
-} {
-  CREATE INDEX example_idx_0000cb3f ON example(B, A);
-  SEARCH example USING INDEX example_idx_0000cb3f (B=? AND A>?)
-}
-
-do_setup_rec_test $tn.18.0 {
-  CREATE TABLE SomeObject (
-     a INTEGER PRIMARY KEY,
-     x TEXT GENERATED ALWAYS AS(HEX(a)) VIRTUAL
-  );
-} {
-  SELECT x FROM SomeObject;
-} {
-  (no new indexes)
-  SCAN SomeObject
-}
-do_setup_rec_test $tn.18.1 {
-  CREATE TABLE SomeObject (
-     a INTEGER PRIMARY KEY,
-     x TEXT GENERATED ALWAYS AS(HEX(a)) VIRTUAL
-  );
-} {
-  SELECT * FROM SomeObject WHERE x=?;
-} {
-  CREATE INDEX SomeObject_idx_00000078 ON SomeObject(x);
-  SEARCH SomeObject USING COVERING INDEX SomeObject_idx_00000078 (x=?)
+  SCAN TABLE t1
 }

 }
@@ -454,4 +389,5 @@ do_execsql_test 5.3 {
  t2 t2_idx_0001295b {100 20 5}
 }

+
 finish_test
@@ -15,23 +15,6 @@
 #include <string.h>
 #include <stdio.h>

-#if !defined(SQLITE_AMALGAMATION)
-#if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
-# define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1
-#endif
-#if defined(SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS)
-# define ALWAYS(X)      (1)
-# define NEVER(X)       (0)
-#elif !defined(NDEBUG)
-# define ALWAYS(X)      ((X)?1:(assert(0),0))
-# define NEVER(X)       ((X)?(assert(0),1):0)
-#else
-# define ALWAYS(X)      (X)
-# define NEVER(X)       (X)
-#endif
-#endif /* !defined(SQLITE_AMALGAMATION) */
-
-
 #ifndef SQLITE_OMIT_VIRTUALTABLE 

 typedef sqlite3_int64 i64;
@@ -702,20 +685,16 @@ static int idxGetTableInfo(
  IdxTable *pNew = 0;
  int rc, rc2;
  char *pCsr = 0;
-  int nPk = 0;

-  rc = idxPrintfPrepareStmt(db, &p1, pzErrmsg, "PRAGMA table_xinfo=%Q", zTab);
+  rc = idxPrintfPrepareStmt(db, &p1, pzErrmsg, "PRAGMA table_info=%Q", zTab);
  while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(p1) ){
    const char *zCol = (const char*)sqlite3_column_text(p1, 1);
-    const char *zColSeq = 0;
    nByte += 1 + STRLEN(zCol);
    rc = sqlite3_table_column_metadata(
-        db, "main", zTab, zCol, 0, &zColSeq, 0, 0, 0
+        db, "main", zTab, zCol, 0, &zCol, 0, 0, 0
    );
-    if( zColSeq==0 ) zColSeq = "binary";
-    nByte += 1 + STRLEN(zColSeq);
+    nByte += 1 + STRLEN(zCol);
    nCol++;
-    nPk += (sqlite3_column_int(p1, 5)>0);
  }
  rc2 = sqlite3_reset(p1);
  if( rc==SQLITE_OK ) rc = rc2;
@@ -733,21 +712,19 @@ static int idxGetTableInfo(
  nCol = 0;
  while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(p1) ){
    const char *zCol = (const char*)sqlite3_column_text(p1, 1);
-    const char *zColSeq = 0;
    int nCopy = STRLEN(zCol) + 1;
    pNew->aCol[nCol].zName = pCsr;
-    pNew->aCol[nCol].iPk = (sqlite3_column_int(p1, 5)==1 && nPk==1);
+    pNew->aCol[nCol].iPk = sqlite3_column_int(p1, 5);
    memcpy(pCsr, zCol, nCopy);
    pCsr += nCopy;

    rc = sqlite3_table_column_metadata(
-        db, "main", zTab, zCol, 0, &zColSeq, 0, 0, 0
+        db, "main", zTab, zCol, 0, &zCol, 0, 0, 0
    );
    if( rc==SQLITE_OK ){
-      if( zColSeq==0 ) zColSeq = "binary";
-      nCopy = STRLEN(zColSeq) + 1;
+      nCopy = STRLEN(zCol) + 1;
      pNew->aCol[nCol].zColl = pCsr;
-      memcpy(pCsr, zColSeq, nCopy);
+      memcpy(pCsr, zCol, nCopy);
      pCsr += nCopy;
    }

@@ -758,9 +735,9 @@ static int idxGetTableInfo(
  if( rc!=SQLITE_OK ){
    sqlite3_free(pNew);
    pNew = 0;
-  }else if( ALWAYS(pNew!=0) ){
+  }else{
    pNew->zName = pCsr;
-    if( ALWAYS(pNew->zName!=0) ) memcpy(pNew->zName, zTab, nTab+1);
+    memcpy(pNew->zName, zTab, nTab+1);
  }

  *ppOut = pNew;
@@ -931,19 +908,6 @@ static int idxFindCompatible(
  return 0;
 }

-/* Callback for sqlite3_exec() with query with leading count(*) column.
- * The first argument is expected to be an int*, referent to be incremented
- * if that leading column is not exactly '0'.
- */
-static int countNonzeros(void* pCount, int nc,
-                         char* azResults[], char* azColumns[]){
-  (void)azColumns;  /* Suppress unused parameter warning */
-  if( nc>0 && (azResults[0][0]!='0' || azResults[0][1]!=0) ){
-    *((int *)pCount) += 1;
-  }
-  return 0;
-}
-
 static int idxCreateFromCons(
  sqlite3expert *p,
  IdxScan *pScan,
@@ -970,40 +934,17 @@ static int idxCreateFromCons(
    if( rc==SQLITE_OK ){
      /* Hash the list of columns to come up with a name for the index */
      const char *zTable = pScan->pTab->zName;
-      int quoteTable = idxIdentifierRequiresQuotes(zTable);
-      char *zName = 0;          /* Index name */
-      int collisions = 0;
-      do{
-        int i;
-        char *zFind;
-        for(i=0; zCols[i]; i++){
-          h += ((h<<3) + zCols[i]);
-        }
-        sqlite3_free(zName);
-        zName = sqlite3_mprintf("%s_idx_%08x", zTable, h);
-        if( zName==0 ) break;
-        /* Is is unique among table, view and index names? */
-        zFmt = "SELECT count(*) FROM sqlite_schema WHERE name=%Q"
-          " AND type in ('index','table','view')";
-        zFind = sqlite3_mprintf(zFmt, zName);
-        i = 0;
-        rc = sqlite3_exec(dbm, zFind, countNonzeros, &i, 0);
-        assert(rc==SQLITE_OK);
-        sqlite3_free(zFind);
-        if( i==0 ){
-          collisions = 0;
-          break;
-        }
-        ++collisions;
-      }while( collisions<50 && zName!=0 );
-      if( collisions ){
-        /* This return means "Gave up trying to find a unique index name." */
-        rc = SQLITE_BUSY_TIMEOUT;
-      }else if( zName==0 ){
+      char *zName;                /* Index name */
+      int i;
+      for(i=0; zCols[i]; i++){
+        h += ((h<<3) + zCols[i]);
+      }
+      zName = sqlite3_mprintf("%s_idx_%08x", zTable, h);
+      if( zName==0 ){ 
        rc = SQLITE_NOMEM;
      }else{
-        if( quoteTable ){
-          zFmt = "CREATE INDEX \"%w\" ON \"%w\"(%s)";
+        if( idxIdentifierRequiresQuotes(zTable) ){
+          zFmt = "CREATE INDEX '%q' ON %Q(%s)";
        }else{
          zFmt = "CREATE INDEX %s ON %s(%s)";
        }
@@ -1012,11 +953,7 @@ static int idxCreateFromCons(
          rc = SQLITE_NOMEM;
        }else{
          rc = sqlite3_exec(dbm, zIdx, 0, 0, p->pzErrmsg);
-          if( rc!=SQLITE_OK ){
-            rc = SQLITE_BUSY_TIMEOUT;
-          }else{
-            idxHashAdd(&rc, &p->hIdx, zName, zIdx);
-          }
+          idxHashAdd(&rc, &p->hIdx, zName, zIdx);
        }
        sqlite3_free(zName);
        sqlite3_free(zIdx);
@@ -1286,7 +1223,7 @@ static int idxProcessOneTrigger(
  IdxTable *pTab = pWrite->pTab;
  const char *zTab = pTab->zName;
  const char *zSql = 
-    "SELECT 'CREATE TEMP' || substr(sql, 7) FROM sqlite_schema "
+    "SELECT 'CREATE TEMP' || substr(sql, 7) FROM sqlite_master "
    "WHERE tbl_name = %Q AND type IN ('table', 'trigger') "
    "ORDER BY type;";
  sqlite3_stmt *pSelect = 0;
@@ -1386,12 +1323,12 @@ static int idxCreateVtabSchema(sqlite3expert *p, char **pzErrmsg){
  **   2) Create the equivalent virtual table in dbv.
  */
  rc = idxPrepareStmt(p->db, &pSchema, pzErrmsg,
-      "SELECT type, name, sql, 1 FROM sqlite_schema "
+      "SELECT type, name, sql, 1 FROM sqlite_master "
      "WHERE type IN ('table','view') AND name NOT LIKE 'sqlite_%%' "
      " UNION ALL "
-      "SELECT type, name, sql, 2 FROM sqlite_schema "
+      "SELECT type, name, sql, 2 FROM sqlite_master "
      "WHERE type = 'trigger'"
-      "  AND tbl_name IN(SELECT name FROM sqlite_schema WHERE type = 'view') "
+      "  AND tbl_name IN(SELECT name FROM sqlite_master WHERE type = 'view') "
      "ORDER BY 4, 1"
  );
  while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pSchema) ){
@@ -1561,7 +1498,7 @@ static int idxLargestIndex(sqlite3 *db, int *pnMax, char **pzErr){
  int rc = SQLITE_OK;
  const char *zMax = 
    "SELECT max(i.seqno) FROM "
-    "  sqlite_schema AS s, "
+    "  sqlite_master AS s, "
    "  pragma_index_list(s.name) AS l, "
    "  pragma_index_info(l.name) AS i "
    "WHERE s.type = 'table'";
@@ -1714,7 +1651,7 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){

  const char *zAllIndex =
    "SELECT s.rowid, s.name, l.name FROM "
-    "  sqlite_schema AS s, "
+    "  sqlite_master AS s, "
    "  pragma_index_list(s.name) AS l "
    "WHERE s.type = 'table'";
  const char *zIndexXInfo = 
@@ -1782,15 +1719,13 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){
  idxFinalize(&rc, pIndexXInfo);
  idxFinalize(&rc, pWrite);

-  if( pCtx ){
-    for(i=0; i<pCtx->nSlot; i++){
-      sqlite3_free(pCtx->aSlot[i].z);
-    }
-    sqlite3_free(pCtx);
+  for(i=0; i<pCtx->nSlot; i++){
+    sqlite3_free(pCtx->aSlot[i].z);
  }
+  sqlite3_free(pCtx);

  if( rc==SQLITE_OK ){
-    rc = sqlite3_exec(p->dbm, "ANALYZE sqlite_schema", 0, 0, 0);
+    rc = sqlite3_exec(p->dbm, "ANALYZE sqlite_master", 0, 0, 0);
  }

  sqlite3_exec(p->db, "DROP TABLE IF EXISTS temp."UNIQUE_TABLE_NAME,0,0,0);
@@ -1829,7 +1764,7 @@ sqlite3expert *sqlite3_expert_new(sqlite3 *db, char **pzErrmsg){
  if( rc==SQLITE_OK ){
    sqlite3_stmt *pSql;
    rc = idxPrintfPrepareStmt(pNew->db, &pSql, pzErrmsg, 
-        "SELECT sql FROM sqlite_schema WHERE name NOT LIKE 'sqlite_%%'"
+        "SELECT sql FROM sqlite_master WHERE name NOT LIKE 'sqlite_%%'"
        " AND sql NOT LIKE 'CREATE VIRTUAL %%'"
    );
    while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pSql) ){
@@ -1940,10 +1875,6 @@ int sqlite3_expert_analyze(sqlite3expert *p, char **pzErr){
  /* Create candidate indexes within the in-memory database file */
  if( rc==SQLITE_OK ){
    rc = idxCreateCandidates(p);
-  }else if ( rc==SQLITE_BUSY_TIMEOUT ){
-    if( pzErr )
-      *pzErr = sqlite3_mprintf("Cannot find a unique index name to propose.");
-    return rc;
  }

  /* Generate the stat1 data */
@@ -174,3 +174,5 @@ EXTERNAL CONTENT FTS4 TABLES
  only be useful if the full-text index has somehow become corrupt. It is an
  error to attempt to rebuild the full-text index maintained by a contentless
  FTS4 table.
+
+
@@ -313,15 +313,20 @@ static int fts3EvalStart(Fts3Cursor *pCsr);
 static int fts3TermSegReaderCursor(
    Fts3Cursor *, const char *, int, int, Fts3MultiSegReader **);

+#ifndef SQLITE_AMALGAMATION
+# if defined(SQLITE_DEBUG)
+int sqlite3Fts3Always(int b) { assert( b ); return b; }
+int sqlite3Fts3Never(int b)  { assert( !b ); return b; }
+# endif
+#endif
+
 /*
 ** This variable is set to false when running tests for which the on disk
 ** structures should not be corrupt. Otherwise, true. If it is false, extra
 ** assert() conditions in the fts3 code are activated - conditions that are
 ** only true if it is guaranteed that the fts3 database is not corrupt.
 */
-#ifdef SQLITE_DEBUG
 int sqlite3_fts3_may_be_corrupt = 1;
-#endif

 /* 
 ** Write a 64-bit variable-length integer to memory starting at p[0].
@@ -1892,7 +1897,7 @@ static int fts3ScanInteriorNode(
  char *zBuffer = 0;              /* Buffer to load terms into */
  i64 nAlloc = 0;                 /* Size of allocated buffer */
  int isFirstTerm = 1;            /* True when processing first term on page */
-  u64 iChild;                     /* Block id of child node to descend to */
+  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 
@@ -1908,8 +1913,8 @@ static int fts3ScanInteriorNode(
  ** table, then there are always 20 bytes of zeroed padding following the
  ** nNode bytes of content (see sqlite3Fts3ReadBlock() for details).
  */
-  zCsr += sqlite3Fts3GetVarintU(zCsr, &iChild);
-  zCsr += sqlite3Fts3GetVarintU(zCsr, &iChild);
+  zCsr += sqlite3Fts3GetVarint(zCsr, &iChild);
+  zCsr += sqlite3Fts3GetVarint(zCsr, &iChild);
  if( zCsr>zEnd ){
    return FTS_CORRUPT_VTAB;
  }
@@ -1962,20 +1967,20 @@ static int fts3ScanInteriorNode(
    */
    cmp = memcmp(zTerm, zBuffer, (nBuffer>nTerm ? nTerm : nBuffer));
    if( piFirst && (cmp<0 || (cmp==0 && nBuffer>nTerm)) ){
-      *piFirst = (i64)iChild;
+      *piFirst = iChild;
      piFirst = 0;
    }

    if( piLast && cmp<0 ){
-      *piLast = (i64)iChild;
+      *piLast = iChild;
      piLast = 0;
    }

    iChild++;
  };

-  if( piFirst ) *piFirst = (i64)iChild;
-  if( piLast ) *piLast = (i64)iChild;
+  if( piFirst ) *piFirst = iChild;
+  if( piLast ) *piLast = iChild;

 finish_scan:
  sqlite3_free(zBuffer);
@@ -2063,7 +2068,7 @@ static void fts3PutDeltaVarint(
  sqlite3_int64 *piPrev,          /* IN/OUT: Previous value written to list */
  sqlite3_int64 iVal              /* Write this value to the list */
 ){
-  assert_fts3_nc( iVal-*piPrev > 0 || (*piPrev==0 && iVal==0) );
+  assert( iVal-*piPrev > 0 || (*piPrev==0 && iVal==0) );
  *pp += sqlite3Fts3PutVarint(*pp, iVal-*piPrev);
  *piPrev = iVal;
 }
@@ -2262,9 +2267,6 @@ static int fts3PoslistMerge(
      */
      fts3GetDeltaVarint(&p1, &i1);
      fts3GetDeltaVarint(&p2, &i2);
-      if( i1<2 || i2<2 ){
-        break;
-      }
      do {
        fts3PutDeltaVarint(&p, &iPrev, (i1<i2) ? i1 : i2); 
        iPrev -= 2;
@@ -2333,7 +2335,7 @@ static int fts3PoslistPhraseMerge(
  /* Never set both isSaveLeft and isExact for the same invocation. */
  assert( isSaveLeft==0 || isExact==0 );

-  assert_fts3_nc( p!=0 && *p1!=0 && *p2!=0 );
+  assert( p!=0 && *p1!=0 && *p2!=0 );
  if( *p1==POS_COLUMN ){ 
    p1++;
    p1 += fts3GetVarint32(p1, &iCol1);
@@ -3474,7 +3476,7 @@ static int fts3ColumnMethod(
        break;
      }else{
        iCol = p->nColumn;
-        /* no break */ deliberate_fall_through
+        /* fall-through */
      }

    default:
@@ -3581,20 +3583,14 @@ static int fts3SetHasStat(Fts3Table *p){
 */
 static int fts3BeginMethod(sqlite3_vtab *pVtab){
  Fts3Table *p = (Fts3Table*)pVtab;
-  int rc;
  UNUSED_PARAMETER(pVtab);
  assert( p->pSegments==0 );
  assert( p->nPendingData==0 );
  assert( p->inTransaction!=1 );
+  TESTONLY( p->inTransaction = 1 );
+  TESTONLY( p->mxSavepoint = -1; );
  p->nLeafAdd = 0;
-  rc = fts3SetHasStat(p);
-#ifdef SQLITE_DEBUG
-  if( rc==SQLITE_OK ){
-    p->inTransaction = 1;
-    p->mxSavepoint = -1;
-  }
-#endif
-  return rc;
+  return fts3SetHasStat(p);
 }

 /*
@@ -3723,13 +3719,9 @@ static void fts3SnippetFunc(

  switch( nVal ){
    case 6: nToken = sqlite3_value_int(apVal[5]);
-            /* no break */ deliberate_fall_through
    case 5: iCol = sqlite3_value_int(apVal[4]);
-            /* no break */ deliberate_fall_through
    case 4: zEllipsis = (const char*)sqlite3_value_text(apVal[3]);
-            /* no break */ deliberate_fall_through
    case 3: zEnd = (const char*)sqlite3_value_text(apVal[2]);
-            /* no break */ deliberate_fall_through
    case 2: zStart = (const char*)sqlite3_value_text(apVal[1]);
  }
  if( !zEllipsis || !zEnd || !zStart ){
@@ -4528,7 +4520,7 @@ void sqlite3Fts3DoclistNext(

  assert( nDoclist>0 );
  assert( *pbEof==0 );
-  assert_fts3_nc( p || *piDocid==0 );
+  assert( p || *piDocid==0 );
  assert( !p || (p>=aDoclist && p<=&aDoclist[nDoclist]) );

  if( p==0 ){
@@ -5123,15 +5115,16 @@ static int fts3EvalStart(Fts3Cursor *pCsr){
 #ifndef SQLITE_DISABLE_FTS4_DEFERRED
  if( rc==SQLITE_OK && nToken>1 && pTab->bFts4 ){
    Fts3TokenAndCost *aTC;
+    Fts3Expr **apOr;
    aTC = (Fts3TokenAndCost *)sqlite3_malloc64(
        sizeof(Fts3TokenAndCost) * nToken
      + sizeof(Fts3Expr *) * nOr * 2
    );
+    apOr = (Fts3Expr **)&aTC[nToken];

    if( !aTC ){
      rc = SQLITE_NOMEM;
    }else{
-      Fts3Expr **apOr = (Fts3Expr **)&aTC[nToken];
      int ii;
      Fts3TokenAndCost *pTC = aTC;
      Fts3Expr **ppOr = apOr;
@@ -5177,7 +5170,7 @@ static void fts3EvalInvalidatePoslist(Fts3Phrase *pPhrase){
 **
 ** Parameter nNear is passed the NEAR distance of the expression (5 in
 ** the example above). When this function is called, *paPoslist points to
-** the position list, and *pnToken is the number of phrase tokens in the
+** the position list, and *pnToken is the number of phrase tokens in, the
 ** phrase on the other side of the NEAR operator to pPhrase. For example,
 ** if pPhrase refers to the "def ghi" phrase, then *paPoslist points to
 ** the position list associated with phrase "abc".
@@ -5212,12 +5205,10 @@ static int fts3EvalNearTrim(
  );
  if( res ){
    nNew = (int)(pOut - pPhrase->doclist.pList) - 1;
-    assert_fts3_nc( nNew<=pPhrase->doclist.nList && nNew>0 );
-    if( nNew>=0 && nNew<=pPhrase->doclist.nList ){
-      assert( pPhrase->doclist.pList[nNew]=='\0' );
-      memset(&pPhrase->doclist.pList[nNew], 0, pPhrase->doclist.nList - nNew);
-      pPhrase->doclist.nList = nNew;
-    }
+    assert( pPhrase->doclist.pList[nNew]=='\0' );
+    assert( nNew<=pPhrase->doclist.nList && nNew>0 );
+    memset(&pPhrase->doclist.pList[nNew], 0, pPhrase->doclist.nList - nNew);
+    pPhrase->doclist.nList = nNew;
    *paPoslist = pPhrase->doclist.pList;
    *pnToken = pPhrase->nToken;
  }
@@ -5337,8 +5328,8 @@ static void fts3EvalNextRow(
        Fts3Expr *pRight = pExpr->pRight;
        sqlite3_int64 iCmp = DOCID_CMP(pLeft->iDocid, pRight->iDocid);

-        assert_fts3_nc( pLeft->bStart || pLeft->iDocid==pRight->iDocid );
-        assert_fts3_nc( pRight->bStart || pLeft->iDocid==pRight->iDocid );
+        assert( pLeft->bStart || pLeft->iDocid==pRight->iDocid );
+        assert( pRight->bStart || pLeft->iDocid==pRight->iDocid );

        if( pRight->bEof || (pLeft->bEof==0 && iCmp<0) ){
          fts3EvalNextRow(pCsr, pLeft, pRc);
@@ -5569,10 +5560,7 @@ static int fts3EvalTestExpr(
        }else
 #endif
        {
-          bHit = ( 
-              pExpr->bEof==0 && pExpr->iDocid==pCsr->iPrevId
-           && pExpr->pPhrase->doclist.nList>0
-          );
+          bHit = (pExpr->bEof==0 && pExpr->iDocid==pCsr->iPrevId);
        }
        break;
      }
@@ -5835,8 +5823,7 @@ static int fts3EvalGatherStats(
      fts3EvalRestart(pCsr, pRoot, &rc);
      do {
        fts3EvalNextRow(pCsr, pRoot, &rc);
-        assert_fts3_nc( pRoot->bEof==0 );
-        if( pRoot->bEof ) rc = FTS_CORRUPT_VTAB;
+        assert( pRoot->bEof==0 );
      }while( pRoot->iDocid!=iDocid && rc==SQLITE_OK );
    }
  }
@@ -134,7 +134,7 @@ SQLITE_EXTENSION_INIT3
 ** is used for assert() conditions that are true only if it can be 
 ** guranteed that the database is not corrupt.
 */
-#ifdef SQLITE_DEBUG
+#if defined(SQLITE_DEBUG) || defined(SQLITE_TEST)
 extern int sqlite3_fts3_may_be_corrupt;
 # define assert_fts3_nc(x) assert(sqlite3_fts3_may_be_corrupt || (x))
 #else
@@ -151,18 +151,17 @@ extern int sqlite3_fts3_may_be_corrupt;
 ** Macros indicating that conditional expressions are always true or
 ** false.
 */
-#if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
-# define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1
-#endif
-#if defined(SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS)
-# define ALWAYS(X)      (1)
-# define NEVER(X)       (0)
-#elif !defined(NDEBUG)
-# define ALWAYS(X)      ((X)?1:(assert(0),0))
-# define NEVER(X)       ((X)?(assert(0),1):0)
+#ifdef SQLITE_COVERAGE_TEST
+# define ALWAYS(x) (1)
+# define NEVER(X)  (0)
+#elif defined(SQLITE_DEBUG)
+# define ALWAYS(x) sqlite3Fts3Always((x)!=0)
+# define NEVER(x) sqlite3Fts3Never((x)!=0)
+int sqlite3Fts3Always(int b);
+int sqlite3Fts3Never(int b);
 #else
-# define ALWAYS(X)      (X)
-# define NEVER(X)       (X)
+# define ALWAYS(x) (x)
+# define NEVER(x)  (x)
 #endif

 /*
@@ -200,8 +199,6 @@ typedef sqlite3_int64 i64;        /* 8-byte signed integer */
 #define LARGEST_INT64  (0xffffffff|(((i64)0x7fffffff)<<32))
 #define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64)

-#define deliberate_fall_through
-
 #endif /* SQLITE_AMALGAMATION */

 #ifdef SQLITE_DEBUG
@@ -621,7 +618,6 @@ void sqlite3Fts3ExprFree(Fts3Expr *);
 int sqlite3Fts3ExprInitTestInterface(sqlite3 *db, Fts3Hash*);
 int sqlite3Fts3InitTerm(sqlite3 *db);
 #endif
-void *sqlite3Fts3MallocZero(i64 nByte);

 int sqlite3Fts3OpenTokenizer(sqlite3_tokenizer *, int, const char *, int,
  sqlite3_tokenizer_cursor **
@@ -406,7 +406,6 @@ static int fts3auxFilterMethod(
  sqlite3Fts3SegReaderFinish(&pCsr->csr);
  sqlite3_free((void *)pCsr->filter.zTerm);
  sqlite3_free(pCsr->aStat);
-  sqlite3_free(pCsr->zStop);
  memset(&pCsr->csr, 0, ((u8*)&pCsr[1]) - (u8*)&pCsr->csr);

  pCsr->filter.flags = FTS3_SEGMENT_REQUIRE_POS|FTS3_SEGMENT_IGNORE_EMPTY;
@@ -122,7 +122,7 @@ static int fts3isspace(char c){
 ** zero the memory before returning a pointer to it. If unsuccessful, 
 ** return NULL.
 */
-void *sqlite3Fts3MallocZero(sqlite3_int64 nByte){
+static void *fts3MallocZero(sqlite3_int64 nByte){
  void *pRet = sqlite3_malloc64(nByte);
  if( pRet ) memset(pRet, 0, nByte);
  return pRet;
@@ -203,7 +203,7 @@ static int getNextToken(
    rc = pModule->xNext(pCursor, &zToken, &nToken, &iStart, &iEnd, &iPosition);
    if( rc==SQLITE_OK ){
      nByte = sizeof(Fts3Expr) + sizeof(Fts3Phrase) + nToken;
-      pRet = (Fts3Expr *)sqlite3Fts3MallocZero(nByte);
+      pRet = (Fts3Expr *)fts3MallocZero(nByte);
      if( !pRet ){
        rc = SQLITE_NOMEM;
      }else{
@@ -458,7 +458,7 @@ static int getNextNode(
      if( fts3isspace(cNext) 
       || cNext=='"' || cNext=='(' || cNext==')' || cNext==0
      ){
-        pRet = (Fts3Expr *)sqlite3Fts3MallocZero(sizeof(Fts3Expr));
+        pRet = (Fts3Expr *)fts3MallocZero(sizeof(Fts3Expr));
        if( !pRet ){
          return SQLITE_NOMEM;
        }
@@ -493,11 +493,6 @@ static int getNextNode(
    if( *zInput=='(' ){
      int nConsumed = 0;
      pParse->nNest++;
-#if !defined(SQLITE_MAX_EXPR_DEPTH)
-      if( pParse->nNest>1000 ) return SQLITE_ERROR;
-#elif SQLITE_MAX_EXPR_DEPTH>0
-      if( pParse->nNest>SQLITE_MAX_EXPR_DEPTH ) return SQLITE_ERROR;
-#endif
      rc = fts3ExprParse(pParse, zInput+1, nInput-1, ppExpr, &nConsumed);
      *pnConsumed = (int)(zInput - z) + 1 + nConsumed;
      return rc;
@@ -637,7 +632,7 @@ static int fts3ExprParse(
            && p->eType==FTSQUERY_PHRASE && pParse->isNot 
        ){
          /* Create an implicit NOT operator. */
-          Fts3Expr *pNot = sqlite3Fts3MallocZero(sizeof(Fts3Expr));
+          Fts3Expr *pNot = fts3MallocZero(sizeof(Fts3Expr));
          if( !pNot ){
            sqlite3Fts3ExprFree(p);
            rc = SQLITE_NOMEM;
@@ -671,7 +666,7 @@ static int fts3ExprParse(
            /* Insert an implicit AND operator. */
            Fts3Expr *pAnd;
            assert( pRet && pPrev );
-            pAnd = sqlite3Fts3MallocZero(sizeof(Fts3Expr));
+            pAnd = fts3MallocZero(sizeof(Fts3Expr));
            if( !pAnd ){
              sqlite3Fts3ExprFree(p);
              rc = SQLITE_NOMEM;
@@ -17,10 +17,6 @@
 #include <string.h>
 #include <assert.h>

-#ifndef SQLITE_AMALGAMATION
-typedef sqlite3_int64 i64;
-#endif
-
 /*
 ** Characters that may appear in the second argument to matchinfo().
 */
@@ -71,9 +67,9 @@ struct SnippetIter {
 struct SnippetPhrase {
  int nToken;                     /* Number of tokens in phrase */
  char *pList;                    /* Pointer to start of phrase position list */
-  i64 iHead;                      /* Next value in position list */
+  int iHead;                      /* Next value in position list */
  char *pHead;                    /* Position list data following iHead */
-  i64 iTail;                      /* Next value in trailing position list */
+  int iTail;                      /* Next value in trailing position list */
  char *pTail;                    /* Position list data following iTail */
 };

@@ -138,8 +134,9 @@ static MatchinfoBuffer *fts3MIBufferNew(size_t nElem, const char *zMatchinfo){
                           + sizeof(MatchinfoBuffer);
  sqlite3_int64 nStr = strlen(zMatchinfo);

-  pRet = sqlite3Fts3MallocZero(nByte + nStr+1);
+  pRet = sqlite3_malloc64(nByte + nStr+1);
  if( pRet ){
+    memset(pRet, 0, nByte);
    pRet->aMatchinfo[0] = (u8*)(&pRet->aMatchinfo[1]) - (u8*)pRet;
    pRet->aMatchinfo[1+nElem] = pRet->aMatchinfo[0]
                                      + sizeof(u32)*((int)nElem+1);
@@ -237,7 +234,7 @@ void sqlite3Fts3MIBufferFree(MatchinfoBuffer *p){
 ** After it returns, *piPos contains the value of the next element of the
 ** list and *pp is advanced to the following varint.
 */
-static void fts3GetDeltaPosition(char **pp, i64 *piPos){
+static void fts3GetDeltaPosition(char **pp, int *piPos){
  int iVal;
  *pp += fts3GetVarint32(*pp, &iVal);
  *piPos += (iVal-2);
@@ -346,10 +343,10 @@ static int fts3ExprPhraseCount(Fts3Expr *pExpr){
 ** arguments so that it points to the first element with a value greater
 ** than or equal to parameter iNext.
 */
-static void fts3SnippetAdvance(char **ppIter, i64 *piIter, int iNext){
+static void fts3SnippetAdvance(char **ppIter, int *piIter, int iNext){
  char *pIter = *ppIter;
  if( pIter ){
-    i64 iIter = *piIter;
+    int iIter = *piIter;

    while( iIter<iNext ){
      if( 0==(*pIter & 0xFE) ){
@@ -432,7 +429,7 @@ static void fts3SnippetDetails(
    SnippetPhrase *pPhrase = &pIter->aPhrase[i];
    if( pPhrase->pTail ){
      char *pCsr = pPhrase->pTail;
-      i64 iCsr = pPhrase->iTail;
+      int iCsr = pPhrase->iTail;

      while( iCsr<(iStart+pIter->nSnippet) && iCsr>=iStart ){
        int j;
@@ -478,7 +475,7 @@ static int fts3SnippetFindPositions(Fts3Expr *pExpr, int iPhrase, void *ctx){
  rc = sqlite3Fts3EvalPhrasePoslist(p->pCsr, pExpr, p->iCol, &pCsr);
  assert( rc==SQLITE_OK || pCsr==0 );
  if( pCsr ){
-    i64 iFirst = 0;
+    int iFirst = 0;
    pPhrase->pList = pCsr;
    fts3GetDeltaPosition(&pCsr, &iFirst);
    if( iFirst<0 ){
@@ -543,10 +540,11 @@ static int fts3BestSnippet(
  ** the required space using malloc().
  */
  nByte = sizeof(SnippetPhrase) * nList;
-  sIter.aPhrase = (SnippetPhrase *)sqlite3Fts3MallocZero(nByte);
+  sIter.aPhrase = (SnippetPhrase *)sqlite3_malloc64(nByte);
  if( !sIter.aPhrase ){
    return SQLITE_NOMEM;
  }
+  memset(sIter.aPhrase, 0, nByte);

  /* Initialize the contents of the SnippetIter object. Then iterate through
  ** the set of phrases in the expression to populate the aPhrase[] array.
@@ -1110,12 +1108,10 @@ static int fts3MatchinfoLcsCb(
 ** position list for the next column.
 */
 static int fts3LcsIteratorAdvance(LcsIterator *pIter){
-  char *pRead;
+  char *pRead = pIter->pRead;
  sqlite3_int64 iRead;
  int rc = 0;

-  if( NEVER(pIter==0) ) return 1;
-  pRead = pIter->pRead;
  pRead += sqlite3Fts3GetVarint(pRead, &iRead);
  if( iRead==0 || iRead==1 ){
    pRead = 0;
@@ -1149,8 +1145,9 @@ static int fts3MatchinfoLcs(Fts3Cursor *pCsr, MatchInfo *pInfo){
  /* Allocate and populate the array of LcsIterator objects. The array
  ** contains one element for each matchable phrase in the query.
  **/
-  aIter = sqlite3Fts3MallocZero(sizeof(LcsIterator) * pCsr->nPhrase);
+  aIter = sqlite3_malloc64(sizeof(LcsIterator) * pCsr->nPhrase);
  if( !aIter ) return SQLITE_NOMEM;
+  memset(aIter, 0, sizeof(LcsIterator) * pCsr->nPhrase);
  (void)fts3ExprIterate(pCsr->pExpr, fts3MatchinfoLcsCb, (void*)aIter);

  for(i=0; i<pInfo->nPhrase; i++){
@@ -1542,8 +1539,8 @@ typedef struct TermOffsetCtx TermOffsetCtx;

 struct TermOffset {
  char *pList;                    /* Position-list */
-  i64 iPos;                       /* Position just read from pList */
-  i64 iOff;                       /* Offset of this term from read positions */
+  int iPos;                       /* Position just read from pList */
+  int iOff;                       /* Offset of this term from read positions */
 };

 struct TermOffsetCtx {
@@ -1562,7 +1559,7 @@ static int fts3ExprTermOffsetInit(Fts3Expr *pExpr, int iPhrase, void *ctx){
  int nTerm;                      /* Number of tokens in phrase */
  int iTerm;                      /* For looping through nTerm phrase terms */
  char *pList;                    /* Pointer to position list for phrase */
-  i64 iPos = 0;                   /* First position in position-list */
+  int iPos = 0;                   /* First position in position-list */
  int rc;

  UNUSED_PARAMETER(iPhrase);
@@ -1611,7 +1608,7 @@ void sqlite3Fts3Offsets(
  if( rc!=SQLITE_OK ) goto offsets_out;

  /* Allocate the array of TermOffset iterators. */
-  sCtx.aTerm = (TermOffset *)sqlite3Fts3MallocZero(sizeof(TermOffset)*nToken);
+  sCtx.aTerm = (TermOffset *)sqlite3_malloc64(sizeof(TermOffset)*nToken);
  if( 0==sCtx.aTerm ){
    rc = SQLITE_NOMEM;
    goto offsets_out;
@@ -585,7 +585,6 @@ static int SQLITE_TCLAPI fts3_may_be_corrupt(
  int objc,
  Tcl_Obj *CONST objv[]
 ){
-#ifdef SQLITE_DEBUG
  int bOld = sqlite3_fts3_may_be_corrupt;

  if( objc!=2 && objc!=1 ){
@@ -599,7 +598,6 @@ static int SQLITE_TCLAPI fts3_may_be_corrupt(
  }

  Tcl_SetObjResult(interp, Tcl_NewIntObj(bOld));
-#endif
  return TCL_OK;
 }

@@ -188,8 +188,7 @@ static int fts3tokConnectMethod(

  assert( (rc==SQLITE_OK)==(pMod!=0) );
  if( rc==SQLITE_OK ){
-    const char * const *azArg = 0;
-    if( nDequote>1 ) azArg = (const char * const *)&azDequote[1];
+    const char * const *azArg = (const char * const *)&azDequote[1];
    rc = pMod->xCreate((nDequote>1 ? nDequote-1 : 0), azArg, &pTok);
  }

@@ -285,7 +285,6 @@ static int unicodeOpen(
  pCsr->aInput = (const unsigned char *)aInput;
  if( aInput==0 ){
    pCsr->nInput = 0;
-    pCsr->aInput = (const unsigned char*)"";
  }else if( nInput<0 ){
    pCsr->nInput = (int)strlen(aInput);
  }else{
@@ -341,9 +341,7 @@ static int fts3SqlStmt(
 ** created by merging the oldest :2 segments from absolute level :1. See 
 ** function sqlite3Fts3Incrmerge() for details.  */
 /* 29 */ "SELECT 2 * total(1 + leaves_end_block - start_block) "
-         "  FROM (SELECT * FROM %Q.'%q_segdir' "
-         "        WHERE level = ? ORDER BY idx ASC LIMIT ?"
-         "  )",
+         "  FROM %Q.'%q_segdir' WHERE level = ? AND idx < ?",

 /* SQL_DELETE_SEGDIR_ENTRY
 **   Delete the %_segdir entry on absolute level :1 with index :2.  */
@@ -1335,18 +1333,8 @@ static int fts3SegReaderNext(
        char *aCopy;
        PendingList *pList = (PendingList *)fts3HashData(pElem);
        int nCopy = pList->nData+1;
-
-        int nTerm = fts3HashKeysize(pElem);
-        if( (nTerm+1)>pReader->nTermAlloc ){
-          sqlite3_free(pReader->zTerm);
-          pReader->zTerm = (char*)sqlite3_malloc((nTerm+1)*2);
-          if( !pReader->zTerm ) return SQLITE_NOMEM;
-          pReader->nTermAlloc = (nTerm+1)*2;
-        }
-        memcpy(pReader->zTerm, fts3HashKey(pElem), nTerm);
-        pReader->zTerm[nTerm] = '\0';
-        pReader->nTerm = nTerm;
-
+        pReader->zTerm = (char *)fts3HashKey(pElem);
+        pReader->nTerm = fts3HashKeysize(pElem);
        aCopy = (char*)sqlite3_malloc(nCopy);
        if( !aCopy ) return SQLITE_NOMEM;
        memcpy(aCopy, pList->aData, nCopy);
@@ -1599,7 +1587,9 @@ int sqlite3Fts3MsrOvfl(
 */
 void sqlite3Fts3SegReaderFree(Fts3SegReader *pReader){
  if( pReader ){
-    sqlite3_free(pReader->zTerm);
+    if( !fts3SegReaderIsPending(pReader) ){
+      sqlite3_free(pReader->zTerm);
+    }
    if( !fts3SegReaderIsRootOnly(pReader) ){
      sqlite3_free(pReader->aNode);
    }
@@ -1815,7 +1805,7 @@ static int fts3SegReaderCmp(Fts3SegReader *pLhs, Fts3SegReader *pRhs){
  if( rc==0 ){
    rc = pRhs->iIdx - pLhs->iIdx;
  }
-  assert_fts3_nc( rc!=0 );
+  assert( rc!=0 );
  return rc;
 }

@@ -2011,8 +2001,8 @@ static int fts3PrefixCompress(
  int nNext                       /* Size of buffer zNext in bytes */
 ){
  int n;
-  for(n=0; n<nPrev && n<nNext && zPrev[n]==zNext[n]; n++);
-  assert_fts3_nc( n<nNext );
+  UNUSED_PARAMETER(nNext);
+  for(n=0; n<nPrev && zPrev[n]==zNext[n]; n++);
  return n;
 }

@@ -2863,19 +2853,6 @@ int sqlite3Fts3MsrIncrRestart(Fts3MultiSegReader *pCsr){
  return SQLITE_OK;
 }

-static int fts3GrowSegReaderBuffer(Fts3MultiSegReader *pCsr, int nReq){
-  if( nReq>pCsr->nBuffer ){
-    char *aNew;
-    pCsr->nBuffer = nReq*2;
-    aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer);
-    if( !aNew ){
-      return SQLITE_NOMEM;
-    }
-    pCsr->aBuffer = aNew;
-  }
-  return SQLITE_OK;
-}
-

 int sqlite3Fts3SegReaderStep(
  Fts3Table *p,                   /* Virtual table handle */
@@ -3010,9 +2987,15 @@ int sqlite3Fts3SegReaderStep(
          }

          nByte = sqlite3Fts3VarintLen(iDelta) + (isRequirePos?nList+1:0);
-
-          rc = fts3GrowSegReaderBuffer(pCsr, nByte+nDoclist+FTS3_NODE_PADDING);
-          if( rc ) return rc;
+          if( nDoclist+nByte>pCsr->nBuffer ){
+            char *aNew;
+            pCsr->nBuffer = (nDoclist+nByte)*2;
+            aNew = sqlite3_realloc(pCsr->aBuffer, pCsr->nBuffer);
+            if( !aNew ){
+              return SQLITE_NOMEM;
+            }
+            pCsr->aBuffer = aNew;
+          }

          if( isFirst ){
            char *a = &pCsr->aBuffer[nDoclist];
@@ -3037,9 +3020,6 @@ int sqlite3Fts3SegReaderStep(
        fts3SegReaderSort(apSegment, nMerge, j, xCmp);
      }
      if( nDoclist>0 ){
-        rc = fts3GrowSegReaderBuffer(pCsr, nDoclist+FTS3_NODE_PADDING);
-        if( rc ) return rc;
-        memset(&pCsr->aBuffer[nDoclist], 0, FTS3_NODE_PADDING);
        pCsr->aDoclist = pCsr->aBuffer;
        pCsr->nDoclist = nDoclist;
        rc = SQLITE_ROW;
@@ -3791,7 +3771,7 @@ static int nodeReaderNext(NodeReader *p){
      return FTS_CORRUPT_VTAB;
    }
    blobGrowBuffer(&p->term, nPrefix+nSuffix, &rc);
-    if( rc==SQLITE_OK && ALWAYS(p->term.a!=0) ){
+    if( rc==SQLITE_OK ){
      memcpy(&p->term.a[nPrefix], &p->aNode[p->iOff], nSuffix);
      p->term.n = nPrefix+nSuffix;
      p->iOff += nSuffix;
@@ -4185,11 +4165,7 @@ static int fts3TermCmp(
  int nCmp = MIN(nLhs, nRhs);
  int res;

-  if( nCmp && ALWAYS(zLhs) && ALWAYS(zRhs) ){
-    res = memcmp(zLhs, zRhs, nCmp);
-  }else{
-    res = 0;
-  }
+  res = (nCmp ? memcmp(zLhs, zRhs, nCmp) : 0);
  if( res==0 ) res = nLhs - nRhs;

  return res;
@@ -4312,7 +4288,7 @@ static int fts3IncrmergeLoad(
      int i;
      int nHeight = (int)aRoot[0];
      NodeWriter *pNode;
-      if( nHeight<1 || nHeight>=FTS_MAX_APPENDABLE_HEIGHT ){
+      if( nHeight<1 || nHeight>FTS_MAX_APPENDABLE_HEIGHT ){
        sqlite3_reset(pSelect);
        return FTS_CORRUPT_VTAB;
      }
@@ -4347,20 +4323,17 @@ static int fts3IncrmergeLoad(
          while( reader.aNode && rc==SQLITE_OK ) rc = nodeReaderNext(&reader);
          blobGrowBuffer(&pNode->key, reader.term.n, &rc);
          if( rc==SQLITE_OK ){
-            assert_fts3_nc( reader.term.n>0 || reader.aNode==0 );
-            if( reader.term.n>0 ){
-              memcpy(pNode->key.a, reader.term.a, reader.term.n);
-            }
+            memcpy(pNode->key.a, reader.term.a, reader.term.n);
            pNode->key.n = reader.term.n;
            if( i>0 ){
              char *aBlock = 0;
              int nBlock = 0;
              pNode = &pWriter->aNodeWriter[i-1];
              pNode->iBlock = reader.iChild;
-              rc = sqlite3Fts3ReadBlock(p, reader.iChild, &aBlock, &nBlock,0);
+              rc = sqlite3Fts3ReadBlock(p, reader.iChild, &aBlock, &nBlock, 0);
              blobGrowBuffer(&pNode->block, 
                  MAX(nBlock, p->nNodeSize)+FTS3_NODE_PADDING, &rc
-                  );
+              );
              if( rc==SQLITE_OK ){
                memcpy(pNode->block.a, aBlock, nBlock);
                pNode->block.n = nBlock;
@@ -4833,7 +4806,7 @@ static int fts3IncrmergeHintLoad(Fts3Table *p, Blob *pHint){
      if( aHint ){
        blobGrowBuffer(pHint, nHint, &rc);
        if( rc==SQLITE_OK ){
-          if( ALWAYS(pHint->a!=0) ) memcpy(pHint->a, aHint, nHint);
+          memcpy(pHint->a, aHint, nHint);
          pHint->n = nHint;
        }
      }
@@ -93,7 +93,7 @@ static int runSql(sqlite3 *db, const char *zFormat, ...){
 static void showSchema(sqlite3 *db, const char *zTab){
  sqlite3_stmt *pStmt;
  pStmt = prepare(db,
-            "SELECT sql FROM sqlite_schema"
+            "SELECT sql FROM sqlite_master"
            " WHERE name LIKE '%q%%'"
            " ORDER BY 1",
            zTab);
@@ -831,7 +831,7 @@ int main(int argc, char **argv){
    sqlite3_stmt *pStmt;
    int cnt = 0;
    pStmt = prepare(db, "SELECT b.sql"
-                        "  FROM sqlite_schema a, sqlite_schema b"
+                        "  FROM sqlite_master a, sqlite_master b"
                        " WHERE a.name GLOB '*_segdir'"
                        "   AND b.name=substr(a.name,1,length(a.name)-7)"
                        " ORDER BY 1");
@@ -742,7 +742,6 @@ proc print_categories {lMap} {
        }
        iTbl++;
      }
-      aAscii[0] = 0;                  /* 0x00 is never a token character */
    }
  }]
 }
@@ -35,20 +35,8 @@ typedef sqlite3_uint64 u64;
 #endif

 #define testcase(x)
-
-#if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
-# define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1
-#endif
-#if defined(SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS)
-# define ALWAYS(X)      (1)
-# define NEVER(X)       (0)
-#elif !defined(NDEBUG)
-# define ALWAYS(X)      ((X)?1:(assert(0),0))
-# define NEVER(X)       ((X)?(assert(0),1):0)
-#else
-# define ALWAYS(X)      (X)
-# define NEVER(X)       (X)
-#endif
+#define ALWAYS(x) 1
+#define NEVER(x) 0

 #define MIN(x,y) (((x) < (y)) ? (x) : (y))
 #define MAX(x,y) (((x) > (y)) ? (x) : (y))
@@ -108,7 +96,7 @@ extern int sqlite3_fts5_may_be_corrupt;
 ** A version of memcmp() that does not cause asan errors if one of the pointer
 ** parameters is NULL and the number of bytes to compare is zero.
 */
-#define fts5Memcmp(s1, s2, n) ((n)<=0 ? 0 : memcmp((s1), (s2), (n)))
+#define fts5Memcmp(s1, s2, n) ((n)==0 ? 0 : memcmp((s1), (s2), (n)))

 /* Mark a function parameter as unused, to suppress nuisance compiler
 ** warnings. */
@@ -196,7 +184,6 @@ struct Fts5Config {
  Fts5Tokenizer *pTok;
  fts5_tokenizer *pTokApi;
  int bLock;                      /* True when table is preparing statement */
-  int ePattern;                   /* FTS_PATTERN_XXX constant */

  /* Values loaded from the %_config table */
  int iCookie;                    /* Incremented when %_config is modified */
@@ -217,19 +204,17 @@ struct Fts5Config {
 };

 /* Current expected value of %_config table 'version' field */
-#define FTS5_CURRENT_VERSION  4
+#define FTS5_CURRENT_VERSION 4

 #define FTS5_CONTENT_NORMAL   0
 #define FTS5_CONTENT_NONE     1
 #define FTS5_CONTENT_EXTERNAL 2

-#define FTS5_DETAIL_FULL      0
-#define FTS5_DETAIL_NONE      1
-#define FTS5_DETAIL_COLUMNS   2
+#define FTS5_DETAIL_FULL    0
+#define FTS5_DETAIL_NONE    1
+#define FTS5_DETAIL_COLUMNS 2
+

-#define FTS5_PATTERN_NONE     0
-#define FTS5_PATTERN_LIKE     65  /* matches SQLITE_INDEX_CONSTRAINT_LIKE */
-#define FTS5_PATTERN_GLOB     66  /* matches SQLITE_INDEX_CONSTRAINT_GLOB */

 int sqlite3Fts5ConfigParse(
    Fts5Global*, sqlite3*, int, const char **, Fts5Config**, char**
@@ -447,9 +432,6 @@ void sqlite3Fts5IndexCloseReader(Fts5Index*);
 */
 const char *sqlite3Fts5IterTerm(Fts5IndexIter*, int*);
 int sqlite3Fts5IterNextScan(Fts5IndexIter*);
-void *sqlite3Fts5StructureRef(Fts5Index*);
-void sqlite3Fts5StructureRelease(void*);
-int sqlite3Fts5StructureTest(Fts5Index*, void*);


 /*
@@ -502,7 +484,7 @@ int sqlite3Fts5IndexSetAverages(Fts5Index *p, const u8*, int);
 /*
 ** Functions called by the storage module as part of integrity-check.
 */
-int sqlite3Fts5IndexIntegrityCheck(Fts5Index*, u64 cksum, int bUseCksum);
+int sqlite3Fts5IndexIntegrityCheck(Fts5Index*, u64 cksum);

 /* 
 ** Called during virtual module initialization to register UDF 
@@ -572,7 +554,8 @@ int sqlite3Fts5GetTokenizer(
  Fts5Global*, 
  const char **azArg,
  int nArg,
-  Fts5Config*,
+  Fts5Tokenizer**,
+  fts5_tokenizer**,
  char **pzErr
 );

@@ -656,7 +639,7 @@ int sqlite3Fts5StorageDelete(Fts5Storage *p, i64, sqlite3_value**);
 int sqlite3Fts5StorageContentInsert(Fts5Storage *p, sqlite3_value**, i64*);
 int sqlite3Fts5StorageIndexInsert(Fts5Storage *p, sqlite3_value**, i64);

-int sqlite3Fts5StorageIntegrity(Fts5Storage *p, int iArg);
+int sqlite3Fts5StorageIntegrity(Fts5Storage *p);

 int sqlite3Fts5StorageStmt(Fts5Storage *p, int eStmt, sqlite3_stmt**, char**);
 void sqlite3Fts5StorageStmtRelease(Fts5Storage *p, int eStmt, sqlite3_stmt*);
@@ -701,19 +684,11 @@ struct Fts5Token {
 /* Parse a MATCH expression. */
 int sqlite3Fts5ExprNew(
  Fts5Config *pConfig, 
-  int bPhraseToAnd,
  int iCol,                       /* Column on LHS of MATCH operator */
  const char *zExpr,
  Fts5Expr **ppNew, 
  char **pzErr
 );
-int sqlite3Fts5ExprPattern(
-  Fts5Config *pConfig, 
-  int bGlob, 
-  int iCol, 
-  const char *zText, 
-  Fts5Expr **pp
-);

 /*
 ** for(rc = sqlite3Fts5ExprFirst(pExpr, pIdx, bDesc);
@@ -822,10 +797,6 @@ int sqlite3Fts5AuxInit(fts5_api*);
 */

 int sqlite3Fts5TokenizerInit(fts5_api*);
-int sqlite3Fts5TokenizerPattern(
-    int (*xCreate)(void*, const char**, int, Fts5Tokenizer**),
-    Fts5Tokenizer *pTok
-);
 /*
 ** End of interface to code in fts5_tokenizer.c.
 **************************************************************************/
@@ -566,7 +566,7 @@ static int fts5Bm25GetData(
  int rc = SQLITE_OK;             /* Return code */
  Fts5Bm25Data *p;                /* Object to return */

-  p = (Fts5Bm25Data*)pApi->xGetAuxdata(pFts, 0);
+  p = pApi->xGetAuxdata(pFts, 0);
  if( p==0 ){
    int nPhrase;                  /* Number of phrases in query */
    sqlite3_int64 nRow = 0;       /* Number of rows in table */
@@ -640,7 +640,7 @@ static void fts5Bm25Function(
 ){
  const double k1 = 1.2;          /* Constant "k1" from BM25 formula */
  const double b = 0.75;          /* Constant "b" from BM25 formula */
-  int rc;                         /* Error code */
+  int rc = SQLITE_OK;             /* Error code */
  double score = 0.0;             /* SQL function return value */
  Fts5Bm25Data *pData;            /* Values allocated/calculated once only */
  int i;                          /* Iterator variable */
@@ -672,15 +672,17 @@ static void fts5Bm25Function(
    D = (double)nTok;
  }

-  /* Determine and return the BM25 score for the current row. Or, if an
-  ** error has occurred, throw an exception. */
+  /* Determine the BM25 score for the current row. */
+  for(i=0; rc==SQLITE_OK && i<pData->nPhrase; i++){
+    score += pData->aIDF[i] * (
+      ( aFreq[i] * (k1 + 1.0) ) / 
+      ( aFreq[i] + k1 * (1 - b + b * D / pData->avgdl) )
+    );
+  }
+  
+  /* If no error has occurred, return the calculated score. Otherwise,
+  ** throw an SQL exception.  */
  if( rc==SQLITE_OK ){
-    for(i=0; i<pData->nPhrase; i++){
-      score += pData->aIDF[i] * (
-          ( aFreq[i] * (k1 + 1.0) ) / 
-          ( aFreq[i] + k1 * (1 - b + b * D / pData->avgdl) )
-      );
-    }
    sqlite3_result_double(pCtx, -1.0 * score);
  }else{
    sqlite3_result_error_code(pCtx, rc);
@@ -66,6 +66,7 @@ void sqlite3Fts5BufferAppendBlob(
  u32 nData, 
  const u8 *pData
 ){
+  assert_nc( *pRc || nData>=0 );
  if( nData ){
    if( fts5BufferGrow(pRc, pBuf, nData) ) return;
    memcpy(&pBuf->p[pBuf->n], pData, nData);
@@ -175,7 +176,7 @@ int sqlite3Fts5PoslistNext64(
    return 1;  
  }else{
    i64 iOff = *piOff;
-    u32 iVal;
+    int iVal;
    fts5FastGetVarint32(a, i, iVal);
    if( iVal<=1 ){
      if( iVal==0 ){
@@ -184,19 +185,15 @@ int sqlite3Fts5PoslistNext64(
      }
      fts5FastGetVarint32(a, i, iVal);
      iOff = ((i64)iVal) << 32;
-      assert( iOff>=0 );
      fts5FastGetVarint32(a, i, iVal);
      if( iVal<2 ){
        /* This is a corrupt record. So stop parsing it here. */
        *piOff = -1;
        return 1;
      }
-      *piOff = iOff + ((iVal-2) & 0x7FFFFFFF);
-    }else{
-      *piOff = (iOff & (i64)0x7FFFFFFF<<32)+((iOff + (iVal-2)) & 0x7FFFFFFF);
    }
+    *piOff = iOff + ((iVal-2) & 0x7FFFFFFF);
    *pi = i;
-    assert_nc( *piOff>=iOff );
    return 0;
  }
 }
@@ -235,16 +232,14 @@ void sqlite3Fts5PoslistSafeAppend(
  i64 *piPrev, 
  i64 iPos
 ){
-  if( iPos>=*piPrev ){
-    static const i64 colmask = ((i64)(0x7FFFFFFF)) << 32;
-    if( (iPos & colmask) != (*piPrev & colmask) ){
-      pBuf->p[pBuf->n++] = 1;
-      pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos>>32));
-      *piPrev = (iPos & colmask);
-    }
-    pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos-*piPrev)+2);
-    *piPrev = iPos;
+  static const i64 colmask = ((i64)(0x7FFFFFFF)) << 32;
+  if( (iPos & colmask) != (*piPrev & colmask) ){
+    pBuf->p[pBuf->n++] = 1;
+    pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos>>32));
+    *piPrev = (iPos & colmask);
  }
+  pBuf->n += sqlite3Fts5PutVarint(&pBuf->p[pBuf->n], (iPos-*piPrev)+2);
+  *piPrev = iPos;
 }

 int sqlite3Fts5PoslistWriterAppend(
@@ -325,7 +325,7 @@ static int fts5ConfigParseSpecial(
          rc = SQLITE_ERROR;
        }else{
          rc = sqlite3Fts5GetTokenizer(pGlobal, 
-              (const char**)azArg, (int)nArg, pConfig,
+              (const char**)azArg, (int)nArg, &pConfig->pTok, &pConfig->pTokApi,
              pzErr
          );
        }
@@ -397,7 +397,9 @@ static int fts5ConfigParseSpecial(
 */
 static int fts5ConfigDefaultTokenizer(Fts5Global *pGlobal, Fts5Config *pConfig){
  assert( pConfig->pTok==0 && pConfig->pTokApi==0 );
-  return sqlite3Fts5GetTokenizer(pGlobal, 0, 0, pConfig, 0);
+  return sqlite3Fts5GetTokenizer(
+      pGlobal, 0, 0, &pConfig->pTok, &pConfig->pTokApi, 0
+  );
 }

 /*
@@ -537,7 +539,7 @@ int sqlite3Fts5ConfigParse(

  nByte = nArg * (sizeof(char*) + sizeof(u8));
  pRet->azCol = (char**)sqlite3Fts5MallocZero(&rc, nByte);
-  pRet->abUnindexed = pRet->azCol ? (u8*)&pRet->azCol[nArg] : 0;
+  pRet->abUnindexed = (u8*)&pRet->azCol[nArg];
  pRet->zDb = sqlite3Fts5Strndup(&rc, azArg[1], -1);
  pRet->zName = sqlite3Fts5Strndup(&rc, azArg[2], -1);
  pRet->bColumnsize = 1;
@@ -562,7 +564,6 @@ int sqlite3Fts5ConfigParse(
    z = fts5ConfigSkipWhitespace(z);
    if( z && *z=='=' ){
      bOption = 1;
-      assert( zOne!=0 );
      z++;
      if( bMustBeCol ) z = 0;
    }
@@ -579,11 +580,7 @@ int sqlite3Fts5ConfigParse(
        rc = SQLITE_ERROR;
      }else{
        if( bOption ){
-          rc = fts5ConfigParseSpecial(pGlobal, pRet, 
-            ALWAYS(zOne)?zOne:"",
-            zTwo?zTwo:"",
-            pzErr
-          );
+          rc = fts5ConfigParseSpecial(pGlobal, pRet, zOne, zTwo?zTwo:"", pzErr);
        }else{
          rc = fts5ConfigParseColumn(pRet, zOne, zTwo, pzErr);
          zOne = 0;
@@ -128,14 +128,12 @@ struct Fts5Parse {
  int nPhrase;                    /* Size of apPhrase array */
  Fts5ExprPhrase **apPhrase;      /* Array of all phrases */
  Fts5ExprNode *pExpr;            /* Result of a successful parse */
-  int bPhraseToAnd;               /* Convert "a+b" to "a AND b" */
 };

 void sqlite3Fts5ParseError(Fts5Parse *pParse, const char *zFmt, ...){
  va_list ap;
  va_start(ap, zFmt);
  if( pParse->rc==SQLITE_OK ){
-    assert( pParse->zErr==0 );
    pParse->zErr = sqlite3_vmprintf(zFmt, ap);
    pParse->rc = SQLITE_ERROR;
  }
@@ -218,7 +216,6 @@ static void fts5ParseFree(void *p){ sqlite3_free(p); }

 int sqlite3Fts5ExprNew(
  Fts5Config *pConfig,            /* FTS5 Configuration */
-  int bPhraseToAnd,
  int iCol,
  const char *zExpr,              /* Expression text */
  Fts5Expr **ppNew, 
@@ -234,7 +231,6 @@ int sqlite3Fts5ExprNew(
  *ppNew = 0;
  *pzErr = 0;
  memset(&sParse, 0, sizeof(sParse));
-  sParse.bPhraseToAnd = bPhraseToAnd;
  pEngine = sqlite3Fts5ParserAlloc(fts5ParseAlloc);
  if( pEngine==0 ){ return SQLITE_NOMEM; }
  sParse.pConfig = pConfig;
@@ -277,7 +273,6 @@ int sqlite3Fts5ExprNew(
      pNew->pConfig = pConfig;
      pNew->apExprPhrase = sParse.apPhrase;
      pNew->nPhrase = sParse.nPhrase;
-      pNew->bDesc = 0;
      sParse.apPhrase = 0;
    }
  }else{
@@ -289,81 +284,6 @@ int sqlite3Fts5ExprNew(
  return sParse.rc;
 }

-/*
-** This function is only called when using the special 'trigram' tokenizer.
-** Argument zText contains the text of a LIKE or GLOB pattern matched
-** against column iCol. This function creates and compiles an FTS5 MATCH
-** expression that will match a superset of the rows matched by the LIKE or
-** GLOB. If successful, SQLITE_OK is returned. Otherwise, an SQLite error
-** code.
-*/
-int sqlite3Fts5ExprPattern(
-  Fts5Config *pConfig, int bGlob, int iCol, const char *zText, Fts5Expr **pp
-){
-  i64 nText = strlen(zText);
-  char *zExpr = (char*)sqlite3_malloc64(nText*4 + 1);
-  int rc = SQLITE_OK;
-
-  if( zExpr==0 ){
-    rc = SQLITE_NOMEM;
-  }else{
-    char aSpec[3];
-    int iOut = 0;
-    int i = 0;
-    int iFirst = 0;
-
-    if( bGlob==0 ){
-      aSpec[0] = '_';
-      aSpec[1] = '%';
-      aSpec[2] = 0;
-    }else{
-      aSpec[0] = '*';
-      aSpec[1] = '?';
-      aSpec[2] = '[';
-    }
-
-    while( i<=nText ){
-      if( i==nText 
-       || zText[i]==aSpec[0] || zText[i]==aSpec[1] || zText[i]==aSpec[2] 
-      ){
-        if( i-iFirst>=3 ){
-          int jj;
-          zExpr[iOut++] = '"';
-          for(jj=iFirst; jj<i; jj++){
-            zExpr[iOut++] = zText[jj];
-            if( zText[jj]=='"' ) zExpr[iOut++] = '"';
-          }
-          zExpr[iOut++] = '"';
-          zExpr[iOut++] = ' ';
-        }
-        if( zText[i]==aSpec[2] ){
-          i += 2;
-          if( zText[i-1]=='^' ) i++;
-          while( i<nText && zText[i]!=']' ) i++;
-        }
-        iFirst = i+1;
-      }
-      i++;
-    }
-    if( iOut>0 ){
-      int bAnd = 0;
-      if( pConfig->eDetail!=FTS5_DETAIL_FULL ){
-        bAnd = 1;
-        if( pConfig->eDetail==FTS5_DETAIL_NONE ){
-          iCol = pConfig->nCol;
-        }
-      }
-      zExpr[iOut] = '\0';
-      rc = sqlite3Fts5ExprNew(pConfig, bAnd, iCol, zExpr, pp,pConfig->pzErrmsg);
-    }else{
-      *pp = 0;
-    }
-    sqlite3_free(zExpr);
-  }
-
-  return rc;
-}
-
 /*
 ** Free the expression node object passed as the only argument.
 */
@@ -434,7 +354,6 @@ static i64 fts5ExprSynonymRowid(Fts5ExprTerm *pTerm, int bDesc, int *pbEof){
  int bRetValid = 0;
  Fts5ExprTerm *p;

-  assert( pTerm );
  assert( pTerm->pSynonym );
  assert( bDesc==0 || bDesc==1 );
  for(p=pTerm; p; p=p->pSynonym){
@@ -1502,8 +1421,8 @@ int sqlite3Fts5ExprFirst(Fts5Expr *p, Fts5Index *pIdx, i64 iFirst, int bDesc){
  }

  /* If the iterator is not at a real match, skip forward until it is. */
-  while( pRoot->bNomatch && rc==SQLITE_OK ){
-    assert( pRoot->bEof==0 );
+  while( pRoot->bNomatch ){
+    assert( pRoot->bEof==0 && rc==SQLITE_OK );
    rc = fts5ExprNodeNext(p, pRoot, 0, 0);
  }
  return rc;
@@ -1742,20 +1661,6 @@ void sqlite3Fts5ParseFinished(Fts5Parse *pParse, Fts5ExprNode *p){
  pParse->pExpr = p;
 }

-static int parseGrowPhraseArray(Fts5Parse *pParse){
-  if( (pParse->nPhrase % 8)==0 ){
-    sqlite3_int64 nByte = sizeof(Fts5ExprPhrase*) * (pParse->nPhrase + 8);
-    Fts5ExprPhrase **apNew;
-    apNew = (Fts5ExprPhrase**)sqlite3_realloc64(pParse->apPhrase, nByte);
-    if( apNew==0 ){
-      pParse->rc = SQLITE_NOMEM;
-      return SQLITE_NOMEM;
-    }
-    pParse->apPhrase = apNew;
-  }
-  return SQLITE_OK;
-}
-
 /*
 ** This function is called by the parser to process a string token. The
 ** string may or may not be quoted. In any case it is tokenized and a
@@ -1791,9 +1696,16 @@ Fts5ExprPhrase *sqlite3Fts5ParseTerm(
  }else{

    if( pAppend==0 ){
-      if( parseGrowPhraseArray(pParse) ){
-        fts5ExprPhraseFree(sCtx.pPhrase);
-        return 0;
+      if( (pParse->nPhrase % 8)==0 ){
+        sqlite3_int64 nByte = sizeof(Fts5ExprPhrase*) * (pParse->nPhrase + 8);
+        Fts5ExprPhrase **apNew;
+        apNew = (Fts5ExprPhrase**)sqlite3_realloc64(pParse->apPhrase, nByte);
+        if( apNew==0 ){
+          pParse->rc = SQLITE_NOMEM;
+          fts5ExprPhraseFree(sCtx.pPhrase);
+          return 0;
+        }
+        pParse->apPhrase = apNew;
      }
      pParse->nPhrase++;
    }
@@ -1875,7 +1787,7 @@ int sqlite3Fts5ExprClonePhrase(
    sCtx.pPhrase = sqlite3Fts5MallocZero(&rc, sizeof(Fts5ExprPhrase));
  }

-  if( rc==SQLITE_OK && ALWAYS(sCtx.pPhrase) ){
+  if( rc==SQLITE_OK ){
    /* All the allocations succeeded. Put the expression object together. */
    pNew->pIndex = pExpr->pIndex;
    pNew->pConfig = pExpr->pConfig;
@@ -2146,8 +2058,9 @@ void sqlite3Fts5ParseSetColset(
 ){
  Fts5Colset *pFree = pColset;
  if( pParse->pConfig->eDetail==FTS5_DETAIL_NONE ){
-    sqlite3Fts5ParseError(pParse, 
-        "fts5: column queries are not supported (detail=none)"
+    pParse->rc = SQLITE_ERROR;
+    pParse->zErr = sqlite3_mprintf(
+      "fts5: column queries are not supported (detail=none)"
    );
  }else{
    fts5ParseSetColset(pParse, pExpr, pColset, &pFree);
@@ -2199,67 +2112,6 @@ static void fts5ExprAddChildren(Fts5ExprNode *p, Fts5ExprNode *pSub){
  }
 }

-/*
-** This function is used when parsing LIKE or GLOB patterns against
-** trigram indexes that specify either detail=column or detail=none.
-** It converts a phrase:
-**
-**     abc + def + ghi
-**
-** into an AND tree:
-**
-**     abc AND def AND ghi
-*/
-static Fts5ExprNode *fts5ParsePhraseToAnd(
-  Fts5Parse *pParse, 
-  Fts5ExprNearset *pNear
-){
-  int nTerm = pNear->apPhrase[0]->nTerm;
-  int ii;
-  int nByte;
-  Fts5ExprNode *pRet;
-
-  assert( pNear->nPhrase==1 );
-  assert( pParse->bPhraseToAnd );
-
-  nByte = sizeof(Fts5ExprNode) + nTerm*sizeof(Fts5ExprNode*);
-  pRet = (Fts5ExprNode*)sqlite3Fts5MallocZero(&pParse->rc, nByte);
-  if( pRet ){
-    pRet->eType = FTS5_AND;
-    pRet->nChild = nTerm;
-    fts5ExprAssignXNext(pRet);
-    pParse->nPhrase--;
-    for(ii=0; ii<nTerm; ii++){
-      Fts5ExprPhrase *pPhrase = (Fts5ExprPhrase*)sqlite3Fts5MallocZero(
-          &pParse->rc, sizeof(Fts5ExprPhrase)
-      );
-      if( pPhrase ){
-        if( parseGrowPhraseArray(pParse) ){
-          fts5ExprPhraseFree(pPhrase);
-        }else{
-          pParse->apPhrase[pParse->nPhrase++] = pPhrase;
-          pPhrase->nTerm = 1;
-          pPhrase->aTerm[0].zTerm = sqlite3Fts5Strndup(
-              &pParse->rc, pNear->apPhrase[0]->aTerm[ii].zTerm, -1
-          );
-          pRet->apChild[ii] = sqlite3Fts5ParseNode(pParse, FTS5_STRING, 
-              0, 0, sqlite3Fts5ParseNearset(pParse, 0, pPhrase)
-          );
-        }
-      }
-    }
-  
-    if( pParse->rc ){
-      sqlite3Fts5ParseNodeFree(pRet);
-      pRet = 0;
-    }else{
-      sqlite3Fts5ParseNearsetFree(pNear);
-    }
-  }
-
-  return pRet;
-}
-
 /*
 ** Allocate and return a new expression object. If anything goes wrong (i.e.
 ** OOM error), leave an error code in pParse and return NULL.
@@ -2284,55 +2136,51 @@ Fts5ExprNode *sqlite3Fts5ParseNode(
    if( eType!=FTS5_STRING && pLeft==0 ) return pRight;
    if( eType!=FTS5_STRING && pRight==0 ) return pLeft;

-    if( eType==FTS5_STRING 
-     && pParse->bPhraseToAnd 
-     && pNear->apPhrase[0]->nTerm>1
-    ){
-      pRet = fts5ParsePhraseToAnd(pParse, pNear);
-    }else{
-      if( eType==FTS5_NOT ){
-        nChild = 2;
-      }else if( eType==FTS5_AND || eType==FTS5_OR ){
-        nChild = 2;
-        if( pLeft->eType==eType ) nChild += pLeft->nChild-1;
-        if( pRight->eType==eType ) nChild += pRight->nChild-1;
-      }
+    if( eType==FTS5_NOT ){
+      nChild = 2;
+    }else if( eType==FTS5_AND || eType==FTS5_OR ){
+      nChild = 2;
+      if( pLeft->eType==eType ) nChild += pLeft->nChild-1;
+      if( pRight->eType==eType ) nChild += pRight->nChild-1;
+    }

-      nByte = sizeof(Fts5ExprNode) + sizeof(Fts5ExprNode*)*(nChild-1);
-      pRet = (Fts5ExprNode*)sqlite3Fts5MallocZero(&pParse->rc, nByte);
+    nByte = sizeof(Fts5ExprNode) + sizeof(Fts5ExprNode*)*(nChild-1);
+    pRet = (Fts5ExprNode*)sqlite3Fts5MallocZero(&pParse->rc, nByte);

-      if( pRet ){
-        pRet->eType = eType;
-        pRet->pNear = pNear;
-        fts5ExprAssignXNext(pRet);
-        if( eType==FTS5_STRING ){
-          int iPhrase;
-          for(iPhrase=0; iPhrase<pNear->nPhrase; iPhrase++){
-            pNear->apPhrase[iPhrase]->pNode = pRet;
-            if( pNear->apPhrase[iPhrase]->nTerm==0 ){
-              pRet->xNext = 0;
-              pRet->eType = FTS5_EOF;
-            }
+    if( pRet ){
+      pRet->eType = eType;
+      pRet->pNear = pNear;
+      fts5ExprAssignXNext(pRet);
+      if( eType==FTS5_STRING ){
+        int iPhrase;
+        for(iPhrase=0; iPhrase<pNear->nPhrase; iPhrase++){
+          pNear->apPhrase[iPhrase]->pNode = pRet;
+          if( pNear->apPhrase[iPhrase]->nTerm==0 ){
+            pRet->xNext = 0;
+            pRet->eType = FTS5_EOF;
          }
-
-          if( pParse->pConfig->eDetail!=FTS5_DETAIL_FULL ){
-            Fts5ExprPhrase *pPhrase = pNear->apPhrase[0];
-            if( pNear->nPhrase!=1 
-                || pPhrase->nTerm>1
-                || (pPhrase->nTerm>0 && pPhrase->aTerm[0].bFirst)
-              ){
-              sqlite3Fts5ParseError(pParse, 
-                  "fts5: %s queries are not supported (detail!=full)", 
-                  pNear->nPhrase==1 ? "phrase": "NEAR"
-              );
-              sqlite3_free(pRet);
-              pRet = 0;
-            }
-          }
-        }else{
-          fts5ExprAddChildren(pRet, pLeft);
-          fts5ExprAddChildren(pRet, pRight);
        }
+
+        if( pParse->pConfig->eDetail!=FTS5_DETAIL_FULL ){
+          Fts5ExprPhrase *pPhrase = pNear->apPhrase[0];
+          if( pNear->nPhrase!=1 
+           || pPhrase->nTerm>1
+           || (pPhrase->nTerm>0 && pPhrase->aTerm[0].bFirst)
+          ){
+            assert( pParse->rc==SQLITE_OK );
+            pParse->rc = SQLITE_ERROR;
+            assert( pParse->zErr==0 );
+            pParse->zErr = sqlite3_mprintf(
+                "fts5: %s queries are not supported (detail!=full)", 
+                pNear->nPhrase==1 ? "phrase": "NEAR"
+                );
+            sqlite3_free(pRet);
+            pRet = 0;
+          }
+        }
+      }else{
+        fts5ExprAddChildren(pRet, pLeft);
+        fts5ExprAddChildren(pRet, pRight);
      }
    }
  }
@@ -2410,7 +2258,6 @@ Fts5ExprNode *sqlite3Fts5ParseImplicitAnd(
  return pRet;
 }

-#ifdef SQLITE_TEST
 static char *fts5ExprTermPrint(Fts5ExprTerm *pTerm){
  sqlite3_int64 nByte = 0;
  Fts5ExprTerm *p;
@@ -2554,17 +2401,8 @@ static char *fts5ExprPrint(Fts5Config *pConfig, Fts5ExprNode *pExpr){
    int iTerm;

    if( pNear->pColset ){
-      int ii;
-      Fts5Colset *pColset = pNear->pColset;
-      if( pColset->nCol>1 ) zRet = fts5PrintfAppend(zRet, "{");
-      for(ii=0; ii<pColset->nCol; ii++){
-        zRet = fts5PrintfAppend(zRet, "%s%s", 
-            pConfig->azCol[pColset->aiCol[ii]], ii==pColset->nCol-1 ? "" : " "
-        );
-      }
-      if( zRet ){
-        zRet = fts5PrintfAppend(zRet, "%s : ", pColset->nCol>1 ? "}" : "");
-      }
+      int iCol = pNear->pColset->aiCol[0];
+      zRet = fts5PrintfAppend(zRet, "%s : ", pConfig->azCol[iCol]);
      if( zRet==0 ) return 0;
    }

@@ -2687,7 +2525,7 @@ static void fts5ExprFunction(

  rc = sqlite3Fts5ConfigParse(pGlobal, db, nConfig, azConfig, &pConfig, &zErr);
  if( rc==SQLITE_OK ){
-    rc = sqlite3Fts5ExprNew(pConfig, 0, pConfig->nCol, zExpr, &pExpr, &zErr);
+    rc = sqlite3Fts5ExprNew(pConfig, pConfig->nCol, zExpr, &pExpr, &zErr);
  }
  if( rc==SQLITE_OK ){
    char *zText;
@@ -2777,14 +2615,12 @@ static void fts5ExprFold(
    sqlite3_result_int(pCtx, sqlite3Fts5UnicodeFold(iCode, bRemoveDiacritics));
  }
 }
-#endif /* ifdef SQLITE_TEST */

 /*
 ** This is called during initialization to register the fts5_expr() scalar
 ** UDF with the SQLite handle passed as the only argument.
 */
 int sqlite3Fts5ExprInit(Fts5Global *pGlobal, sqlite3 *db){
-#ifdef SQLITE_TEST
  struct Fts5ExprFunc {
    const char *z;
    void (*x)(sqlite3_context*,int,sqlite3_value**);
@@ -2802,10 +2638,6 @@ int sqlite3Fts5ExprInit(Fts5Global *pGlobal, sqlite3 *db){
    struct Fts5ExprFunc *p = &aFunc[i];
    rc = sqlite3_create_function(db, p->z, -1, SQLITE_UTF8, pCtx, p->x, 0, 0);
  }
-#else
-  int rc = SQLITE_OK;
-  UNUSED_PARAM2(pGlobal,db);
-#endif

  /* Avoid warnings indicating that sqlite3Fts5ParserTrace() and
  ** sqlite3Fts5ParserFallback() are unused */
@@ -306,6 +306,7 @@ int sqlite3Fts5HashWrite(
      p->iCol = (pHash->eDetail==FTS5_DETAIL_FULL ? 0 : -1);
    }

+    nIncr += p->nData;
  }else{

    /* Appending to an existing hash-entry. Check that there is enough 
@@ -338,9 +339,8 @@ int sqlite3Fts5HashWrite(
  /* If this is a new rowid, append the 4-byte size field for the previous
  ** entry, and the new rowid for this entry.  */
  if( iRowid!=p->iRowid ){
-    u64 iDiff = (u64)iRowid - (u64)p->iRowid;
    fts5HashAddPoslistSize(pHash, p, 0);
-    p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iDiff);
+    p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iRowid - p->iRowid);
    p->iRowid = iRowid;
    bNew = 1;
    p->iSzPoslist = p->nData;
@@ -356,7 +356,7 @@ int sqlite3Fts5HashWrite(
      p->bContent = 1;
    }else{
      /* Append a new column value, if necessary */
-      assert_nc( iCol>=p->iCol );
+      assert( iCol>=p->iCol );
      if( iCol!=p->iCol ){
        if( pHash->eDetail==FTS5_DETAIL_FULL ){
          pPtr[p->nData++] = 0x01;
@@ -22,9 +22,7 @@
 ** assert() conditions in the fts5 code are activated - conditions that are
 ** only true if it is guaranteed that the fts5 database is not corrupt.
 */
-#ifdef SQLITE_DEBUG
 int sqlite3_fts5_may_be_corrupt = 1;
-#endif


 typedef struct Fts5Auxdata Fts5Auxdata;
@@ -466,23 +464,6 @@ static void fts5SetUniqueFlag(sqlite3_index_info *pIdxInfo){
 #endif
 }

-static int fts5UsePatternMatch(
-  Fts5Config *pConfig, 
-  struct sqlite3_index_constraint *p
-){
-  assert( FTS5_PATTERN_GLOB==SQLITE_INDEX_CONSTRAINT_GLOB );
-  assert( FTS5_PATTERN_LIKE==SQLITE_INDEX_CONSTRAINT_LIKE );
-  if( pConfig->ePattern==FTS5_PATTERN_GLOB && p->op==FTS5_PATTERN_GLOB ){
-    return 1;
-  }
-  if( pConfig->ePattern==FTS5_PATTERN_LIKE 
-   && (p->op==FTS5_PATTERN_LIKE || p->op==FTS5_PATTERN_GLOB)
-  ){
-    return 1;
-  }
-  return 0;
-}
-
 /*
 ** Implementation of the xBestIndex method for FTS5 tables. Within the 
 ** WHERE constraint, it searches for the following:
@@ -512,9 +493,7 @@ static int fts5UsePatternMatch(
 **
 **   Match against table column:            "m"
 **   Match against rank column:             "r"
-**   Match against other column:            "M<column-number>"
-**   LIKE  against other column:            "L<column-number>"
-**   GLOB  against other column:            "G<column-number>"
+**   Match against other column:            "<column-number>"
 **   Equality constraint against the rowid: "="
 **   A < or <= against the rowid:           "<"
 **   A > or >= against the rowid:           ">"
@@ -575,7 +554,7 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
    return SQLITE_ERROR;
  }

-  idxStr = (char*)sqlite3_malloc(pInfo->nConstraint * 8 + 1);
+  idxStr = (char*)sqlite3_malloc(pInfo->nConstraint * 6 + 1);
  if( idxStr==0 ) return SQLITE_NOMEM;
  pInfo->idxStr = idxStr;
  pInfo->needToFreeIdxStr = 1;
@@ -599,29 +578,25 @@ static int fts5BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
          if( bSeenRank ) continue;
          idxStr[iIdxStr++] = 'r';
          bSeenRank = 1;
-        }else if( iCol>=0 ){
+        }else{
          bSeenMatch = 1;
-          idxStr[iIdxStr++] = 'M';
-          sqlite3_snprintf(6, &idxStr[iIdxStr], "%d", iCol);
-          idxStr += strlen(&idxStr[iIdxStr]);
-          assert( idxStr[iIdxStr]=='\0' );
+          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 ){
-      if( iCol>=0 && iCol<nCol && fts5UsePatternMatch(pConfig, p) ){
-        assert( p->op==FTS5_PATTERN_LIKE || p->op==FTS5_PATTERN_GLOB );
-        idxStr[iIdxStr++] = p->op==FTS5_PATTERN_LIKE ? 'L' : 'G';
-        sqlite3_snprintf(6, &idxStr[iIdxStr], "%d", iCol);
-        idxStr += strlen(&idxStr[iIdxStr]);
-        pInfo->aConstraintUsage[i].argvIndex = ++iCons;
-        assert( idxStr[iIdxStr]=='\0' );
-      }else if( bSeenEq==0 && p->op==SQLITE_INDEX_CONSTRAINT_EQ && iCol<0 ){
-        idxStr[iIdxStr++] = '=';
-        bSeenEq = 1;
-        pInfo->aConstraintUsage[i].argvIndex = ++iCons;
-      }
+    }
+    else if( p->usable && bSeenEq==0 
+      && p->op==SQLITE_INDEX_CONSTRAINT_EQ && iCol<0 
+    ){
+      idxStr[iIdxStr++] = '=';
+      bSeenEq = 1;
+      pInfo->aConstraintUsage[i].argvIndex = ++iCons;
    }
  }

@@ -1254,14 +1229,19 @@ static int fts5FilterMethod(
      case 'r':
        pRank = apVal[i];
        break;
-      case 'M': {
+      case 'm': {
        const char *zText = (const char*)sqlite3_value_text(apVal[i]);
        if( zText==0 ) zText = "";
-        iCol = 0;
-        do{
-          iCol = iCol*10 + (idxStr[iIdxStr]-'0');
-          iIdxStr++;
-        }while( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' );
+
+        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
@@ -1271,7 +1251,7 @@ static int fts5FilterMethod(
          goto filter_out;
        }else{
          char **pzErr = &pTab->p.base.zErrMsg;
-          rc = sqlite3Fts5ExprNew(pConfig, 0, iCol, zText, &pExpr, pzErr);
+          rc = sqlite3Fts5ExprNew(pConfig, iCol, zText, &pExpr, pzErr);
          if( rc==SQLITE_OK ){
            rc = sqlite3Fts5ExprAnd(&pCsr->pExpr, pExpr);
            pExpr = 0;
@@ -1281,25 +1261,6 @@ static int fts5FilterMethod(

        break;
      }
-      case 'L':
-      case 'G': {
-        int bGlob = (idxStr[iIdxStr-1]=='G');
-        const char *zText = (const char*)sqlite3_value_text(apVal[i]);
-        iCol = 0;
-        do{
-          iCol = iCol*10 + (idxStr[iIdxStr]-'0');
-          iIdxStr++;
-        }while( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' );
-        if( zText ){
-          rc = sqlite3Fts5ExprPattern(pConfig, bGlob, iCol, zText, &pExpr);
-        }
-        if( rc==SQLITE_OK ){
-          rc = sqlite3Fts5ExprAnd(&pCsr->pExpr, pExpr);
-          pExpr = 0;
-        }
-        if( rc!=SQLITE_OK ) goto filter_out;
-        break;
-      }
      case '=':
        pRowidEq = apVal[i];
        break;
@@ -1374,8 +1335,7 @@ static int fts5FilterMethod(
        pTab->pStorage, fts5StmtType(pCsr), &pCsr->pStmt, &pTab->p.base.zErrMsg
    );
    if( rc==SQLITE_OK ){
-      if( pRowidEq!=0 ){
-        assert( pCsr->ePlan==FTS5_PLAN_ROWID );
+      if( pCsr->ePlan==FTS5_PLAN_ROWID ){
        sqlite3_bind_value(pCsr->pStmt, 1, pRowidEq);
      }else{
        sqlite3_bind_int64(pCsr->pStmt, 1, pCsr->iFirstRowid);
@@ -1548,8 +1508,7 @@ static int fts5SpecialInsert(
    int nMerge = sqlite3_value_int(pVal);
    rc = sqlite3Fts5StorageMerge(pTab->pStorage, nMerge);
  }else if( 0==sqlite3_stricmp("integrity-check", zCmd) ){
-    int iArg = sqlite3_value_int(pVal);
-    rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, iArg);
+    rc = sqlite3Fts5StorageIntegrity(pTab->pStorage);
 #ifdef SQLITE_DEBUG
  }else if( 0==sqlite3_stricmp("prefix-index", zCmd) ){
    pConfig->bPrefixIndex = sqlite3_value_int(pVal);
@@ -1950,15 +1909,13 @@ static int fts5CacheInstArray(Fts5Cursor *pCsr){

        nInst++;
        if( nInst>=pCsr->nInstAlloc ){
-          int nNewSize = pCsr->nInstAlloc ? pCsr->nInstAlloc*2 : 32;
+          pCsr->nInstAlloc = pCsr->nInstAlloc ? pCsr->nInstAlloc*2 : 32;
          aInst = (int*)sqlite3_realloc64(
-              pCsr->aInst, nNewSize*sizeof(int)*3
+              pCsr->aInst, pCsr->nInstAlloc*sizeof(int)*3
              );
          if( aInst ){
            pCsr->aInst = aInst;
-            pCsr->nInstAlloc = nNewSize;
          }else{
-            nInst--;
            rc = SQLITE_NOMEM;
            break;
          }
@@ -2182,8 +2139,7 @@ static int fts5ApiPhraseFirst(
  int n;
  int rc = fts5CsrPoslist(pCsr, iPhrase, &pIter->a, &n);
  if( rc==SQLITE_OK ){
-    assert( pIter->a || n==0 );
-    pIter->b = (pIter->a ? &pIter->a[n] : 0);
+    pIter->b = &pIter->a[n];
    *piCol = 0;
    *piOff = 0;
    fts5ApiPhraseNext(pCtx, pIter, piCol, piOff);
@@ -2242,8 +2198,7 @@ static int fts5ApiPhraseFirstColumn(
      rc = sqlite3Fts5ExprPhraseCollist(pCsr->pExpr, iPhrase, &pIter->a, &n);
    }
    if( rc==SQLITE_OK ){
-      assert( pIter->a || n==0 );
-      pIter->b = (pIter->a ? &pIter->a[n] : 0);
+      pIter->b = &pIter->a[n];
      *piCol = 0;
      fts5ApiPhraseNextColumn(pCtx, pIter, piCol);
    }
@@ -2251,8 +2206,7 @@ static int fts5ApiPhraseFirstColumn(
    int n;
    rc = fts5CsrPoslist(pCsr, iPhrase, &pIter->a, &n);
    if( rc==SQLITE_OK ){
-      assert( pIter->a || n==0 );
-      pIter->b = (pIter->a ? &pIter->a[n] : 0);
+      pIter->b = &pIter->a[n];
      if( n<=0 ){
        *piCol = -1;
      }else if( pIter->a[0]==0x01 ){
@@ -2717,7 +2671,8 @@ int sqlite3Fts5GetTokenizer(
  Fts5Global *pGlobal, 
  const char **azArg,
  int nArg,
-  Fts5Config *pConfig,
+  Fts5Tokenizer **ppTok,
+  fts5_tokenizer **ppTokApi,
  char **pzErr
 ){
  Fts5TokenizerModule *pMod;
@@ -2729,22 +2684,16 @@ int sqlite3Fts5GetTokenizer(
    rc = SQLITE_ERROR;
    *pzErr = sqlite3_mprintf("no such tokenizer: %s", azArg[0]);
  }else{
-    rc = pMod->x.xCreate(
-        pMod->pUserData, (azArg?&azArg[1]:0), (nArg?nArg-1:0), &pConfig->pTok
-    );
-    pConfig->pTokApi = &pMod->x;
-    if( rc!=SQLITE_OK ){
-      if( pzErr ) *pzErr = sqlite3_mprintf("error in tokenizer constructor");
-    }else{
-      pConfig->ePattern = sqlite3Fts5TokenizerPattern(
-          pMod->x.xCreate, pConfig->pTok
-      );
+    rc = pMod->x.xCreate(pMod->pUserData, &azArg[1], (nArg?nArg-1:0), ppTok);
+    *ppTokApi = &pMod->x;
+    if( rc!=SQLITE_OK && pzErr ){
+      *pzErr = sqlite3_mprintf("error in tokenizer constructor");
    }
  }

  if( rc!=SQLITE_OK ){
-    pConfig->pTokApi = 0;
-    pConfig->pTok = 0;
+    *ppTokApi = 0;
+    *ppTok = 0;
  }

  return rc;
@@ -417,32 +417,21 @@ static int fts5StorageDeleteFromIndex(
    if( pConfig->abUnindexed[iCol-1]==0 ){
      const char *zText;
      int nText;
-      assert( pSeek==0 || apVal==0 );
-      assert( pSeek!=0 || apVal!=0 );
      if( pSeek ){
        zText = (const char*)sqlite3_column_text(pSeek, iCol);
        nText = sqlite3_column_bytes(pSeek, iCol);
-      }else if( ALWAYS(apVal) ){
+      }else{
        zText = (const char*)sqlite3_value_text(apVal[iCol-1]);
        nText = sqlite3_value_bytes(apVal[iCol-1]);
-      }else{
-        continue;
      }
      ctx.szCol = 0;
      rc = sqlite3Fts5Tokenize(pConfig, FTS5_TOKENIZE_DOCUMENT, 
          zText, nText, (void*)&ctx, fts5StorageInsertCallback
      );
      p->aTotalSize[iCol-1] -= (i64)ctx.szCol;
-      if( p->aTotalSize[iCol-1]<0 ){
-        rc = FTS5_CORRUPT;
-      }
    }
  }
-  if( rc==SQLITE_OK && p->nTotalRow<1 ){
-    rc = FTS5_CORRUPT;
-  }else{
-    p->nTotalRow--;
-  }
+  p->nTotalRow--;

  rc2 = sqlite3_reset(pSeek);
  if( rc==SQLITE_OK ) rc = rc2;
@@ -885,14 +874,13 @@ static int fts5StorageIntegrityCallback(
 ** some other SQLite error code if an error occurs while attempting to
 ** determine this.
 */
-int sqlite3Fts5StorageIntegrity(Fts5Storage *p, int iArg){
+int sqlite3Fts5StorageIntegrity(Fts5Storage *p){
  Fts5Config *pConfig = p->pConfig;
-  int rc = SQLITE_OK;             /* Return code */
+  int rc;                         /* Return code */
  int *aColSize;                  /* Array of size pConfig->nCol */
  i64 *aTotalSize;                /* Array of size pConfig->nCol */
  Fts5IntegrityCtx ctx;
  sqlite3_stmt *pScan;
-  int bUseCksum;

  memset(&ctx, 0, sizeof(Fts5IntegrityCtx));
  ctx.pConfig = p->pConfig;
@@ -901,88 +889,83 @@ int sqlite3Fts5StorageIntegrity(Fts5Storage *p, int iArg){
  aColSize = (int*)&aTotalSize[pConfig->nCol];
  memset(aTotalSize, 0, sizeof(i64) * pConfig->nCol);

-  bUseCksum = (pConfig->eContent==FTS5_CONTENT_NORMAL
-           || (pConfig->eContent==FTS5_CONTENT_EXTERNAL && iArg)
-  );
-  if( bUseCksum ){
-    /* Generate the expected index checksum based on the contents of the
-    ** %_content table. This block stores the checksum in ctx.cksum. */
-    rc = fts5StorageGetStmt(p, FTS5_STMT_SCAN, &pScan, 0);
-    if( rc==SQLITE_OK ){
-      int rc2;
-      while( SQLITE_ROW==sqlite3_step(pScan) ){
-        int i;
-        ctx.iRowid = sqlite3_column_int64(pScan, 0);
+  /* Generate the expected index checksum based on the contents of the
+  ** %_content table. This block stores the checksum in ctx.cksum. */
+  rc = fts5StorageGetStmt(p, FTS5_STMT_SCAN, &pScan, 0);
+  if( rc==SQLITE_OK ){
+    int rc2;
+    while( SQLITE_ROW==sqlite3_step(pScan) ){
+      int i;
+      ctx.iRowid = sqlite3_column_int64(pScan, 0);
+      ctx.szCol = 0;
+      if( pConfig->bColumnsize ){
+        rc = sqlite3Fts5StorageDocsize(p, ctx.iRowid, aColSize);
+      }
+      if( rc==SQLITE_OK && pConfig->eDetail==FTS5_DETAIL_NONE ){
+        rc = sqlite3Fts5TermsetNew(&ctx.pTermset);
+      }
+      for(i=0; rc==SQLITE_OK && i<pConfig->nCol; i++){
+        if( pConfig->abUnindexed[i] ) continue;
+        ctx.iCol = i;
        ctx.szCol = 0;
-        if( pConfig->bColumnsize ){
-          rc = sqlite3Fts5StorageDocsize(p, ctx.iRowid, aColSize);
-        }
-        if( rc==SQLITE_OK && pConfig->eDetail==FTS5_DETAIL_NONE ){
+        if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){
          rc = sqlite3Fts5TermsetNew(&ctx.pTermset);
        }
-        for(i=0; rc==SQLITE_OK && i<pConfig->nCol; i++){
-          if( pConfig->abUnindexed[i] ) continue;
-          ctx.iCol = i;
-          ctx.szCol = 0;
-          if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){
-            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,
-                (void*)&ctx,
-                fts5StorageIntegrityCallback
-            );
-          }
-          if( rc==SQLITE_OK && pConfig->bColumnsize && ctx.szCol!=aColSize[i] ){
-            rc = FTS5_CORRUPT;
-          }
-          aTotalSize[i] += ctx.szCol;
-          if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){
-            sqlite3Fts5TermsetFree(ctx.pTermset);
-            ctx.pTermset = 0;
-          }
+        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,
+              (void*)&ctx,
+              fts5StorageIntegrityCallback
+          );
+        }
+        if( rc==SQLITE_OK && pConfig->bColumnsize && ctx.szCol!=aColSize[i] ){
+          rc = FTS5_CORRUPT;
+        }
+        aTotalSize[i] += ctx.szCol;
+        if( pConfig->eDetail==FTS5_DETAIL_COLUMNS ){
+          sqlite3Fts5TermsetFree(ctx.pTermset);
+          ctx.pTermset = 0;
        }
-        sqlite3Fts5TermsetFree(ctx.pTermset);
-        ctx.pTermset = 0;
-  
-        if( rc!=SQLITE_OK ) break;
      }
-      rc2 = sqlite3_reset(pScan);
-      if( rc==SQLITE_OK ) rc = rc2;
-    }
+      sqlite3Fts5TermsetFree(ctx.pTermset);
+      ctx.pTermset = 0;

-    /* Test that the "totals" (sometimes called "averages") record looks Ok */
-    if( rc==SQLITE_OK ){
-      int i;
-      rc = fts5StorageLoadTotals(p, 0);
-      for(i=0; rc==SQLITE_OK && i<pConfig->nCol; i++){
-        if( p->aTotalSize[i]!=aTotalSize[i] ) rc = FTS5_CORRUPT;
-      }
+      if( rc!=SQLITE_OK ) break;
    }
+    rc2 = sqlite3_reset(pScan);
+    if( rc==SQLITE_OK ) rc = rc2;
+  }

-    /* Check that the %_docsize and %_content tables contain the expected
-    ** number of rows.  */
-    if( rc==SQLITE_OK && pConfig->eContent==FTS5_CONTENT_NORMAL ){
-      i64 nRow = 0;
-      rc = fts5StorageCount(p, "content", &nRow);
-      if( rc==SQLITE_OK && nRow!=p->nTotalRow ) rc = FTS5_CORRUPT;
-    }
-    if( rc==SQLITE_OK && pConfig->bColumnsize ){
-      i64 nRow = 0;
-      rc = fts5StorageCount(p, "docsize", &nRow);
-      if( rc==SQLITE_OK && nRow!=p->nTotalRow ) rc = FTS5_CORRUPT;
+  /* Test that the "totals" (sometimes called "averages") record looks Ok */
+  if( rc==SQLITE_OK ){
+    int i;
+    rc = fts5StorageLoadTotals(p, 0);
+    for(i=0; rc==SQLITE_OK && i<pConfig->nCol; i++){
+      if( p->aTotalSize[i]!=aTotalSize[i] ) rc = FTS5_CORRUPT;
    }
  }

+  /* Check that the %_docsize and %_content tables contain the expected
+  ** number of rows.  */
+  if( rc==SQLITE_OK && pConfig->eContent==FTS5_CONTENT_NORMAL ){
+    i64 nRow = 0;
+    rc = fts5StorageCount(p, "content", &nRow);
+    if( rc==SQLITE_OK && nRow!=p->nTotalRow ) rc = FTS5_CORRUPT;
+  }
+  if( rc==SQLITE_OK && pConfig->bColumnsize ){
+    i64 nRow = 0;
+    rc = fts5StorageCount(p, "docsize", &nRow);
+    if( rc==SQLITE_OK && nRow!=p->nTotalRow ) rc = FTS5_CORRUPT;
+  }
+
  /* Pass the expected checksum down to the FTS index module. It will
  ** verify, amongst other things, that it matches the checksum generated by
  ** inspecting the index itself.  */
  if( rc==SQLITE_OK ){
-    rc = sqlite3Fts5IndexIntegrityCheck(p->pIndex, ctx.cksum, bUseCksum);
+    rc = sqlite3Fts5IndexIntegrityCheck(p->pIndex, ctx.cksum);
  }

  sqlite3_free(aTotalSize);
@@ -1062,9 +1045,8 @@ int sqlite3Fts5StorageDocsize(Fts5Storage *p, i64 iRowid, int *aCol){

  assert( p->pConfig->bColumnsize );
  rc = fts5StorageGetStmt(p, FTS5_STMT_LOOKUP_DOCSIZE, &pLookup, 0);
-  if( pLookup ){
+  if( rc==SQLITE_OK ){
    int bCorrupt = 1;
-    assert( rc==SQLITE_OK );
    sqlite3_bind_int64(pLookup, 1, iRowid);
    if( SQLITE_ROW==sqlite3_step(pLookup) ){
      const u8 *aBlob = sqlite3_column_blob(pLookup, 0);
@@ -1077,8 +1059,6 @@ int sqlite3Fts5StorageDocsize(Fts5Storage *p, i64 iRowid, int *aCol){
    if( bCorrupt && rc==SQLITE_OK ){
      rc = FTS5_CORRUPT;
    }
-  }else{
-    assert( rc!=SQLITE_OK );
  }

  return rc;
@@ -29,9 +29,7 @@
 #include <string.h>
 #include <assert.h>

-#ifdef SQLITE_DEBUG
 extern int sqlite3_fts5_may_be_corrupt;
-#endif
 extern int sqlite3Fts5TestRegisterMatchinfo(sqlite3*);
 extern int sqlite3Fts5TestRegisterTok(sqlite3*, fts5_api*);

@@ -1013,7 +1011,6 @@ static int SQLITE_TCLAPI f5tMayBeCorrupt(
  int objc,
  Tcl_Obj *CONST objv[]
 ){
-#ifdef SQLITE_DEBUG
  int bOld = sqlite3_fts5_may_be_corrupt;

  if( objc!=2 && objc!=1 ){
@@ -1027,7 +1024,6 @@ static int SQLITE_TCLAPI f5tMayBeCorrupt(
  }

  Tcl_SetObjResult(interp, Tcl_NewIntObj(bOld));
-#endif
  return TCL_OK;
 }

@@ -211,7 +211,7 @@ static int fts5tokConnectMethod(

    rc = pApi->xFindTokenizer(pApi, zModule, &pTokCtx, &pTab->tok);
    if( rc==SQLITE_OK ){
-      const char **azArg = (nDequote>1 ? (const char **)&azDequote[1] : 0);
+      const char **azArg = (const char **)&azDequote[1];
      int nArg = nDequote>0 ? nDequote-1 : 0;
      rc = pTab->tok.xCreate(pTokCtx, azArg, nArg, &pTab->pTok);
    }
@@ -1258,133 +1258,6 @@ static int fts5PorterTokenize(
  );
 }

-/**************************************************************************
-** Start of trigram implementation.
-*/
-typedef struct TrigramTokenizer TrigramTokenizer;
-struct TrigramTokenizer {
-  int bFold;                      /* True to fold to lower-case */
-};
-
-/*
-** Free a trigram tokenizer.
-*/
-static void fts5TriDelete(Fts5Tokenizer *p){
-  sqlite3_free(p);
-}
-
-/*
-** Allocate a trigram tokenizer.
-*/
-static int fts5TriCreate(
-  void *pUnused,
-  const char **azArg,
-  int nArg,
-  Fts5Tokenizer **ppOut
-){
-  int rc = SQLITE_OK;
-  TrigramTokenizer *pNew = (TrigramTokenizer*)sqlite3_malloc(sizeof(*pNew));
-  UNUSED_PARAM(pUnused);
-  if( pNew==0 ){
-    rc = SQLITE_NOMEM;
-  }else{
-    int i;
-    pNew->bFold = 1;
-    for(i=0; rc==SQLITE_OK && i<nArg; i+=2){
-      const char *zArg = azArg[i+1];
-      if( 0==sqlite3_stricmp(azArg[i], "case_sensitive") ){
-        if( (zArg[0]!='0' && zArg[0]!='1') || zArg[1] ){
-          rc = SQLITE_ERROR;
-        }else{
-          pNew->bFold = (zArg[0]=='0');
-        }
-      }else{
-        rc = SQLITE_ERROR;
-      }
-    }
-    if( rc!=SQLITE_OK ){
-      fts5TriDelete((Fts5Tokenizer*)pNew);
-      pNew = 0;
-    }
-  }
-  *ppOut = (Fts5Tokenizer*)pNew;
-  return rc;
-}
-
-/*
-** Trigram tokenizer tokenize routine.
-*/
-static int fts5TriTokenize(
-  Fts5Tokenizer *pTok,
-  void *pCtx,
-  int unusedFlags,
-  const char *pText, int nText,
-  int (*xToken)(void*, int, const char*, int, int, int)
-){
-  TrigramTokenizer *p = (TrigramTokenizer*)pTok;
-  int rc = SQLITE_OK;
-  char aBuf[32];
-  const unsigned char *zIn = (const unsigned char*)pText;
-  const unsigned char *zEof = &zIn[nText];
-  u32 iCode;
-
-  UNUSED_PARAM(unusedFlags);
-  while( 1 ){
-    char *zOut = aBuf;
-    int iStart = zIn - (const unsigned char*)pText;
-    const unsigned char *zNext; 
-
-    READ_UTF8(zIn, zEof, iCode);
-    if( iCode==0 ) break;
-    zNext = zIn;
-    if( zIn<zEof ){
-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
-      WRITE_UTF8(zOut, iCode);
-      READ_UTF8(zIn, zEof, iCode);
-      if( iCode==0 ) break;
-    }else{
-      break;
-    }
-    if( zIn<zEof ){
-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
-      WRITE_UTF8(zOut, iCode);
-      READ_UTF8(zIn, zEof, iCode);
-      if( iCode==0 ) break;
-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, 0);
-      WRITE_UTF8(zOut, iCode);
-    }else{
-      break;
-    }
-    rc = xToken(pCtx, 0, aBuf, zOut-aBuf, iStart, iStart + zOut-aBuf);
-    if( rc!=SQLITE_OK ) break;
-    zIn = zNext;
-  }
-
-  return rc;
-}
-
-/*
-** Argument xCreate is a pointer to a constructor function for a tokenizer.
-** pTok is a tokenizer previously created using the same method. This function
-** returns one of FTS5_PATTERN_NONE, FTS5_PATTERN_LIKE or FTS5_PATTERN_GLOB
-** indicating the style of pattern matching that the tokenizer can support.
-** In practice, this is:
-**
-**     "trigram" tokenizer, case_sensitive=1 - FTS5_PATTERN_GLOB
-**     "trigram" tokenizer, case_sensitive=0 (the default) - FTS5_PATTERN_LIKE
-**     all other tokenizers - FTS5_PATTERN_NONE
-*/
-int sqlite3Fts5TokenizerPattern(
-    int (*xCreate)(void*, const char**, int, Fts5Tokenizer**),
-    Fts5Tokenizer *pTok
-){
-  if( xCreate==fts5TriCreate ){
-    TrigramTokenizer *p = (TrigramTokenizer*)pTok;
-    return p->bFold ? FTS5_PATTERN_LIKE : FTS5_PATTERN_GLOB;
-  }
-  return FTS5_PATTERN_NONE;
-}
-
 /*
 ** Register all built-in tokenizers with FTS5.
 */
@@ -1396,7 +1269,6 @@ int sqlite3Fts5TokenizerInit(fts5_api *pApi){
    { "unicode61", {fts5UnicodeCreate, fts5UnicodeDelete, fts5UnicodeTokenize}},
    { "ascii",     {fts5AsciiCreate, fts5AsciiDelete, fts5AsciiTokenize }},
    { "porter",    {fts5PorterCreate, fts5PorterDelete, fts5PorterTokenize }},
-    { "trigram",   {fts5TriCreate, fts5TriDelete, fts5TriTokenize}},
  };
  
  int rc = SQLITE_OK;             /* Return code */
@@ -773,6 +773,4 @@ void sqlite3Fts5UnicodeAscii(u8 *aArray, u8 *aAscii){
    }
    iTbl++;
  }
-  aAscii[0] = 0;                  /* 0x00 is never a token character */
 }
-
@@ -60,7 +60,6 @@ struct Fts5VocabCursor {

  int bEof;                       /* True if this cursor is at EOF */
  Fts5IndexIter *pIter;           /* Term/rowid iterator object */
-  void *pStruct;                  /* From sqlite3Fts5StructureRef() */

  int nLeTerm;                    /* Size of zLeTerm in bytes */
  char *zLeTerm;                  /* (term <= $zLeTerm) paramater, or NULL */
@@ -394,8 +393,6 @@ static int fts5VocabOpenMethod(
 static void fts5VocabResetCursor(Fts5VocabCursor *pCsr){
  pCsr->rowid = 0;
  sqlite3Fts5IterClose(pCsr->pIter);
-  sqlite3Fts5StructureRelease(pCsr->pStruct);
-  pCsr->pStruct = 0;
  pCsr->pIter = 0;
  sqlite3_free(pCsr->zLeTerm);
  pCsr->nLeTerm = -1;
@@ -473,11 +470,9 @@ static int fts5VocabInstanceNext(Fts5VocabCursor *pCsr){
 static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){
  Fts5VocabCursor *pCsr = (Fts5VocabCursor*)pCursor;
  Fts5VocabTable *pTab = (Fts5VocabTable*)pCursor->pVtab;
+  int rc = SQLITE_OK;
  int nCol = pCsr->pFts5->pConfig->nCol;
-  int rc;

-  rc = sqlite3Fts5StructureTest(pCsr->pFts5->pIndex, pCsr->pStruct);
-  if( rc!=SQLITE_OK ) return rc;
  pCsr->rowid++;

  if( pTab->eType==FTS5_VOCAB_INSTANCE ){
@@ -651,9 +646,6 @@ static int fts5VocabFilterMethod(
  if( rc==SQLITE_OK ){
    Fts5Index *pIndex = pCsr->pFts5->pIndex;
    rc = sqlite3Fts5IndexQuery(pIndex, zTerm, nTerm, f, 0, &pCsr->pIter);
-    if( rc==SQLITE_OK ){
-      pCsr->pStruct = sqlite3Fts5StructureRef(pIndex);
-    }
  }
  if( rc==SQLITE_OK && eType==FTS5_VOCAB_INSTANCE ){
    rc = fts5VocabInstanceNewTerm(pCsr);
@@ -82,24 +82,5 @@ foreach_detail_mode $::testprefix {
  } {1 {unable to use function MATCH in the requested context}}
 }

-#-------------------------------------------------------------------------
-# Confirm that the expression parser creates the same expression tree
-# for:
-#
-#     {a b} : (abc AND def)
-#    -{c d} : (abc AND def)
-#
-# Assuming that the table columns are (a, b, c, d).
-#
-do_execsql_test 5.1 {
-  SELECT fts5_expr('abcd AND cdef');
-} {{"abcd" AND "cdef"}}
-do_execsql_test 5.2 {
-  SELECT fts5_expr('{a b} : (abcd AND cdef)', 'a', 'b', 'c', 'd');
-} {{{a b} : "abcd" AND {a b} : "cdef"}}
-do_execsql_test 5.3 {
-  SELECT fts5_expr('-{c d} : (abcd AND cdef)', 'a', 'b', 'c', 'd');
-} {{{a b} : "abcd" AND {a b} : "cdef"}}
-

 finish_test
@@ -29,8 +29,6 @@ do_execsql_test 1.0 {
  INSERT INTO ttt SELECT a||a, b||b FROM ttt;   
 }

-expr srand(1)
-
 proc mutate {blob i} {
  set o [expr {$i % [string length $blob]}]
  set a [string range $blob 0 $o-1]
@@ -1,798 +0,0 @@
-# 2015 Apr 24
-#
-# 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 tests that FTS5 handles corrupt databases (i.e. internal
-# inconsistencies in the backing tables) correctly. In this case 
-# "correctly" means without crashing.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5corrupt3
-
-# If SQLITE_ENABLE_FTS5 is defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-sqlite3_fts5_may_be_corrupt 1
-database_may_be_corrupt
-
-#-------------------------------------------------------------------------
-# dbsqlfuzz crash-0f47112aa7520cf08c6a835a88fdff8c2a32a188
-#
-reset_db
-do_test 1.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 24576 pagesize 4096 filename crash-0f47112aa7520c.db
-| page 1 offset 0
-|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00   .....@  ........
-|     96: 00 00 00 00 0d 00 00 00 06 0e 0f 00 0f aa 0f 53   ...............S
-|    112: 0e e8 0e 8b 0e 33 0e 0f 00 00 00 00 00 00 00 00   .....3..........
-|   3584: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 22   ................
-|   3600: 06 06 17 11 11 01 31 74 61 62 6c 65 62 62 62 62   ......1tablebbbb
-|   3616: 06 43 52 45 41 54 45 20 54 41 42 4c 45 20 62 62   .CREATE TABLE bb
-|   3632: 28 61 29 56 05 06 17 1f 1f 01 7d 74 61 62 6c 65   (a)V.......table
-|   3648: 74 31 5f 63 6f 6e 66 69 67 74 31 5f 63 6f 6e 66   t1_configt1_conf
-|   3664: 69 67 05 43 52 45 41 54 45 20 54 41 42 4c 45 20   ig.CREATE TABLE 
-|   3680: 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b 20 50 52   't1_config'(k PR
-|   3696: 49 4d 41 52 59 20 4b 45 59 2c 20 76 29 20 57 49   IMARY KEY, v) WI
-|   3712: 54 48 4f 55 54 20 52 4f 57 49 44 5b 04 07 17 21   THOUT ROWID[...!
-|   3728: 21 01 81 01 74 61 62 6c 65 74 31 5f 64 6f 63 73   !...tablet1_docs
-|   3744: 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65 04 43 52   izet1_docsize.CR
-|   3760: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 64   EATE TABLE 't1_d
-|   3776: 6f 63 73 69 7a 65 27 28 69 64 20 49 4e 54 45 47   ocsize'(id INTEG
-|   3792: 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20   ER PRIMARY KEY, 
-|   3808: 73 7a 20 42 4c 4f 42 29 69 03 07 17 19 19 01 81   sz BLOB)i.......
-|   3824: 2d 74 61 62 6c 65 74 31 5f 69 64 78 74 31 5f 69   -tablet1_idxt1_i
-|   3840: 64 78 03 43 52 45 41 54 45 20 54 41 42 4c 45 20   dx.CREATE TABLE 
-|   3856: 27 74 31 5f 69 64 78 27 28 73 65 67 69 64 2c 20   't1_idx'(segid, 
-|   3872: 74 65 72 6d 2c 20 70 67 6e 6f 2c 20 50 52 49 4d   term, pgno, PRIM
-|   3888: 41 52 59 20 4b 45 59 28 73 65 67 69 64 2c 20 74   ARY KEY(segid, t
-|   3904: 65 72 6d 29 29 20 57 49 54 48 4f 55 54 20 52 4f   erm)) WITHOUT RO
-|   3920: 57 49 44 55 02 07 17 1b 1b 01 81 01 74 61 62 6c   WIDU........tabl
-|   3936: 65 74 31 5f 64 61 74 61 74 31 5f 64 61 74 61 02   et1_datat1_data.
-|   3952: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-|   3968: 5f 64 61 74 61 27 28 69 64 20 49 4e 54 45 47 45   _data'(id INTEGE
-|   3984: 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 62   R PRIMARY KEY, b
-|   4000: 6c 6f 63 6b 20 42 4c 4f 42 29 54 01 07 17 11 11   lock BLOB)T.....
-|   4016: 08 81 15 74 61 62 6c 65 74 31 74 31 43 52 45 41   ...tablet1t1CREA
-|   4032: 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 4c 45   TE VIRTUAL TABLE
-|   4048: 20 74 31 20 55 53 49 4e 47 20 66 74 73 35 28 61    t1 USING fts5(a
-|   4064: 2c 62 2c 70 72 65 66 69 78 3d 22 31 2c 32 2c 33   ,b,prefix=.1,2,3
-|   4080: 2c 34 22 2c 20 63 6f 6e 74 65 6e 74 3d 22 22 29   ,4., content=..)
-| page 2 offset 4096
-|      0: 0d 0b 6a 00 37 09 4c 02 0f e7 09 4c 0f c6 0f a4   ..j.7.L....L....
-|     16: 0f 88 0f 6d 0f 4b 0f 2c 0f 0e 0e ec 0e cd 0e ad   ...m.K.,........
-|     32: 0e 8e 0e 6c 0e 4b 0e 29 0e 08 0d e6 0d c4 0d b5   ...l.K.)........
-|     48: 0d 97 0d 76 0d 54 0d 31 0d 15 0c f3 0c d3 0c b5   ...v.T.1........
-|     64: 0c 95 0c 73 0c 54 0c 32 0c 10 0b ee 0b cc 0b b0   ...s.T.2........
-|     80: 0b 8d 0b 7e 0b 48 0b 2e 0b 0b 0a ef 00 00 00 00   ...~.H..........
-|   2368: 00 00 00 00 00 00 00 00 00 00 00 00 15 0a 03 00   ................
-|   2384: 30 00 00 00 01 01 03 35 00 03 01 11 12 02 01 12   0......5........
-|   2400: 03 01 11 1c 8c 80 80 80 80 10 03 00 3e 00 00 00   ............>...
-|   2416: 17 01 05 05 34 74 61 62 6c 03 02 03 01 04 77 68   ....4tabl.....wh
-|   2432: 65 72 03 02 06 09 1b 8c 80 80 80 80 0f 03 00 3c   er.............<
-|   2448: 00 00 00 16 05 34 66 74 73 34 03 02 02 01 04 6e   .....4fts4.....n
-|   2464: 75 6d 62 03 06 01 04 09 1b 8c 80 80 80 80 0e 03   umb.............
-|   2480: 00 3c 00 00 00 16 04 33 74 68 65 03 06 01 01 04   .<.....3the.....
-|   2496: 01 03 77 68 65 03 02 04 04 0a 1b 8c 80 80 80 80   ..whe...........
-|   2512: 0d 03 00 3c 00 00 00 16 04 33 6e 75 6d 03 06 01   ...<.....3num...
-|   2528: 01 05 01 03 74 61 62 03 02 03 04 0a 19 8c 80 80   ....tab.........
-|   2544: 80 80 0c 03 00 38 00 00 00 14 03 32 77 68 03 02   .....8.....2wh..
-|   2560: 04 00 04 33 66 74 73 03 02 02 04 07 18 8c 80 80   ...3fts.........
-|   2576: 80 80 0b 03 00 36 00 00 00 13 03 32 74 61 03 02   .....6.....2ta..
-|   2592: 03 02 01 68 03 06 01 01 04 04 07 1b 8c 80 80 80   ...h............
-|   2608: 80 0a 03 00 3c 00 00 00 16 03 32 6e 75 03 06 01   ....<.....2nu...
-|   2624: 01 05 01 02 6f 66 03 06 01 01 06 04 09 19 8c 80   ....of..........
-|   2640: 80 80 80 09 03 00 38 00 00 00 14 03 32 66 74 03   ......8.....2ft.
-|   2656: 02 02 01 02 69 73 03 06 01 01 03 04 07 18 8c 80   ....is..........
-|   2672: 80 80 80 08 03 00 36 00 00 00 13 02 31 74 03 08   ......6.....1t..
-|   2688: 03 01 01 04 01 01 77 03 02 04 04 09 1a 8c 80 80   ......w.........
-|   2704: 80 80 07 03 00 3a 00 00 00 15 02 31 6e 03 08 01   .....:.....1n...
-|   2720: 01 02 05 01 00 6f 03 06 01 01 06 04 09 18 8c 80   .....o..........
-|   2736: 80 80 80 06 03 00 36 00 00 00 03 04 02 31 66 03   ......6......1f.
-|   2752: 02 02 01 01 69 03 06 01 01 03 04 f6 1c 8c 80 80   ....i...........
-|   2768: 80 80 05 03 00 3e 00 00 00 17 04 30 74 68 65 03   .....>.....0the.
-|   2784: f6 01 01 04 01 05 77 68 65 72 65 03 02 04 0a 15   ......where.....
-|   2800: 8c 80 80 80 80 04 03 00 30 00 00 00 11 01 01 06   ........0.......
-|   2816: 06 30 74 61 62 6c 65 0f 42 03 07 1c 8c 81 80 80   .0table.B.......
-|   2832: 80 03 03 00 3e 00 00 00 17 07 30 6e 75 6d 62 65   ....>.....0numbe
-|   2848: 72 03 06 01 01 05 01 02 6f 66 03 06 04 0d 13 8c   r.......of......
-|   2864: 80 80 80 80 02 03 00 2c 00 00 00 0f 01 01 03 02   .......,........
-|   2880: 30 6e 03 06 01 01 02 07 1b 8c 80 80 80 80 01 03   0n..............
-|   2896: 00 3c 00 00 00 16 08 30 66 74 73 34 61 75 78 03   .<.....0fts4aux.
-|   2912: 02 02 01 02 69 73 03 06 04 0c 00 00 00 14 2a 00   ....is........*.
-|   2928: 00 00 01 01 02 24 00 02 01 01 12 02 01 12 08 88   .....$..........
-|   2944: 80 80 80 80 12 03 00 16 00 00 00 05 02 1c 88 80   ................
-|   2960: 80 80 80 11 03 00 3e 00 00 00 17 05 34 72 6f 77   ......>.....4row
-|   2976: 73 02 06 01 01 05 01 04 74 68 65 72 02 02 04 0b   s.......ther....
-|   2992: 15 88 80 80 80 80 10 03 00 30 00 00 00 11 02 01   .........0......
-|   3008: 01 07 05 34 62 65 74 77 02 02 04 08 1b 88 80 80   ...4betw........
-|   3024: 80 80 0f 03 00 3c 00 00 00 16 04 04 33 72 6f 77   .....<......3row
-|   3040: 02 06 01 01 05 01 03 74 68 65 02 08 05 0a 1b 88   .......the......
-|   3056: 80 80 80 80 0e 03 00 3c 00 00 00 16 01 01 02 04   .......<........
-|   3072: 33 61 72 65 02 02 03 01 03 62 65 74 02 02 07 08   3are.....bet....
-|   3088: 1b 88 80 80 80 80 0d 03 00 3c 00 00 00 16 13 32   .........<.....2
-|   3104: 74 68 02 08 02 01 01 07 00 04 33 61 6e 64 02 06   th........3and..
-|   3120: 04 0a 1b 88 80 80 80 80 0c 03 00 3c 00 00 00 16   ...........<....
-|   3136: 03 32 69 6e 02 06 01 01 06 01 02 72 6f 02 06 01   .2in.......ro...
-|   3152: 01 05 04 09 18 88 80 80 80 80 0b 03 00 36 00 00   .............6..
-|   3168: 00 13 02 03 32 61 72 02 02 03 01 02 62 65 02 02   ....2ar.....be..
-|   3184: 04 05 07 1b 88 80 80 80 80 0a 03 00 3c 00 9e 00   ............<...
-|   3200: 16 02 31 74 02 08 02 01 01 07 00 03 32 61 6e 02   ..1t........2an.
-|   3216: 06 01 01 04 09 19 88 80 80 80 80 09 03 00 38 00   ..............8.
-|   3232: 00 00 14 02 31 6e 02 06 01 01 03 01 01 72 02 06   ....1n.......r..
-|   3248: 01 01 05 04 08 17 88 80 80 80 80 08 03 00 34 00   ..............4.
-|   3264: 00 00 12 02 31 62 02 02 04 01 01 69 02 06 01 01   ....1b.....i....
-|   3280: 06 04 06 19 88 80 80 80 80 07 03 00 38 00 00 00   ............8...
-|   3296: 14 04 02 31 32 02 02 05 01 01 61 02 08 03 01 01   ...12.....a.....
-|   3312: 02 05 06 1b 88 80 80 80 80 06 03 00 3c 00 00 00   ............<...
-|   3328: 16 06 30 74 68 65 72 65 02 02 02 00 02 31 31 02   ..0there.....11.
-|   3344: 06 01 01 04 0a 15 88 80 80 80 80 05 03 00 30 00   ..............0.
-|   3360: 00 00 11 01 01 05 04 30 74 68 65 02 06 01 01 07   .......0the.....
-|   3376: 07 1c 88 80 80 80 80 04 03 00 3e 00 00 00 17 01   ..........>.....
-|   3392: 01 06 02 30 6e 02 06 01 01 03 01 04 72 6f 77 73   ...0n.......rows
-|   3408: 02 06 07 08 1b 88 80 80 80 80 03 03 00 3c 00 00   .............<..
-|   3424: 00 16 08 30 62 65 74 77 65 65 6e 02 02 04 01 02   ...0between.....
-|   3440: 69 6e 02 06 04 0c 1a 88 80 80 80 80 02 03 00 3a   in.............:
-|   3456: 00 00 00 15 04 30 61 6e 64 02 06 01 01 02 02 02   .....0and.......
-|   3472: 72 65 02 02 03 04 0a 17 88 80 80 80 80 01 03 00   re..............
-|   3488: 34 00 00 00 12 02 30 31 02 06 01 01 04 01 01 32   4.....01.......2
-|   3504: 02 02 05 04 08 08 84 80 80 80 80 12 03 00 16 00   ................
-|   3520: 00 00 05 04 1b 84 80 80 80 80 11 03 00 3c 00 00   .............<..
-|   3536: 00 16 05 34 74 61 62 6c 01 06 01 01 05 02 03 65   ...4tabl.......e
-|   3552: 72 6d 01 02 04 0b 1b 84 80 80 80 80 10 03 00 3c   rm.............<
-|   3568: 00 00 00 16 05 34 65 61 63 68 01 02 03 01 04 70   .....4each.....p
-|   3584: 72 65 73 01 02 05 04 08 1a 84 80 80 80 80 0f 03   res.............
-|   3600: 00 3a 00 00 00 15 04 33 74 65 72 01 02 04 02 02   .:.....3ter.....
-|   3616: 68 65 01 06 01 01 03 04 08 1b 84 80 80 80 80 0e   he..............
-|   3632: 03 00 3c 00 00 00 16 04 33 80 72 65 01 02 05 01   ..<.....3.re....
-|   3648: 03 74 61 62 01 06 01 01 05 04 08 1a 84 80 80 80   .tab............
-|   3664: 80 0d 03 00 3a 00 00 00 15 04 33 66 6f 72 01 02   ....:.....3for..
-|   3680: 02 02 02 74 73 01 06 01 01 04 04 08 1b 84 80 80   ...ts...........
-|   3696: 80 80 0c 03 00 3c 00 00 00 17 03 32 74 68 01 06   .....<.....2th..
-|   3712: 01 01 03 00 04 33 65 61 63 01 02 03 04 09 18 84   .....3eac.......
-|   3728: 80 80 80 80 0b 03 00 36 00 00 00 13 03 32 74 61   .......6.....2ta
-|   3744: 01 06 01 01 05 02 01 65 01 02 04 04 09 19 84 80   .......e........
-|   3760: 80 80 80 0a 03 00 38 00 00 00 14 03 32 69 6e 01   ......8.....2in.
-|   3776: 06 01 01 02 01 02 70 72 01 02 05 04 09 18 84 80   ......pr........
-|   3792: 80 80 80 09 03 00 36 00 00 00 13 03 32 66 6f 01   ......6.....2fo.
-|   3808: 02 02 02 01 74 01 06 01 01 04 04 07 1b 84 80 80   ....t...........
-|   3824: 80 80 08 03 00 3c 00 00 00 16 02 31 74 01 0a 04   .....<.....1t...
-|   3840: 01 01 03 04 00 03 32 65 61 01 02 03 04 0a 17 84   ......2ea.......
-|   3856: 80 80 80 80 07 03 00 34 00 00 00 12 02 31 69 01   .......4.....1i.
-|   3872: 06 01 01 02 01 01 70 01 02 05 04 08 18 84 80 80   ......p.........
-|   3888: 80 80 06 03 00 36 00 00 00 13 02 31 65 01 02 03   .....6.....1e...
-|   3904: 01 01 66 01 08 02 01 01 04 04 06 1b 84 80 80 80   ..f.............
-|   3920: 80 05 03 00 3c 00 00 00 16 05 30 74 65 72 6d 01   ....<.....0term.
-|   3936: 02 04 02 02 68 65 01 06 01 01 03 04 09 14 84 80   ....he..........
-|   3952: 80 80 80 04 03 00 2e 00 00 00 10 06 30 64 61 62   ............0dab
-|   3968: 6c 65 01 06 01 01 05 04 15 84 80 80 80 80 03 03   le..............
-|   3984: 00 30 00 00 00 11 02 08 30 70 72 65 73 65 6e 74   .0......0present
-|   4000: 01 02 05 05 1b 84 80 80 80 80 02 03 00 3c 00 00   .............<..
-|   4016: 00 16 04 30 66 74 73 01 06 01 01 04 01 02 69 6e   ...0fts.......in
-|   4032: 01 06 01 01 04 0a 1a 84 80 80 80 80 01 03 00 3a   ...............:
-|   4048: 00 00 00 15 05 30 65 61 63 68 01 02 03 01 13 66   .....0each.....f
-|   4064: 6f 72 01 02 02 04 09 06 01 03 00 12 03 0b 0f 00   or..............
-|   4080: 00 08 8c 80 80 80 80 11 03 00 16 00 00 00 05 04   ................
-| page 3 offset 8192
-|      0: 0a 00 00 00 32 0e 4f 00 0f fa 0f f1 0f e9 0f e1   ....2.O.........
-|     16: 0f d8 0f d1 0f c9 0f c1 0f b9 0f b1 0f a9 0f a0   ................
-|     32: 0f 98 0f 90 0f 87 0f 80 0f 78 0f 71 0f 68 0f 5f   .........x.q.h._
-|     48: 0f 56 0f 4d 0f 41 0f 38 0f 2f 0f 26 0f 1d 0f 13   .V.M.A.8./.&....
-|     64: 0f 0a 0f 01 0e f7 0e ee 0e e6 0e dd 0e d6 0e cd   ................
-|     80: 0e c3 0e ba 0e 00 00 00 00 00 00 00 00 00 00 00   ................
-|   3648: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08   ................
-|   3664: 04 01 10 01 03 34 74 20 07 04 01 0e 01 03 34 1e   .....4t ......4.
-|   3680: 09 04 01 12 01 03 33 74 68 1c 08 04 01 10 01 03   ......3th.......
-|   3696: 33 6e 1a 08 04 01 10 01 03 32 77 18 08 04 01 10   3n.......2w.....
-|   3712: 01 03 32 74 16 08 04 01 10 01 03 32 6e 14 07 04   ..2t.......2n...
-|   3728: 01 0e 01 03 32 12 08 04 01 10 01 03 31 74 10 08   ....2.......1t..
-|   3744: 04 01 10 01 03 31 6e 0e 07 04 01 0e 01 03 31 0c   .....1n.......1.
-|   3760: 09 04 01 12 01 03 30 74 68 0a 08 04 01 10 01 03   ......0th.......
-|   3776: 30 74 08 09 04 01 12 01 03 30 6e 75 06 08 04 01   0t.......0nu....
-|   3792: 10 01 03 30 6e 04 06 04 01 0c 01 03 02 08 04 01   ...0n...........
-|   3808: 10 01 02 34 72 22 07 04 01 0e 01 02 34 20 08 04   ...4r.......4 ..
-|   3824: 01 10 01 02 33 72 1e 09 04 01 12 01 02 33 61 72   ....3r.......3ar
-|   3840: 1c 08 04 01 10 01 02 32 74 1a 08 04 01 10 01 02   .......2t.......
-|   3856: 32 69 18 09 04 01 12 01 02 32 61 72 16 08 04 01   2i.......2ar....
-|   3872: 10 01 02 31 74 14 08 04 01 10 01 02 31 6e 12 08   ...1t.......1n..
-|   3888: 04 01 10 01 02 31 62 10 08 04 01 10 01 02 31 32   .....1b.......12
-|   3904: 0e 0b 04 01 16 01 02 30 74 68 65 72 0c 08 04 01   .......0ther....
-|   3920: 10 01 02 30 74 0a 08 04 01 10 01 02 30 6e 08 08   ...0t.......0n..
-|   3936: 14 01 10 01 02 30 62 06 08 04 01 10 01 02 30 61   .....0b.......0a
-|   3952: 04 06 04 01 0c 01 02 02 07 04 09 10 01 34 74 22   .............4t.
-|   3968: 06 04 09 0e 01 34 20 08 04 09 12 01 33 74 65 1e   .....4 .....3te.
-|   3984: 07 04 09 10 01 33 70 1c 07 04 09 10 01 33 66 1a   .....3p......3f.
-|   4000: 08 04 09 12 01 32 74 68 18 07 04 09 10 01 32 74   .....2th......2t
-|   4016: 16 01 64 09 10 01 32 69 14 07 04 09 10 01 32 66   ..d...2i......2f
-|   4032: 12 07 04 09 10 01 31 74 10 07 04 09 10 01 31 69   ......1t......1i
-|   4048: 0e 06 04 09 0e 01 31 0c 08 04 09 12 01 30 74 65   ......1......0te
-|   4064: 0a 06 04 09 10 01 30 74 08 07 04 09 10 01 30 70   ......0t......0p
-|   4080: 06 08 04 09 12 00 00 00 00 00 00 00 00 00 00 00   ................
-| page 4 offset 12288
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 05 03 03 00 10   ................
-|   4080: 03 05 05 02 03 00 10 04 06 05 01 03 00 10 04 04   ................
-| page 5 offset 16384
-|      0: 0a 00 00 00 02 0f eb 00 0f eb 0f f4 00 00 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 08 03 15 01 70   ...............p
-|   4080: 67 73 7a 18 0b 03 1b 01 76 65 72 73 69 6f 6e 04   gsz.....version.
-| page 6 offset 20480
-|      0: 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
-|   4080: 00 00 03 03 02 01 03 03 02 02 01 00 00 00 00 00   ................
-| end crash-0f47112aa7520c.db
-  }]
-} {}
-
-do_catchsql_test 1.1 {
-  SELECT * FROM t1('R*') WHERE (a,b)<=(current_date,0) ORDER BY rowid DESC;
-} {1 {database disk image is malformed}}
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_test 2.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-
-.open --hexdb
-| size 24576 pagesize 4096 filename sql047467.txt.db
-| page 1 offset 0
-|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00   .....@  ........
-|     96: 00 00 00 00 0d 00 00 00 06 0e 0f 00 0f aa 0f 53   ...............S
-|    112: 0e e8 0e 8b 0e 33 0e 0f 01 00 00 00 00 00 00 00   .....3..........
-|   3584: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 22   ................
-|   3600: 06 06 17 11 11 01 31 74 61 62 6c 65 62 62 62 62   ......1tablebbbb
-|   3616: 06 43 52 45 41 54 45 20 54 41 42 4c 45 20 62 62   .CREATE TABLE bb
-|   3632: 28 61 29 56 05 06 17 1f 1f 01 7d 74 61 62 6c 65   (a)V.......table
-|   3648: 74 31 5f 63 6f 6e 66 69 67 74 31 5f 63 6f 6e 66   t1_configt1_conf
-|   3664: 69 67 05 43 52 45 41 54 45 20 54 41 42 4c 45 20   ig.CREATE TABLE 
-|   3680: 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b 20 50 52   't1_config'(k PR
-|   3696: 49 4d 41 52 59 20 4b 45 59 2c 20 76 29 20 57 49   IMARY KEY, v) WI
-|   3712: 54 48 4f 55 54 20 52 4f 57 49 44 5b 04 07 17 21   THOUT ROWID[...!
-|   3728: 21 01 81 01 74 61 62 6c 65 74 31 5f 64 6f 63 73   !...tablet1_docs
-|   3744: 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65 04 43 52   izet1_docsize.CR
-|   3760: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 64   EATE TABLE 't1_d
-|   3776: 6f 63 73 69 7a 65 27 28 69 64 20 49 4e 54 45 47   ocsize'(id INTEG
-|   3792: 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20   ER PRIMARY KEY, 
-|   3808: 73 7a 20 42 4c 4f 42 29 69 03 07 17 19 19 01 81   sz BLOB)i.......
-|   3824: 2d 74 61 62 6c 65 74 31 5f 69 64 78 74 31 5f 69   -tablet1_idxt1_i
-|   3840: 64 78 03 43 52 45 41 54 45 20 54 41 42 4c 45 20   dx.CREATE TABLE 
-|   3856: 27 74 31 5f 69 64 78 27 28 73 65 67 69 64 2c 20   't1_idx'(segid, 
-|   3872: 74 65 72 6d 2c 20 70 67 6e 6f 2c 20 50 52 49 4d   term, pgno, PRIM
-|   3888: 41 52 59 20 4b 45 59 28 73 65 67 69 64 2c 20 74   ARY KEY(segid, t
-|   3904: 65 72 6d 29 29 20 57 49 54 48 4f 55 54 20 52 4f   erm)) WITHOUT RO
-|   3920: 57 49 44 55 02 07 17 1b 1b 01 81 01 74 61 62 6c   WIDU........tabl
-|   3936: 65 74 31 5f 64 61 74 61 74 31 5f 64 61 74 61 02   et1_datat1_data.
-|   3952: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-|   3968: 5f 64 61 74 61 27 28 69 64 20 49 4e 54 45 47 45   _data'(id INTEGE
-|   3984: 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 62   R PRIMARY KEY, b
-|   4000: 6c 6f 63 6b 20 42 4c 4f 42 29 54 01 07 17 11 11   lock BLOB)T.....
-|   4016: 08 81 15 74 61 62 6c 65 74 31 74 31 43 52 45 41   ...tablet1t1CREA
-|   4032: 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 4c 45   TE VIRTUAL TABLE
-|   4048: 20 74 31 20 55 53 49 4e 47 20 66 74 73 35 28 61    t1 USING fts5(a
-|   4064: 2c 62 2c 70 72 65 66 69 78 3d 22 31 2c 32 2c 33   ,b,prefix=.1,2,3
-|   4080: 2c 34 22 2c 20 63 6f 6e 74 65 6e 74 3d 22 22 29   ,4., content=..)
-| page 2 offset 4096
-|      0: 0d 0b 6a 00 37 09 4c 02 0f e7 09 4c 0f c6 0f a4   ..j.7.L....L....
-|     16: 0f 88 0f 6d 0f 4b 0f 2c 0f 0e 0e ec 0e cd 0e ad   ...m.K.,........
-|     32: 0e 8e 0e 6c 0e 4b 0e 29 0e 08 0d e6 0d c4 0d b5   ...l.K.)........
-|     48: 0d 97 0d 76 0d 54 0d 31 0d 15 0c f3 0c d3 0c b5   ...v.T.1........
-|     64: 0c 95 0c 73 0c 54 0c 32 0c 10 0b ee 0b cc 0b b0   ...s.T.2........
-|     80: 0b 8d 0b 7e 0b 48 0b 2e 0b 0b 0a ef 00 00 00 00   ...~.H..........
-|   2368: 00 00 00 00 00 00 00 00 00 00 00 00 15 0a 03 00   ................
-|   2384: 30 00 00 00 01 01 03 35 00 03 01 11 12 02 01 12   0......5........
-|   2400: 03 01 11 1c 8c 80 80 80 80 10 03 00 3e 00 00 00   ............>...
-|   2416: 17 01 05 05 34 74 61 62 6c 03 02 03 01 04 77 68   ....4tabl.....wh
-|   2432: 65 72 03 02 06 09 1b 8c 80 80 80 80 0f 03 00 3c   er.............<
-|   2448: 00 00 00 16 05 34 66 74 73 34 03 02 02 01 04 6e   .....4fts4.....n
-|   2464: 75 6d 62 03 06 01 04 09 1b 8c 80 80 80 80 0e 03   umb.............
-|   2480: 00 3b ff f0 00 16 04 33 74 68 65 03 06 01 01 04   .;.....3the.....
-|   2496: 01 03 77 68 65 03 02 04 04 0a 1b 8c 80 80 80 80   ..whe...........
-|   2512: 0d 03 00 3c 00 00 00 16 04 33 6e 75 6d 03 06 01   ...<.....3num...
-|   2528: 01 05 01 03 74 61 62 03 02 03 04 0a 19 8c 80 80   ....tab.........
-|   2544: 80 80 0c 03 00 38 00 00 00 14 03 32 77 68 03 02   .....8.....2wh..
-|   2560: 04 00 04 33 66 74 73 03 02 02 04 07 18 8c 80 80   ...3fts.........
-|   2576: 80 80 0b 03 00 36 00 00 00 13 03 32 74 61 03 02   .....6.....2ta..
-|   2592: 03 02 01 68 03 06 01 01 04 04 07 1b 8c 80 80 80   ...h............
-|   2608: 80 0a 03 00 3c 00 00 00 16 03 32 6e 75 03 06 01   ....<.....2nu...
-|   2624: 01 05 01 02 6f 66 03 06 01 01 06 04 09 19 8c 80   ....of..........
-|   2640: 80 80 80 09 03 00 38 00 00 00 14 03 32 66 74 03   ......8.....2ft.
-|   2656: 02 02 01 02 69 73 03 06 01 01 03 04 07 18 8c 80   ....is..........
-|   2672: 80 80 80 08 03 00 36 00 00 00 13 02 31 74 03 08   ......6.....1t..
-|   2688: 03 01 01 04 01 01 77 03 02 04 04 09 1a 8c 80 80   ......w.........
-|   2704: 80 80 07 03 00 3a 00 00 00 15 02 31 6e 03 08 01   .....:.....1n...
-|   2720: 01 02 05 01 00 6f 03 06 01 01 06 14 09 18 8c 80   .....o..........
-|   2736: 80 80 80 06 03 00 36 00 00 00 03 04 02 31 66 03   ......6......1f.
-|   2752: 02 02 01 01 69 03 06 01 01 03 04 f6 1c 8c 80 80   ....i...........
-|   2768: 80 80 05 03 00 3e 00 00 00 17 04 30 74 68 65 03   .....>.....0the.
-|   2784: f6 01 01 04 01 05 77 68 65 72 65 03 02 04 0a 15   ......where.....
-|   2800: 8c 80 80 80 80 04 03 00 30 00 00 00 11 01 01 06   ........0.......
-|   2816: 06 30 74 61 62 6c 65 0f 42 03 07 1c 8c 81 80 80   .0table.B.......
-|   2832: 80 03 03 00 3e 00 00 00 17 07 30 6e 75 6d 62 65   ....>.....0numbe
-|   2848: 72 03 06 01 01 05 01 02 6f 66 03 06 04 0d 13 8c   r.......of......
-|   2864: 80 80 80 80 02 03 00 2c 00 00 00 0f 01 01 03 02   .......,........
-|   2880: 30 6e 03 06 01 01 02 07 1b 8c 80 80 80 80 01 03   0n..............
-|   2896: 00 3c 00 00 00 16 08 30 66 74 73 34 61 75 78 03   .<.....0fts4aux.
-|   2912: 02 02 01 02 69 73 03 06 04 0c 00 00 00 14 2a 00   ....is........*.
-|   2928: 00 00 01 01 02 24 00 02 01 01 12 02 01 12 08 88   .....$..........
-|   2944: 80 80 80 80 12 03 00 16 00 00 00 05 02 1c 88 80   ................
-|   2960: 80 80 80 11 03 00 3e 00 00 00 17 05 34 72 6f 77   ......>.....4row
-|   2976: 73 02 06 01 01 05 01 04 74 68 65 72 02 02 04 0b   s.......ther....
-|   2992: 15 88 80 80 80 80 10 03 00 30 00 00 00 11 02 01   .........0......
-|   3008: 01 07 05 34 62 65 74 77 02 02 04 08 1b 88 80 80   ...4betw........
-|   3024: 80 80 0f 03 00 3c 00 00 00 16 04 04 33 72 6f 77   .....<......3row
-|   3040: 02 06 01 01 05 01 03 74 68 65 02 08 05 0a 1b 88   .......the......
-|   3056: 80 80 80 80 0e 03 00 3c 00 00 00 16 01 01 02 04   .......<........
-|   3072: 33 61 72 65 02 02 03 01 03 62 65 74 02 02 07 08   3are.....bet....
-|   3088: 1b 88 80 80 80 80 0d 03 00 3c 00 00 00 16 13 32   .........<.....2
-|   3104: 74 68 02 08 02 01 01 07 00 04 33 61 6e 64 02 06   th........3and..
-|   3120: 04 0a 1b 88 80 80 80 80 0c 03 00 3c 00 00 00 16   ...........<....
-|   3136: 03 32 69 6e 02 06 01 01 06 01 02 72 6f 02 06 01   .2in.......ro...
-|   3152: 01 05 04 09 18 88 80 80 80 80 0b 03 00 36 00 00   .............6..
-|   3168: 00 13 02 03 32 61 72 02 02 03 01 02 62 65 02 02   ....2ar.....be..
-|   3184: 04 05 07 1b 88 80 80 80 80 0a 03 00 3c 00 94 50   ............<..P
-|   3200: 16 02 31 74 02 08 02 01 01 07 00 03 32 61 6e 02   ..1t........2an.
-|   3216: 06 01 01 04 09 19 88 80 80 80 80 09 03 00 38 00   ..............8.
-|   3232: 00 00 14 02 31 6e 02 06 01 01 03 01 01 72 02 06   ....1n.......r..
-|   3248: 01 01 05 04 08 17 88 80 80 80 80 08 03 00 34 00   ..............4.
-|   3264: 00 00 12 02 31 62 02 02 04 01 01 69 02 06 01 01   ....1b.....i....
-|   3280: 06 04 06 19 88 80 80 80 80 07 03 00 38 00 00 00   ............8...
-|   3296: 14 04 02 31 32 02 02 05 01 01 61 02 08 03 01 01   ...12.....a.....
-|   3312: 02 05 06 1b 88 80 80 80 80 06 03 00 3c 00 00 00   ............<...
-|   3328: 16 06 30 74 68 65 72 65 02 02 02 00 02 31 31 02   ..0there.....11.
-|   3344: 06 01 01 04 0a 15 88 80 80 80 80 05 03 00 30 00   ..............0.
-|   3360: 00 00 11 01 01 05 04 30 74 68 65 02 06 01 01 07   .......0the.....
-|   3376: 07 1c 88 80 80 80 80 04 03 00 3e 00 00 00 17 01   ..........>.....
-|   3392: 01 06 02 30 6e 02 06 01 01 03 01 04 72 6f 77 73   ...0n.......rows
-|   3408: 02 06 07 08 1b 88 80 80 80 80 03 03 00 3c 00 00   .............<..
-|   3424: 00 16 08 30 62 65 74 77 65 65 6e 02 02 04 01 02   ...0between.....
-|   3440: 69 6e 02 06 04 0c 1a 88 80 80 80 80 02 03 00 3a   in.............:
-|   3456: 00 00 00 15 04 30 61 6e 64 02 06 01 01 02 02 02   .....0and.......
-|   3472: 72 65 02 02 03 04 0a 17 88 80 80 80 80 01 03 00   re..............
-|   3488: 34 00 00 00 12 02 30 31 02 06 01 01 04 01 01 32   4.....01.......2
-|   3504: 02 02 05 04 08 08 84 80 80 80 80 12 03 00 16 00   ................
-|   3520: 00 00 05 04 1b 84 80 80 80 80 11 03 00 3c 00 00   .............<..
-|   3536: 00 16 05 34 74 61 62 6c 01 06 01 01 05 02 03 65   ...4tabl.......e
-|   3552: 72 6d 01 02 04 0b 1b 84 80 80 80 80 10 03 00 3c   rm.............<
-|   3568: 00 00 00 16 05 34 65 61 63 68 01 02 03 01 04 70   .....4each.....p
-|   3584: 72 65 73 01 02 05 04 08 1a 84 80 80 80 80 0f 03   res.............
-|   3600: 00 3a 00 00 00 15 04 33 74 65 72 01 02 04 02 02   .:.....3ter.....
-|   3616: 68 65 01 06 01 01 03 04 08 1b 84 80 80 80 80 0e   he..............
-|   3632: 03 00 3c 00 00 00 16 04 33 80 72 65 01 02 05 01   ..<.....3.re....
-|   3648: 03 74 61 62 01 06 01 01 05 04 08 1a 84 80 80 80   .tab............
-|   3664: 80 0d 03 00 3a 00 00 00 15 04 33 66 6f 72 01 02   ....:.....3for..
-|   3680: 02 02 02 74 73 01 06 01 01 04 04 08 1b 84 80 80   ...ts...........
-|   3696: 80 80 0c 03 00 3c 00 00 00 17 03 32 74 68 01 06   .....<.....2th..
-|   3712: 01 01 03 00 04 33 65 61 63 01 02 03 04 09 18 84   .....3eac.......
-|   3728: 80 80 80 80 0b 03 00 36 00 00 00 13 03 32 74 61   .......6.....2ta
-|   3744: 01 06 01 01 05 02 01 65 01 02 04 04 09 19 84 80   .......e........
-|   3760: 80 80 80 0a 03 00 38 00 00 00 14 03 32 69 6e 01   ......8.....2in.
-|   3776: 06 01 01 02 01 02 70 72 01 02 05 04 09 18 84 80   ......pr........
-|   3792: 80 80 80 09 03 00 36 00 00 00 13 03 32 66 6f 01   ......6.....2fo.
-|   3808: 02 02 02 01 74 01 06 01 01 04 04 07 1b 84 80 80   ....t...........
-|   3824: 80 80 08 03 00 3c 00 00 00 16 02 31 74 01 0a 04   .....<.....1t...
-|   3840: 01 01 03 04 00 03 32 65 61 01 02 03 04 0a 17 84   ......2ea.......
-|   3856: 80 80 80 80 07 03 00 34 00 00 00 12 02 31 69 01   .......4.....1i.
-|   3872: 06 01 01 02 01 01 70 01 02 05 04 08 18 84 80 80   ......p.........
-|   3888: 80 80 06 03 00 36 00 00 00 13 02 31 65 01 02 03   .....6.....1e...
-|   3904: 01 01 66 01 08 02 01 01 04 04 06 1b 84 80 80 80   ..f.............
-|   3920: 80 05 03 00 3c 00 00 00 16 05 30 74 65 72 6d 01   ....<.....0term.
-|   3936: 02 04 02 02 68 65 01 06 01 01 03 04 09 14 84 80   ....he..........
-|   3952: 80 80 80 04 03 00 2e 00 00 00 10 06 30 64 61 62   ............0dab
-|   3968: 6c 65 01 06 01 01 05 04 15 84 80 80 80 80 03 03   le..............
-|   3984: 00 30 00 00 00 11 02 08 30 70 72 65 73 65 6e 74   .0......0present
-|   4000: 01 02 05 05 1b 84 80 80 80 80 02 03 00 3c 00 00   .............<..
-|   4016: 00 16 04 30 66 74 73 01 06 01 01 04 01 02 69 6e   ...0fts.......in
-|   4032: 01 06 01 01 04 0a 1a 84 80 80 80 80 01 03 00 3a   ...............:
-|   4048: 00 00 00 15 05 30 65 61 63 68 01 02 03 01 13 66   .....0each.....f
-|   4064: 6f 72 01 02 02 04 09 06 01 03 00 12 03 0b 0f 00   or..............
-|   4080: 00 08 8c 80 80 80 80 11 03 00 16 00 00 00 05 04   ................
-| page 3 offset 8192
-|      0: 0a 00 00 00 32 0e 4f 00 0f fa 0f f1 0f e9 0f e1   ....2.O.........
-|     16: 0f d8 0f d1 0f c9 0f c1 0f b9 0f b1 0f a9 0f a0   ................
-|     32: 0f 98 0f 90 0f 87 0f 80 0f 78 0f 71 0f 68 0f 5f   .........x.q.h._
-|     48: 0f 56 0f 4d 0f 41 0f 38 0f 2f 0f 26 0f 1d 0f 13   .V.M.A.8./.&....
-|     64: 0f 0a 0f 01 0e f7 0e ee 0e e6 0e dd 0e d6 0e cd   ................
-|     80: 0e c3 0e ba 0e 00 00 00 00 00 00 00 00 00 00 00   ................
-|   3648: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08   ................
-|   3664: 04 01 10 01 03 34 74 20 07 04 01 0e 01 03 34 1e   .....4t ......4.
-|   3680: 09 04 01 12 01 03 33 74 68 1c 08 04 01 10 01 03   ......3th.......
-|   3696: 33 6e 1a 08 04 01 10 01 03 32 77 18 08 04 01 10   3n.......2w.....
-|   3712: 01 03 32 74 16 08 04 01 10 01 03 32 6e 14 07 04   ..2t.......2n...
-|   3728: 01 0e 01 03 32 12 08 04 01 10 01 03 31 74 10 08   ....2.......1t..
-|   3744: 04 01 10 01 03 31 6e 0e 07 04 01 0e 01 03 31 0c   .....1n.......1.
-|   3760: 09 04 01 12 01 03 30 74 68 0a 08 04 01 10 01 03   ......0th.......
-|   3776: 30 74 08 09 04 01 12 01 03 30 6e 75 06 08 04 01   0t.......0nu....
-|   3792: 10 01 03 30 6e 04 06 04 01 0c 01 03 02 08 04 01   ...0n...........
-|   3808: 10 01 02 34 72 22 07 04 01 0e 01 02 34 20 08 04   ...4r.......4 ..
-|   3824: 01 10 01 02 33 72 1e 09 04 01 12 01 02 33 61 72   ....3r.......3ar
-|   3840: 1c 08 04 01 10 01 02 32 74 1a 08 04 01 10 01 02   .......2t.......
-|   3856: 32 69 18 09 04 01 12 01 02 32 61 72 16 08 04 01   2i.......2ar....
-|   3872: 10 01 02 31 74 14 08 04 01 10 01 02 31 6e 12 08   ...1t.......1n..
-|   3888: 04 01 10 01 02 31 62 10 08 04 01 10 01 02 31 32   .....1b.......12
-|   3904: 0e 0b 04 01 16 01 02 30 74 68 65 72 0c 08 04 01   .......0ther....
-|   3920: 10 01 02 30 74 0a 08 04 01 10 01 02 30 6e 08 08   ...0t.......0n..
-|   3936: 14 01 10 01 02 30 62 06 08 04 01 10 01 02 30 61   .....0b.......0a
-|   3952: 04 06 04 01 0c 01 02 02 07 04 09 10 01 34 74 22   .............4t.
-|   3968: 06 04 09 0e 01 34 20 08 04 09 12 01 33 74 65 1e   .....4 .....3te.
-|   3984: 07 04 09 10 01 33 70 1c 07 04 09 10 01 33 66 1a   .....3p......3f.
-|   4000: 08 04 09 12 01 32 74 68 18 07 04 09 10 01 32 74   .....2th......2t
-|   4016: 16 01 64 09 10 01 32 69 14 07 04 09 10 01 32 66   ..d...2i......2f
-|   4032: 12 07 04 09 10 01 31 74 10 07 04 09 10 01 31 69   ......1t......1i
-|   4048: 0e 06 04 09 0e 01 31 0c 08 04 09 12 01 30 74 65   ......1......0te
-|   4064: 0a 06 04 09 10 01 30 74 08 07 04 09 10 01 30 70   ......0t......0p
-|   4080: 06 08 04 09 12 00 00 00 00 00 00 00 00 00 00 00   ................
-| page 4 offset 12288
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 05 03 03 00 10   ................
-|   4080: 03 05 05 02 03 00 10 04 06 05 01 03 00 10 04 04   ................
-| page 5 offset 16384
-|      0: 0a 00 00 00 02 0f eb 00 0f eb 0f f4 00 00 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 08 03 15 01 70   ...............p
-|   4080: 67 73 7a 18 0b 03 1b 01 76 65 72 73 69 6f 6e 04   gsz.....version.
-| page 6 offset 20480
-|      0: 0d 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
-|   4080: 00 00 03 03 02 01 03 03 02 02 01 00 00 00 00 00   ................
-| end sql047467.txt.db
-}]} {}
-
-do_catchsql_test 2.1 {
-SELECT * FROM t1('R*R*R*R*') WHERE (a,b)<=(current_date,0) ORDER BY rowid DESC;
-} {1 {database disk image is malformed}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_test 3.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 32768 pagesize 4096 filename crash-c69fcaceff1e50.db
-| page 1 offset 0
-|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 08   .....@  ........
-|     32: 00 00 00 02 00 00 00 01 00 00 00 09 00 00 00 04   ................
-|     96: 00 00 00 00 0d 0f c7 00 07 0d 92 00 0f 8d 0f 36   ...............6
-|    112: 0e cb 0e 6b 0e 0e 0d b6 0d 92 0d 92 00 00 00 00   ...k............
-|   3472: 00 00 22 08 06 17 11 11 01 31 74 61 62 6c 65 74   .........1tablet
-|   3488: 32 74 32 08 43 52 45 41 54 45 20 54 41 42 4c 45   2t2.CREATE TABLE
-|   3504: 20 74 32 28 78 29 56 07 06 17 1f 1f 01 7d 74 61    t2(x)V.......ta
-|   3520: 62 6c 65 74 31 5f 63 6f 6e 66 69 67 74 31 5f 63   blet1_configt1_c
-|   3536: 6f 6e 66 69 67 07 43 52 45 41 54 45 20 54 41 42   onfig.CREATE TAB
-|   3552: 4c 45 20 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b   LE 't1_config'(k
-|   3568: 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 76 29    PRIMARY KEY, v)
-|   3584: 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44 5b 06    WITHOUT ROWID[.
-|   3600: 07 17 21 21 01 81 01 74 61 62 6c 65 74 31 5f 64   ..!!...tablet1_d
-|   3616: 6f 63 73 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65   ocsizet1_docsize
-|   3632: 06 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74   .CREATE TABLE 't
-|   3648: 31 5f 64 6f 63 73 69 7a 65 27 28 69 64 20 49 4e   1_docsize'(id IN
-|   3664: 54 45 47 45 52 20 50 52 49 4d 41 52 59 20 4b 45   TEGER PRIMARY KE
-|   3680: 59 2c 20 73 7a 20 42 4c 4f 42 29 5e 05 07 17 21   Y, sz BLOB)^...!
-|   3696: 21 01 81 07 74 61 62 6c 65 74 31 5f 63 6f 6e 74   !...tablet1_cont
-|   3712: 65 6e 74 74 31 5f 63 6f 6e 74 65 6e 74 05 43 52   entt1_content.CR
-|   3728: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 63   EATE TABLE 't1_c
-|   3744: 6f 6e 74 65 6e 74 27 28 69 64 20 49 4e 54 45 47   ontent'(id INTEG
-|   3760: 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20   ER PRIMARY KEY, 
-|   3776: 63 30 2c 20 63 31 2c 20 63 32 29 69 04 07 17 19   c0, c1, c2)i....
-|   3792: 19 01 81 2d 74 61 62 6c 65 74 31 5f 69 64 78 74   ...-tablet1_idxt
-|   3808: 31 5f 69 64 78 04 43 52 45 41 54 45 20 54 41 42   1_idx.CREATE TAB
-|   3824: 4c 45 20 27 74 31 5f 69 64 78 27 28 73 65 67 69   LE 't1_idx'(segi
-|   3840: 64 2c 20 74 65 72 6d 2c 20 70 67 6e 6f 2c 20 50   d, term, pgno, P
-|   3856: 52 49 4d 41 52 59 20 4b 45 59 28 73 65 67 69 64   RIMARY KEY(segid
-|   3872: 2c 20 74 65 72 6d 29 29 20 57 49 54 48 4f 55 54   , term)) WITHOUT
-|   3888: 20 52 4f 57 49 44 55 03 07 17 1b 1b 01 81 01 74    ROWIDU........t
-|   3904: 61 62 6c 65 74 31 5f 64 61 74 61 74 31 5f 64 61   ablet1_datat1_da
-|   3920: 74 61 03 43 52 45 41 54 45 20 54 41 42 4c 45 20   ta.CREATE TABLE 
-|   3936: 27 74 31 5f 64 61 74 61 27 28 69 64 20 49 4e 54   't1_data'(id INT
-|   3952: 45 47 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59   EGER PRIMARY KEY
-|   3968: 2c 20 62 6c 6f 63 6b 20 42 4c 4f 42 29 38 02 06   , block BLOB)8..
-|   3984: 17 11 11 08 5f 74 61 62 6c 65 74 31 74 31 43 52   ...._tablet1t1CR
-|   4000: 45 41 54 45 20 56 49 52 54 55 41 4c 20 54 41 42   EATE VIRTUAL TAB
-|   4016: 4c 45 20 74 31 20 55 53 49 4e 47 20 66 74 73 35   LE t1 USING fts5
-|   4032: 28 61 2c 62 2c 63 29 00 00 00 00 00 00 00 00 00   (a,b,c).........
-| page 3 offset 8192
-|      0: 0d 00 00 00 03 0c 94 00 0f e6 0f ef 0c 94 00 00   ................
-|   3216: 00 00 00 00 86 4a 84 80 80 80 80 01 04 00 8d 18   .....J..........
-|   3232: 00 00 01 bb 02 30 30 01 02 06 01 02 06 01 02 06   .....00.........
-|   3248: 1f 02 03 01 02 03 01 02 03 01 08 32 30 31 36 30   ...........20160
-|   3264: 36 30 39 01 02 07 01 02 07 01 02 07 01 01 34 01   609...........4.
-|   3280: 02 05 01 02 05 01 02 05 01 01 35 01 02 04 01 02   ..........5.....
-|   3296: 04 01 02 04 02 07 30 30 30 30 30 30 30 1c 02 04   ......0000000...
-|   3312: 01 02 04 01 02 04 01 06 62 69 6e 61 72 79 03 06   ........binary..
-|   3328: 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01   ................
-|   3344: 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02   ................
-|   3360: 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02 02   ................
-|   3376: 03 06 01 02 02 03 06 01 02 02 01 08 63 6f 6d 70   ............comp
-|   3392: 69 6c 65 72 01 02 02 01 02 02 01 02 02 01 06 64   iler...........d
-|   3408: 62 73 74 61 74 07 02 03 01 02 03 01 02 03 02 04   bstat...........
-|   3424: 65 62 75 67 04 02 02 01 02 02 01 02 02 01 06 65   ebug...........e
-|   3440: 6b b1 62 6c 65 07 02 02 01 02 02 01 02 02 01 02   k.ble...........
-|   3456: 02 01 02 02 01 02 02 01 02 02 01 02 02 01 02 02   ................
-|   3472: 01 02 02 01 02 02 05 02 02 01 02 02 01 02 02 01   ................
-|   3488: 02 02 01 02 02 01 02 02 01 02 02 01 02 02 01 02   ................
-|   3504: 02 01 02 02 02 08 78 74 65 6e 73 69 6f 6e 1f 02   ......xtension..
-|   3520: 04 01 02 04 01 02 04 01 04 66 74 73 34 1a 02 03   .........fts4...
-|   3536: 01 02 03 01 02 03 04 01 35 0d 02 03 01 02 03 01   ........5.......
-|   3552: 02 03 01 03 67 63 63 01 02 03 01 02 03 01 02 03   ....gcc.........
-|   3568: 02 06 65 6f 70 6f 6c 79 10 02 03 01 02 03 01 02   ..eopoly........
-|   3584: 03 01 05 6a 73 6f 6e 31 13 02 03 01 02 03 01 02   ...json1........
-|   3600: 03 01 04 6c 6f 61 64 1f 02 03 01 02 03 01 02 03   ...load.........
-|   3616: 01 03 6d 61 78 1c 02 02 01 02 02 01 02 02 02 05   ..max...........
-|   3632: 65 6d 6f 72 79 1c 02 03 01 02 03 01 02 03 04 04   emory...........
-|   3648: 73 79 73 35 16 02 03 01 02 03 01 02 03 01 06 6e   sys5...........n
-|   3664: 6f 63 61 73 65 02 06 01 02 02 03 06 01 02 02 03   ocase...........
-|   3680: 06 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06   ................
-|   3696: 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01   ................
-|   3712: 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02   ................
-|   3728: 02 01 04 6f 6d 69 74 1f 02 02 01 02 02 01 02 01   ...omit.........
-|   3744: ff ff ff ff ff ff ff ff ff ff ff ff ff ff f1 02   ................
-|   3760: 58 81 96 4d 01 06 01 02 02 03 06 01 02 02 03 06   X..M............
-|   3776: 01 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01   ................
-|   3792: 02 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02   ................
-|   3808: 02 03 06 01 02 02 03 06 01 02 02 03 06 01 02 02   ................
-|   3824: 01 0a 74 68 72 65 61 64 73 61 66 65 22 02 02 01   ..threadsafe....
-|   3840: 02 02 01 02 02 01 04 76 74 61 62 07 02 04 01 02   .......vtab.....
-|   3856: 04 01 02 04 01 01 78 01 06 01 01 02 01 06 01 01   ......x.........
-|   3872: 02 01 06 01 c6 02 01 06 01 01 02 01 06 01 01 02   ................
-|   3888: 01 06 01 01 02 01 06 01 01 02 01 06 01 01 02 01   ................
-|   3904: 06 01 01 02 00 f6 01 01 02 01 06 01 01 02 01 06   ................
-|   3920: 01 01 02 01 06 01 01 02 01 06 01 01 02 01 06 01   ................
-|   3936: 01 02 01 06 01 01 02 01 06 01 01 02 01 06 01 01   ................
-|   3952: 02 01 06 01 01 02 01 06 01 01 02 01 06 01 01 02   ................
-|   3968: 01 06 01 01 02 01 06 01 01 02 01 06 01 01 02 01   ................
-|   3984: 06 01 01 02 01 06 01 01 02 01 06 01 01 02 01 06   ................
-|   4000: 01 01 02 01 06 01 01 02 01 06 01 01 02 01 06 01   ................
-|   4016: 01 02 01 06 01 01 02 01 06 01 01 02 01 06 01 01   ................
-|   4032: 02 01 06 01 01 02 01 06 01 01 02 04 15 13 0c 0c   ................
-|   4048: 12 44 13 11 0f 47 13 0f 0c 0e 11 10 0f 0e 10 0f   .D...G..........
-|   4064: 44 0f 10 40 15 0f 07 01 03 00 14 24 5a 24 24 0f   D..@.......$Z$$.
-|   4080: 0a 03 00 24 00 00 00 00 01 01 01 00 01 01 01 01   ...$............
-| page 4 offset 12288
-|      0: 0a 00 00 00 01 0f fa 00 0f fa 00 00 00 00 00 00   ................
-|   4080: 00 00 00 00 00 00 00 00 00 00 05 04 09 0c 01 02   ................
-| page 7 offset 24576
-|      0: 0a 00 00 00 01 0f f4 00 0f f4 00 00 00 00 00 00   ................
-|   4080: 00 00 00 00 0b 03 1b 01 76 65 72 73 69 6f 6e 04   ........version.
-| end crash-c69fcaceff1e50.db
-}]} {}
-
-do_catchsql_test 3.1 {
-  UPDATE t1 SET b=quote(zeroblob(200)) WHERE a MATCH 'thra*T';
-} {1 {database disk image is malformed}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_test 4.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 24576 pagesize 4096 filename crash-ef6738247b1344.db
-| page 1 offset 0
-|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-|     16: 10 00 01 01 00 40 20 20 00 10 00 06 40 00 00 06   .....@  ....@...
-|     32: 00 00 00 00 00 00 00 00 00 00 00 06 00 00 00 00   ................
-|     96: 00 00 00 00 0d 00 00 00 06 0e 0f 00 0f aa 0f 53   ...............S
-|    112: 0e e8 0e 8b 0e 33 0e 0f 00 00 00 00 00 00 00 00   .....3..........
-|   3584: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 22   ................
-|   3600: 06 06 17 11 11 01 31 74 61 62 6c 65 62 62 62 62   ......1tablebbbb
-|   3616: 06 43 52 45 41 54 45 20 54 41 42 4c 45 20 62 62   .CREATE TABLE bb
-|   3632: 28 61 29 56 05 06 17 1f 1f 01 7d 74 61 62 6c 65   (a)V.......table
-|   3648: 74 31 5f 63 6f 6e 66 69 67 74 31 5f 63 6f 6e 66   t1_configt1_conf
-|   3664: 69 67 05 43 52 45 41 54 45 20 54 41 42 4c 45 20   ig.CREATE TABLE 
-|   3680: 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b 20 50 52   't1_config'(k PR
-|   3696: 49 4d 41 52 59 20 4b 45 59 2c 20 76 29 20 57 49   IMARY KEY, v) WI
-|   3712: 54 48 4f 55 54 20 52 4f 57 49 44 5b 04 07 17 21   THOUT ROWID[...!
-|   3728: 21 01 81 01 74 61 62 6c 65 74 31 5f 64 6f 63 73   !...tablet1_docs
-|   3744: 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65 04 43 52   izet1_docsize.CR
-|   3760: 45 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 64   EATE TABLE 't1_d
-|   3776: 6f 63 73 69 7a 65 27 28 69 64 20 49 4e 54 45 47   ocsize'(id INTEG
-|   3792: 45 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20   ER PRIMARY KEY, 
-|   3808: 73 7a 20 42 4c 4f 42 29 69 03 07 17 19 19 01 81   sz BLOB)i.......
-|   3824: 2d 74 61 62 6c 65 74 31 5f 69 64 78 74 31 5f 69   -tablet1_idxt1_i
-|   3840: 64 78 03 43 52 45 41 54 45 20 54 41 42 4c 45 20   dx.CREATE TABLE 
-|   3856: 27 74 31 5f 69 64 78 27 28 73 65 67 69 64 2c 20   't1_idx'(segid, 
-|   3872: 74 65 72 6d 2c 20 6f 67 6e 6f 2c 20 50 52 49 4d   term, ogno, PRIM
-|   3888: 41 52 59 20 4b 45 59 28 73 65 67 69 64 2c 20 74   ARY KEY(segid, t
-|   3904: 65 72 6d 29 29 20 57 49 54 48 4f 55 54 20 52 4f   erm)) WITHOUT RO
-|   3920: 57 49 44 55 35 07 17 1b 1b 01 81 01 74 61 62 6c   WIDU5.......tabl
-|   3936: 65 74 31 5f 64 61 74 61 74 31 5f 64 61 74 61 02   et1_datat1_data.
-|   3952: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-|   3968: 5f 64 61 74 61 27 28 69 64 20 49 4e 54 45 47 45   _data'(id INTEGE
-|   3984: 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 62   R PRIMARY KEY, b
-|   4000: 6c 6f 63 6b 20 42 4c 4f 42 29 54 01 07 17 11 11   lock BLOB)T.....
-|   4016: 08 81 15 74 61 62 6c 65 74 31 74 31 43 52 45 41   ...tablet1t1CREA
-|   4032: 54 45 20 56 49 52 54 55 41 4c 20 54 41 42 4c 45   TE VIRTUAL TABLE
-|   4048: 20 74 31 20 55 53 49 4e 47 20 66 74 73 35 28 61    t1 USING fts5(a
-|   4064: 2c 62 2c 70 72 65 66 69 78 3d 22 31 2c 32 2c 33   ,b,prefix=.1,2,3
-|   4080: 2c 34 22 2c 20 63 6f 6e 74 65 6e 74 3d 22 22 29   ,4., content=..)
-| page 2 offset 4096
-|      0: 0d 0b 6a 00 37 09 4c 02 0f e7 09 4c 0f c6 0f a4   ..j.7.L....L....
-|     16: 0f 88 0f 6d 0f 4b 0f 2c 0f 0e 0e ec 0e cd 0e ad   ...m.K.,........
-|     32: 0e 8e 0e 6c 0e 4b 0e 29 0e 08 0d e6 0d c4 0d b5   ...l.K.)........
-|     48: 0d 97 0d 76 0d 54 0d 31 0d 15 0c f3 0c d3 0c b5   ...v.T.1........
-|     64: 0c 95 0c 73 0c 54 0c 32 0c 10 0b ee 0b cc 0b b0   ...s.T.2........
-|     80: 0b 8d 0b 7e 0b 48 0b 2e 0b 0b 0a ef 0a cc 0a 00   ...~.H..........
-|   2368: 00 00 00 00 00 00 00 00 00 00 00 00 15 0a 03 00   ................
-|   2384: 30 00 00 00 01 01 03 35 00 03 01 01 12 02 01 12   0......5........
-|   2400: 03 01 11 1c 8c 80 80 80 80 10 02 9c 3e 00 00 00   ............>...
-|   2416: 17 01 05 05 34 74 61 62 6c 03 02 03 01 04 77 68   ....4tabl.....wh
-|   2432: 65 72 03 02 06 09 1b 8c 80 80 80 80 0f 03 00 3c   er.............<
-|   2448: 00 00 00 16 05 34 66 74 73 34 03 02 02 01 04 6e   .....4fts4.....n
-|   2464: 75 6d 62 03 06 01 04 09 1b 8c 80 80 80 80 0e 03   umb.............
-|   2480: 00 3c 00 00 00 16 04 33 74 68 65 03 06 01 01 04   .<.....3the.....
-|   2496: 01 03 77 68 65 03 02 04 04 0a 1b 8c 80 80 80 80   ..whe...........
-|   2512: 0d 03 00 3c 00 00 00 16 04 33 6e 75 6d 03 06 01   ...<.....3num...
-|   2528: 01 05 01 03 74 61 62 03 02 03 04 0a 19 8c 80 80   ....tab.........
-|   2544: 80 80 0c 03 00 38 00 00 00 14 03 32 77 68 03 02   .....8.....2wh..
-|   2560: 04 00 04 33 66 74 73 03 12 02 04 07 18 8c 80 80   ...3fts.........
-|   2576: 80 80 0b 03 00 36 00 00 00 13 03 32 74 61 03 02   .....6.....2ta..
-|   2592: 03 02 01 68 03 06 01 01 04 04 07 1b 8c 80 80 80   ...h............
-|   2608: 80 0a 03 00 3c 00 00 00 16 03 32 6e 75 03 06 01   ....<.....2nu...
-|   2624: 01 05 01 02 6f 66 03 06 01 01 06 04 09 19 8c 80   ....of..........
-|   2640: 82 d0 80 09 03 00 38 00 00 00 14 03 32 66 74 03   ......8.....2ft.
-|   2656: 02 02 01 02 69 73 03 06 01 01 03 04 07 18 8c 80   ....is..........
-|   2672: 80 80 80 08 03 00 36 00 00 00 13 02 31 74 03 08   ......6.....1t..
-|   2688: 03 01 01 04 01 01 77 03 02 04 04 09 1a 8c 80 80   ......w.........
-|   2704: 80 80 07 03 00 3a 00 00 00 15 02 31 6e 03 08 01   .....:.....1n...
-|   2720: 01 02 05 01 01 6f 03 06 01 01 06 04 09 18 8c 80   .....o..........
-|   2736: 81 80 80 06 03 00 36 00 00 00 13 04 12 31 66 03   ......6......1f.
-|   2752: 02 02 01 01 69 03 06 01 01 03 05 06 1c 8c 80 80   ....i...........
-|   2768: 80 80 05 03 00 3e 00 00 00 17 04 30 74 68 65 03   .....>.....0the.
-|   2784: 06 01 01 04 01 05 77 68 65 72 65 03 02 04 0a 15   ......where.....
-|   2800: 8c 80 65 80 80 04 03 00 30 00 00 00 11 01 01 06   ..e.....0.......
-|   2816: 06 30 74 61 62 6c 65 03 02 03 07 1c 8c 80 80 80   .0table.........
-|   2832: 80 03 03 00 3e 00 00 00 17 07 30 6e 75 6d 62 65   ....>.....0numbe
-|   2848: 72 03 06 01 01 05 01 02 6f 66 03 06 04 0d 13 8c   r.......of......
-|   2864: 80 80 80 80 02 03 00 2c 00 00 00 0f fc 01 03 02   .......,........
-|   2880: 30 6e 03 06 01 00 f2 07 1b 8c 80 80 80 80 01 03   0n..............
-|   2896: 00 3c 00 00 00 16 08 30 66 74 73 34 61 75 78 03   .<.....0fts4aux.
-|   2912: 03 02 01 02 69 73 03 06 04 0c 00 00 00 18 ea 00   ....is..........
-|   2928: 00 00 01 01 02 24 00 02 01 01 12 02 01 12 08 88   .....$..........
-|   2944: 80 80 80 80 12 03 00 12 10 00 00 05 02 1c 88 80   ................
-|   2960: 80 80 80 11 03 00 3e 00 00 00 17 05 34 72 6f 77   ......>.....4row
-|   2976: 73 02 06 01 01 05 01 04 74 68 65 72 02 02 04 0b   s.......ther....
-|   2992: 15 88 80 80 80 80 10 03 00 2f ff ff f0 11 02 01   ........./......
-|   3008: 01 07 05 34 62 65 74 77 02 02 04 08 1b 88 80 80   ...4betw........
-|   3024: 80 80 0f cf 00 3c 00 00 00 16 04 04 33 72 6f 77   .....<......3row
-|   3040: 02 06 01 01 05 01 03 74 68 65 02 08 05 0a 1b 88   .......the......
-|   3056: 80 80 80 80 0d 03 00 3c 00 00 00 16 00 01 02 04   .......<........
-|   3072: 33 61 72 65 02 02 03 01 03 62 65 74 02 02 07 08   3are.....bet....
-|   3088: 1b 88 80 80 80 80 0d 03 00 3c 00 00 00 16 03 32   .........<.....2
-|   3104: 74 68 02 08 02 01 01 07 00 04 33 61 6e 64 02 06   th........3and..
-|   3120: 04 0a 1b 88 80 80 80 80 0c 03 00 3c 00 00 00 16   ...........<....
-|   3136: 03 32 69 6e 02 06 01 01 06 01 02 72 6f 02 06 01   .2in.......ro...
-|   3152: 01 05 04 09 18 88 80 80 80 80 0b 03 00 36 00 00   .............6..
-|   3168: 00 13 02 03 32 61 72 02 02 03 01 02 62 65 02 02   ....2ar.....be..
-|   3184: 04 05 07 1b 88 80 80 80 80 0a 03 00 3c 00 00 00   ............<...
-|   3200: 16 12 31 74 02 08 02 01 01 07 00 03 32 61 6e 02   ..1t........2an.
-|   3216: 06 01 01 04 09 19 88 80 80 80 80 09 03 00 38 00   ..............8.
-|   3232: 00 00 14 02 31 6e 02 06 01 01 03 01 01 72 02 06   ....1n.......r..
-|   3248: 01 01 05 04 08 17 78 80 80 80 80 08 03 00 34 10   ......x.......4.
-|   3264: 01 00 12 02 31 62 02 02 04 01 01 69 02 06 01 01   ....1b.....i....
-|   3280: 06 04 06 19 88 80 80 80 80 07 03 00 38 00 00 00   ............8...
-|   3296: 14 04 02 31 32 02 02 05 01 01 61 02 08 03 01 01   ...12.....a.....
-|   3312: 02 05 06 1b 88 80 80 80 80 06 03 00 3c 00 00 00   ............<...
-|   3328: 16 06 30 74 68 65 72 65 e7 02 02 00 02 31 31 02   ..0there.....11.
-|   3344: 06 01 01 04 0a 15 88 80 80 80 80 05 03 00 30 00   ..............0.
-|   3360: 00 00 11 01 01 05 e5 30 74 68 65 02 06 01 01 07   .......0the.....
-|   3376: 07 1c 88 80 80 80 80 04 03 00 3e 00 00 00 17 01   ..........>.....
-|   3392: 01 06 02 30 6e 02 06 01 01 03 01 04 72 6f 77 73   ...0n.......rows
-|   3408: 02 06 07 08 1b 88 80 80 80 80 03 03 00 3c 00 00   .............<..
-|   3424: 00 16 08 30 62 65 74 77 65 65 6e 02 02 04 01 02   ...0between.....
-|   3440: 69 6e 02 06 04 0c 1a 88 80 80 80 80 02 03 00 3a   in.............:
-|   3456: 00 00 00 15 04 30 61 6e 64 02 06 01 01 02 02 02   .....0and.......
-|   3472: 72 65 02 02 03 04 0a 17 88 80 80 80 80 01 03 00   re..............
-|   3488: 34 01 00 00 12 02 30 31 02 06 01 01 04 01 01 32   4.....01.......2
-|   3504: 02 02 05 04 08 08 84 80 80 80 80 12 03 00 16 00   ................
-|   3520: 00 00 05 04 1b 84 80 80 80 80 11 03 00 3c 00 00   .............<..
-|   3536: 00 16 05 34 74 61 62 6c 01 06 01 01 05 02 03 65   ...4tabl.......e
-|   3552: 72 6d 01 02 04 0b 1b 84 80 80 80 80 10 03 00 3c   rm.............<
-|   3568: 00 00 00 16 05 34 65 61 63 68 01 02 02 01 04 70   .....4each.....p
-|   3584: 72 65 73 01 02 05 04 09 1a 84 80 80 80 80 0f 03   res.............
-|   3600: 00 3a 00 00 00 15 04 33 74 65 72 01 02 04 02 02   .:.....3ter.....
-|   3616: 68 65 01 06 01 01 03 04 08 1b 84 80 80 80 80 0e   he..............
-|   3632: 03 00 3c 00 00 00 16 04 33 70 72 65 01 02 05 01   ..<.....3pre....
-|   3648: 03 74 61 62 01 06 01 01 05 04 08 1a 84 80 80 80   .tab............
-|   3664: 80 0d 03 0d 1a 00 00 00 15 04 33 66 6e 72 01 02   ..........3fnr..
-|   3680: 02 02 02 74 73 01 06 01 01 04 04 08 1b 84 80 80   ...ts...........
-|   3696: 80 80 0c 03 00 3c 00 00 00 16 03 32 74 68 01 06   .....<.....2th..
-|   3712: 01 01 03 00 04 33 65 61 63 01 02 03 04 09 18 84   .....3eac.......
-|   3728: 80 80 80 80 0b 03 00 36 00 00 00 13 03 32 74 61   .......6.....2ta
-|   3744: 01 06 01 01 05 02 01 65 01 02 04 04 09 19 84 80   .......e........
-|   3760: 80 80 80 0a 03 00 38 00 00 00 14 03 30 c9 6e 01   ......8.....0.n.
-|   3776: 06 01 01 02 01 02 70 72 01 02 05 04 09 18 84 80   ......pr........
-|   3792: 80 80 80 09 03 00 36 00 00 00 13 03 32 66 6f 01   ......6.....2fo.
-|   3808: 02 0b e2 01 74 01 06 01 01 04 04 07 1b 84 80 80   ....t...........
-|   3824: 86 f0 08 03 00 3c 00 00 00 16 02 31 74 01 0a 04   .....<.....1t...
-|   3840: 01 01 03 04 00 03 32 65 61 01 02 03 04 0a 17 84   ......2ea.......
-|   3856: 80 80 80 80 07 03 00 34 00 00 00 12 02 31 69 01   .......4.....1i.
-|   3872: 06 01 01 02 01 01 70 01 02 05 04 08 18 84 80 80   ......p.........
-|   3888: 80 80 06 03 00 36 00 00 00 13 02 31 65 01 02 03   .....6.....1e...
-|   3904: 01 01 66 01 08 02 01 01 04 04 06 1b 84 80 80 80   ..f.............
-|   3920: 80 05 03 00 3c 00 00 00 16 05 30 74 65 72 6d 01   ....<.....0term.
-|   3936: 02 04 02 02 68 65 01 06 01 01 03 04 09 14 84 80   ....he..........
-|   3952: 80 80 80 04 03 00 2e 00 00 00 10 06 30 74 61 62   ............0tab
-|   3968: 6c 65 01 06 01 01 05 04 15 84 7f 80 80 80 03 03   le..............
-|   3984: 00 30 00 00 00 11 02 08 30 70 72 65 73 65 6e 74   .0......0present
-|   4000: 01 02 05 05 1b 84 80 22 80 80 02 03 00 3c 00 00   .............<..
-|   4016: 00 16 04 30 66 74 73 01 06 01 01 04 01 02 69 6e   ...0fts.......in
-|   4032: 01 06 01 01 04 0a 1a 84 80 80 80 80 01 03 00 3a   ...............:
-|   4048: 00 00 00 15 05 30 65 61 63 68 01 02 03 01 03 66   .....0each.....f
-|   4064: 6f 72 01 02 02 04 09 06 01 03 00 12 03 0b 0f 00   or..............
-|   4080: 00 08 8c 80 80 80 80 11 03 00 16 00 00 00 05 04   ................
-| page 3 offset 8192
-|      0: 0a 00 00 00 32 0e 4f 00 0f fa 0f f1 0f e9 0f e1   ....2.O.........
-|     16: 0f d8 0f d1 0f c9 0f c1 0f b9 0f b1 0f a9 0f a0   ................
-|     32: 0f 98 0f 90 0f 87 0f 80 0f 78 0f 71 0f 68 0f 5f   .........x.q.h._
-|     48: 0f 56 0f 00 00 00 00 00 00 00 00 00 00 00 00 00   .V..............
-|   3392: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 08   ................
-|   3408: 04 01 10 01 03 34 74 20 07 04 01 0e 01 03 34 1e   .....4t ......4.
-|   3424: 09 04 01 12 01 03 33 74 68 1c 08 04 01 10 01 03   ......3th.......
-|   3440: 34 6e 1a 08 04 01 10 01 03 32 67 18 08 04 01 10   4n.......2g.....
-|   3456: 01 03 32 74 16 08 04 01 10 01 03 32 6e 14 07 04   ..2t.......2n...
-|   3472: 01 0e 01 03 32 12 08 04 01 10 01 03 31 74 10 08   ....2.......1t..
-|   3488: 04 01 10 01 03 31 6e 0e 07 04 01 0e 01 03 31 0c   .....1n.......1.
-|   3504: 09 04 01 12 01 03 30 74 68 0a 08 04 01 10 01 03   ......0th.......
-|   3520: 30 74 08 09 04 01 12 01 03 30 6e 75 06 08 04 01   0t.......0nu....
-|   3536: 10 01 03 30 6e 04 06 04 01 0c 01 03 02 08 04 01   ...0n...........
-|   3552: 10 01 02 34 72 22 07 04 01 0e 01 02 34 20 08 04   ...4r.......4 ..
-|   3568: 01 10 01 02 33 72 1e 09 04 01 12 01 02 33 61 72   ....3r.......3ar
-|   3584: 1c 18 04 01 10 01 02 32 74 1a 08 04 01 10 01 02   .......2t.......
-|   3600: 32 69 18 09 04 01 12 01 02 32 61 72 16 08 04 01   2i.......2ar....
-|   3616: 10 01 02 31 74 2a 08 04 01 0f 01 02 31 6e 12 0a   ...1t*......1n..
-|   3632: d4 01 10 01 02 31 62 10 08 04 01 10 01 02 31 32   .....1b.......12
-|   3648: 0e 0b 04 01 16 01 02 30 74 68 65 72 0c 08 04 01   .......0ther....
-|   3664: 10 01 02 30 74 0a 08 04 01 10 01 02 30 6e 08 08   ...0t.......0n..
-|   3680: 04 01 10 01 02 30 62 06 08 04 01 10 01 02 30 61   .....0b.......0a
-|   3696: 04 06 03 f1 0c 01 02 02 07 04 09 10 01 34 74 22   .............4t.
-|   3712: 06 04 09 0e 01 34 20 08 04 09 12 01 33 74 65 1e   .....4 .....3te.
-|   3728: 07 04 09 10 01 33 70 1c 07 04 09 10 01 33 66 1a   .....3p......3f.
-|   3744: 08 04 09 12 01 32 74 68 18 07 04 09 10 01 32 74   .....2th......2t
-|   3760: 16 07 04 09 10 01 32 69 14 07 04 09 10 01 32 66   ......2i......2f
-|   3776: 12 07 04 09 10 01 31 74 10 07 04 09 10 01 31 69   ......1t......1i
-|   3792: 0e 06 04 09 0e 01 31 0c 08 04 09 12 01 30 74 65   ......1......0te
-|   3808: 0a 07 04 09 10 01 30 74 08 07 04 09 10 01 30 70   ......0t......0p
-|   3824: 06 08 04 09 1e 61 30 66 74 04 05 00 00 00 00 00   .....a0ft.......
-| page 4 offset 12288
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 05 03 03 00 10   ................
-|   4080: 03 05 05 02 03 00 10 04 06 05 01 03 00 10 04 04   ................
-| page 5 offset 16384
-|      0: 0a 00 00 00 02 0f eb 00 0f eb 0f f4 00 00 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 08 03 15 01 70   ...............p
-|   4080: 67 73 7a 18 0b 03 1b 01 76 65 72 73 69 6f 6e 04   gsz.....version.
-| end crash-ef6738247b1344.db
-}]} {}
-
-
-do_catchsql_test 4.1 {
-  BEGIN;
-  REPLACE INTO t1(rowid,b,a,rowid) VALUES(200,1,2,3);
-} {1 {database disk image is malformed}}
-
-do_catchsql_test 4.2 {
-  INSERT INTO t1(t1) VALUES('delete-all');
-} {1 {database disk image is malformed}}
-do_catchsql_test 4.3 {
-  REPLACE INTO t1(rowid,b,rowid,a) VALUES(200,1,2,3);
-} {1 {database disk image is malformed}}
-do_catchsql_test 4.4 {
-  REPLACE INTO t1(rowid,b,a,rowid) VALUES(0,1,2,3);
-} {1 {database disk image is malformed}}
-do_catchsql_test 4.5 {
-  REPLACE INTO t1(rowid,a,b,rowid) VALUES(200,1,2,3);
-} {1 {database disk image is malformed}}
-
-sqlite3_fts5_may_be_corrupt 0
-finish_test
-
@@ -50,68 +50,4 @@ do_test 1.2 {
  }
 } {}

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 2.0 {
-  CREATE TABLE test (
-      id INTEGER PRIMARY KEY,
-      name TEXT,
-      value TEXT
-  );
-  CREATE VIRTUAL TABLE test_idx USING fts5(
-      name, content=test, content_rowid=id
-  );
-}
-
-do_catchsql_test 2.1 {
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 1, 'quick');
-} {1 {database disk image is malformed}}
-
-do_catchsql_test 2.2 {
-  INSERT INTO test_idx(rowid, name) VALUES(123, 'one one one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-} {1 {database disk image is malformed}}
-
-do_execsql_test 2.3 {
-  DROP TABLE test_idx;
-  CREATE VIRTUAL TABLE test_idx USING fts5(
-      name, content=test, content_rowid=id
-  );
-
-  INSERT INTO test_idx(rowid, name) VALUES(123, 'one one one');
-  INSERT INTO test_idx(rowid, name) VALUES(124, 'two two two');
-  INSERT INTO test_idx(rowid, name) VALUES(125, 'two two two');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-}
-
-do_catchsql_test 2.4 {
-  SELECT rowid FROM test_idx WHERE test_idx MATCH 'two' ORDER BY rank;
-} {1 {database disk image is malformed}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE tx USING fts5(a, b, c, d, content=);
-  INSERT INTO tx(rowid, a, c) VALUES(1, 'abc def', 'a b c');
-  INSERT INTO tx(rowid, a, c) VALUES(5, 'a b c', 'a b d def');
-}
-do_execsql_test 3.1 {
-  INSERT INTO tx(tx, rowid, a, b, c, d) 
-    VALUES('delete', 5, 'a b c', NULL, 'a b d def', NULL);
-}
-do_execsql_test 3.2 {
-  INSERT INTO tx(tx) VALUES('integrity-check');
-}
-do_execsql_test 3.3 {
-  INSERT INTO tx(tx, rowid, a, b, c, d) 
-    VALUES('delete', 1, 'abc def', NULL, 'a b c', NULL);
-}
-do_execsql_test 3.4 {
-  INSERT INTO tx(tx) VALUES('integrity-check');
-}
-
 finish_test
-
@@ -212,10 +212,6 @@ do_catchsql_test 4.1 {
  SELECT * FROM t4('a:a')
 } {1 {fts5: column queries are not supported (detail=none)}}

-do_catchsql_test 4.2 {
-  SELECT * FROM t4('a:a &')
-} {1 {fts5: syntax error near "&"}}
-
 #-------------------------------------------------------------------------
 # Test that for the same content detail=none uses less space than 
 # detail=col, and that detail=col uses less space than detail=full
@@ -42,26 +42,5 @@ do_execsql_test 1.2 {
  INSERT INTO ccc(ccc) VALUES('integrity-check');
 }

-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 2.1 {
-  CREATE VIRTUAL TABLE tx USING fts5(x);
-}
-
-set doc [string repeat "abc " 5000]
-do_execsql_test 2.2 {
-  BEGIN;
-    INSERT INTO tx(rowid, x) VALUES(-9000000000000000000, $doc);
-    INSERT INTO tx(rowid, x) VALUES(9000000000000000000, $doc);
-  COMMIT;
-}
-
-do_execsql_test 2.3 {
-  SELECT rowid FROM tx('abc');
-} {
-  -9000000000000000000
-   9000000000000000000
-}

 finish_test
@@ -14,7 +14,7 @@

 source [file join [file dirname [info script]] fts5_common.tcl]
 source $testdir/malloc_common.tcl
-set testprefix fts5faultD
+set testprefix fts5faultA

 # If SQLITE_ENABLE_FTS3 is defined, omit this file.
 ifcapable !fts5 {
@@ -1,71 +0,0 @@
-# 2016 February 2
-#
-# 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 is focused on OOM errors.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-source $testdir/malloc_common.tcl
-set testprefix fts5faultE
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-faultsim_save_and_close
-do_faultsim_test 1 -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql { CREATE VIRTUAL TABLE t1 USING fts5(x, y, tokenize=trigram) }
-} -test {
-  faultsim_test_result {0 {}} {1 {vtable constructor failed: t1}} 
-}
-
-reset_db
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y, tokenize=trigram);
-}
-
-faultsim_save_and_close
-do_faultsim_test 2 -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql { 
-    INSERT INTO t1 VALUES('abcdefghijklmnopqrstuvwxyz', NULL);
-    SELECT count(*) FROM t1 WHERE x LIKE '%mnop%' AND t1 MATCH 'jkl';
-  }
-} -test {
-  faultsim_test_result {0 1} {1 {vtable constructor failed: t1}}
-}
-
-reset_db
-do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y, tokenize=trigram, detail=none);
-  INSERT INTO t1 VALUES('abcdefghijklmnopqrstuvwxyz', NULL);
-}
-
-faultsim_save_and_close
-do_faultsim_test 3 -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql { 
-    SELECT count(*) FROM t1 WHERE x LIKE '%mnopqrs%' AND t1 MATCH 'abc'
-  }
-} -test {
-  faultsim_test_result {0 1} {1 {vtable constructor failed: t1}}
-}
-
-
-
-finish_test
-
@@ -112,7 +112,7 @@ foreach_detail_mode $testprefix {
  # Add a small and very large token with the same hash value to an
  # empty table. At one point this would provoke an asan error.
  #
-  do_test 1.5 {
+  do_test 2.0 {
    set big [string repeat 12345 40]
    set hash [sqlite3_fts5_token_hash 1024 $big]
    while {1} {
@@ -128,41 +128,4 @@ foreach_detail_mode $testprefix {

 } ;# foreach_detail_mode

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 2.1 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x);
-  INSERT INTO t1(t1, rank) VALUES('hashsize', 1024);
-  INSERT INTO t1(t1, rank) VALUES('automerge', 0);
-  INSERT INTO t1(t1, rank) VALUES('crisismerge', 1000);
-}
-
-do_execsql_test 2.2 {
-  BEGIN;
-    INSERT INTO t1 VALUES('abc def ghi');
-    SELECT count(*) FROM t1_data;
-} {2}
-
-do_execsql_test 2.3 {
-  WITH s(i) AS (
-    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<1024
-  )
-  INSERT INTO t1 SELECT 'abc def ghi' FROM s;
-  SELECT (SELECT count(*) FROM t1_data) > 10;
-} {1}
-
-do_execsql_test 2.4 {
-  COMMIT;
-  DROP TABLE t1;
-  CREATE VIRTUAL TABLE t1 USING fts5(x);
-  INSERT INTO t1(t1, rank) VALUES('hashsize', 1024);
-  INSERT INTO t1(t1, rank) VALUES('automerge', 0);
-  INSERT INTO t1(t1, rank) VALUES('crisismerge', 1000);
-  WITH s(i) AS (
-    SELECT 1 UNION ALL SELECT i+1 FROM s WHERE i<1024
-  )
-  INSERT INTO t1 SELECT 'abc' || i || ' def' || i || ' ghi' || i FROM s;
-  SELECT (SELECT count(*) FROM t1_data) > 100;
-} {1}
-
 finish_test
@@ -273,6 +273,7 @@ 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');
@@ -281,40 +282,4 @@ do_execsql_test 9.3 {
  INSERT INTO vt0(vt0) VALUES('integrity-check');
 }

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 10.0 {
-  CREATE TABLE t1(i INTEGER PRIMARY KEY, a, b);
-  CREATE VIRTUAL TABLE vt0 USING fts5(a, b, content=t1);
-  INSERT INTO vt0(rowid, a, b) VALUES(1, 'abc', 'def');
-}
-do_catchsql_test 10.1 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-} {0 {}}
-do_catchsql_test 10.2 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 0);
-} {0 {}}
-do_catchsql_test 10.3 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 1);
-} {1 {database disk image is malformed}}
-do_catchsql_test 10.3 {
-  INSERT INTO t1 VALUES(1, 'abc', 'def');
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 1);
-} {0 {}}
-
-do_execsql_test 10.4 {
-  CREATE VIRTUAL TABLE vt1 USING fts5(a, b, content=);
-  INSERT INTO vt1(rowid, a, b) VALUES(1, 'abc', 'def');
-}
-
-do_catchsql_test 10.5.1 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 0);
-} {0 {}}
-do_catchsql_test 10.5.2 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 1);
-} {0 {}}
-do_catchsql_test 10.5.3 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-} {0 {}}
-
 finish_test
@@ -323,34 +323,5 @@ do_execsql_test 12.3 {
  SELECT * FROM t2 JOIN ft USING (ft)
 } {3 4 b b}

-#-------------------------------------------------------------------------
-# Forum post https://sqlite.org/forum/forumpost/21127c1160
-#
-reset_db
-sqlite3_db_config db DEFENSIVE 1
-
-do_execsql_test 13.0 {
-  CREATE TABLE a (id INTEGER PRIMARY KEY, name TEXT);
-  CREATE VIRTUAL TABLE b USING fts5(name);
-  CREATE TRIGGER a_trigger AFTER INSERT ON a BEGIN 
-    INSERT INTO b (name) VALUES ('foo');
-  END;
-}
-
-do_test 13.1 {
-  set ::STMT [
-    sqlite3_prepare db "INSERT INTO a VALUES (1, 'foo') RETURNING id;" -1 dummy
-  ]
-  sqlite3_step $::STMT
-} {SQLITE_ROW}
-
-do_test 13.2 {
-  sqlite3_finalize $::STMT
-} {SQLITE_OK}
-
-do_test 13.3 {
-  sqlite3_errmsg db
-} {not an error}
-
 finish_test

@@ -30,23 +30,23 @@ do_eqp_test 1.1 {
  SELECT * FROM t1, f1 WHERE f1 MATCH t1.x
 } {
  QUERY PLAN
-  |--SCAN t1
-  `--SCAN f1 VIRTUAL TABLE INDEX 0:M1
+  |--SCAN TABLE t1
+  `--SCAN TABLE f1 VIRTUAL TABLE INDEX 0:m
 }

 do_eqp_test 1.2 {
  SELECT * FROM t1, f1 WHERE f1 > t1.x
 } {
  QUERY PLAN
-  |--SCAN f1 VIRTUAL TABLE INDEX 0:
-  `--SCAN t1
+  |--SCAN TABLE f1 VIRTUAL TABLE INDEX 0:
+  `--SCAN TABLE t1
 }

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

@@ -54,12 +54,12 @@ do_eqp_test 1.4 {
  SELECT * FROM f1 ORDER BY rank
 } {
  QUERY PLAN
-  |--SCAN f1 VIRTUAL TABLE INDEX 0:
+  |--SCAN TABLE f1 VIRTUAL TABLE INDEX 0:
  `--USE TEMP B-TREE FOR ORDER BY
 }

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

 finish_test
@@ -1,57 +0,0 @@
-# 2020 Dec 3
-#
-# 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 contains tests focused on prefix indexes.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5prefix2
-
-# If SQLITE_ENABLE_FTS5 is defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-foreach p {3 2 1} {
-  reset_db
-    do_execsql_test 1.$p.0 "
-    CREATE VIRTUAL TABLE t1 USING fts5(xyz, prefix=$p);
-  "
-  do_execsql_test 1.$p.1 {
-    INSERT INTO t1 VALUES
-      ('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 f.');
-  }
-
-  do_execsql_test 1.$p.2 {
-    SELECT highlight(t1, 0, '[', ']') FROM t1('f*');
-  } {
-    {May you [find] [forgiveness] [for] yourself and [forgive] others.}
-    {May you share [freely], never taking more than you give [f].}
-  }
-}
-
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t2 USING fts5(one, prefix=3);
-  INSERT INTO t2 VALUES('top');
-  INSERT INTO t2 VALUES('to');
-  INSERT INTO t2 VALUES('tommy');
-}
-
-do_execsql_test 2.1 {
-  SELECT * FROM t2('to*');
-} {top to tommy}
-
-
-
-finish_test
@@ -111,40 +111,5 @@ do_catchsql_test 2.1 {
  SELECT * FROM t4;
 } {1 {SQL logic error}}

-#-------------------------------------------------------------------------
-# Embedded 0x00 characters.
-#
-reset_db
-do_execsql_test 3.1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(z);
-  CREATE VIRTUAL TABLE tt USING fts5vocab(t1, 'instance');
-  INSERT INTO t1 VALUES('abc' || char(0) || 'def');
-  SELECT * FROM tt;
-} { abc 1 z 0 def 1 z 1 }
-do_execsql_test 3.1.1 {
-  SELECT hex(z) FROM t1;
-} {61626300646566}
-do_execsql_test 3.1.2 {
-  INSERT INTO t1(t1) VALUES('integrity-check');
-} {}
-
-do_execsql_test 3.2.0 {
-  CREATE VIRTUAL TABLE t2 USING fts5(z, 
-      tokenize="unicode61 categories 'L* N* Co Cc'"
-  );
-  CREATE VIRTUAL TABLE tu USING fts5vocab(t2, 'instance');
-
-  INSERT INTO t2 VALUES('abc' || char(0) || 'def');
-  SELECT * FROM tu;
-} { abc 1 z 0 def 1 z 1 }
-
-do_execsql_test 3.2.1 {
-  SELECT hex(z) FROM t1;
-} {61626300646566}
-
-do_execsql_test 3.2.2 {
-  INSERT INTO t1(t1) VALUES('integrity-check');
-} {}
-

 finish_test
@@ -1,200 +0,0 @@
-# 2020 September 30
-#
-# 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.
-#
-#*************************************************************************
-#
-# Tests for the fts5 "trigram" tokenizer.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-ifcapable !fts5 { finish_test ; return }
-set ::testprefix fts5trigram
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize=trigram);
-  INSERT INTO t1 VALUES('abcdefghijklm');
-  INSERT INTO t1 VALUES('กรุงเทพมหานคร');
-}
-
-foreach {tn s res} {
-  1 abc           "(abc)defghijklm"
-  2 defgh         "abc(defgh)ijklm"
-  3 abcdefghijklm "(abcdefghijklm)"
-  4 กรุ            "(กรุ)งเทพมหานคร"
-  5 งเทพมห        "กรุ(งเทพมห)านคร"
-  6 กรุงเทพมหานคร  "(กรุงเทพมหานคร)"
-  7 Abc           "(abc)defghijklm"
-  8 deFgh         "abc(defgh)ijklm"
-  9 aBcdefGhijKlm "(abcdefghijklm)"
-} {
-  do_execsql_test 1.1.$tn {
-    SELECT highlight(t1, 0, '(', ')') FROM t1($s)
-  } $res
-}
-
-do_execsql_test 1.2.0 {
-  SELECT fts5_expr('ABCD', 'tokenize=trigram')
-} {{"abc" + "bcd"}}
-
-do_execsql_test 1.2.1 {
-  SELECT * FROM t1 WHERE y LIKE ? ESCAPE 'a'
-}
-
-foreach {tn like res} {
-  1 {%cDef%}   1
-  2 {cDef%}    {}
-  3 {%f%}      1
-  4 {%f_h%}    1
-  5 {%f_g%}    {}
-  6 {abc%klm}  1
-  7 {ABCDEFG%} 1
-  8 {%รุงเ%}    2
-} {
-  do_execsql_test 1.3.$tn {
-    SELECT rowid FROM t1 WHERE y LIKE $like
-  } $res
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize="trigram case_sensitive 1");
-  INSERT INTO t1 VALUES('abcdefghijklm');
-  INSERT INTO t1 VALUES('กรุงเทพมหานคร');
-}
-
-foreach {tn s res} {
-  1 abc           "(abc)defghijklm"
-  2 defgh         "abc(defgh)ijklm"
-  3 abcdefghijklm "(abcdefghijklm)"
-  4 กรุ            "(กรุ)งเทพมหานคร"
-  5 งเทพมห        "กรุ(งเทพมห)านคร"
-  6 กรุงเทพมหานคร  "(กรุงเทพมหานคร)"
-  7 Abc           ""
-  8 deFgh         ""
-  9 aBcdefGhijKlm ""
-} {
-  do_execsql_test 2.1.$tn {
-    SELECT highlight(t1, 0, '(', ')') FROM t1($s)
-  } $res
-}
-foreach {tn like res} {
-  1 {%cDef%}   1
-  2 {cDef%}    {}
-  3 {%f%}      1
-  4 {%f_h%}    1
-  5 {%f_g%}    {}
-  6 {abc%klm}  1
-  7 {ABCDEFG%} 1
-  8 {%รุงเ%}    2
-} {
-  do_execsql_test 2.2.$tn {
-    SELECT rowid FROM t1 WHERE y LIKE $like
-  } $res
-}
-foreach {tn like res} {
-  1 {*cdef*}     1
-  2 {cdef*}      {}
-  3 {*f*}        1
-  4 {*f?h*}      1
-  5 {*f?g*}      {}
-  6 {abc*klm}    1
-  7 {abcdefg*}   1
-  8 {*รุงเ*}      2
-  9 {abc[d]efg*} 1
- 10 {abc[]d]efg*} 1
- 11 {abc[^]d]efg*} {}
- 12 {abc[^]XYZ]efg*} 1
-} {
-  do_execsql_test 2.3.$tn {
-    SELECT rowid FROM t1 WHERE y GLOB $like
-  } $res
-}
-
-do_execsql_test 2.3.null.1 {
-  SELECT rowid FROM t1 WHERE y LIKE NULL
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_catchsql_test 3.1 {
-  CREATE VIRTUAL TABLE ttt USING fts5(c, tokenize="trigram case_sensitive 2");
-} {1 {error in tokenizer constructor}}
-do_catchsql_test 3.2 {
-  CREATE VIRTUAL TABLE ttt USING fts5(c, tokenize="trigram case_sensitive 11");
-} {1 {error in tokenizer constructor}}
-do_catchsql_test 3.3 {
-  CREATE VIRTUAL TABLE ttt USING fts5(c, "tokenize=trigram case_sensitive 1");
-} {0 {}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE t0 USING fts5(b, tokenize = "trigram");
-}
-do_execsql_test 4.1 {
-  INSERT INTO t0 VALUES (x'000b01');
-}
-do_execsql_test 4.2 {
-  INSERT INTO t0(t0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-reset_db
-foreach_detail_mode $::testprefix {
-  foreach {ci} {0 1} {
-    reset_db
-    do_execsql_test 5.cs=$ci.0.1 "
-      CREATE VIRTUAL TABLE t1 USING fts5(
-          y, tokenize=\"trigram case_sensitive $ci\", detail=%DETAIL%
-      );
-    "
-    do_execsql_test 5.cs=$ci.0.2 {
-      INSERT INTO t1 VALUES('abcdefghijklm');
-      INSERT INTO t1 VALUES('กรุงเทพมหานคร');
-    }
-
-    foreach {tn like res} {
-      1 {%cDef%}   1
-      2 {cDef%}    {}
-      3 {%f%}      1
-      4 {%f_h%}    1
-      5 {%f_g%}    {}
-      6 {abc%klm}  1
-      7 {ABCDEFG%} 1
-      8 {%รุงเ%}    2
-    } {
-      do_execsql_test 5.cs=$ci.1.$tn {
-        SELECT rowid FROM t1 WHERE y LIKE $like
-      } $res
-    }
-  }
-}
-
-do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE ci0 USING fts5(x, tokenize="trigram");
-  CREATE VIRTUAL TABLE ci1 USING fts5(x, tokenize="trigram case_sensitive 1");
-}
-
-# LIKE and GLOB both work with case-insensitive tokenizers. Only GLOB works
-# with case-sensitive.
-do_eqp_test 6.1 {
-  SELECT * FROM ci0 WHERE x LIKE ?
-} {VIRTUAL TABLE INDEX 0:L0}
-do_eqp_test 6.2 {
-  SELECT * FROM ci0 WHERE x GLOB ?
-} {VIRTUAL TABLE INDEX 0:G0}
-do_eqp_test 6.3 {
-  SELECT * FROM ci1 WHERE x LIKE ?
-} {{SCAN ci1 VIRTUAL TABLE INDEX 0:}}
-do_eqp_test 6.4 {
-  SELECT * FROM ci1 WHERE x GLOB ?
-} {VIRTUAL TABLE INDEX 0:G0}
-
-finish_test
@@ -234,53 +234,4 @@ ifcapable fts3 {
  } {1 {no such fts5 table: main.nosuchtable}}
 }

-#-------------------------------------------------------------------------
-# Check that the fts5 table cannot be written while there are vocab 
-# cursors open.
-reset_db
-do_execsql_test 5.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a);
-  CREATE VIRTUAL TABLE v1 USING fts5vocab(t1, instance);
-  INSERT INTO t1 VALUES('one'), ('two'), ('three'), ('four');
-}
-
-do_test 5.1 {
-  list [catch {
-    db eval { SELECT * FROM v1 } {
-      db eval {INSERT INTO t1 VALUES('five')}
-    }
-  } msg] $msg
-} {1 {query aborted}}
-
-do_execsql_test 5.2 {
-  SELECT * FROM t1
-} {one two three four five}
-
-#-------------------------------------------------------------------------
-# Check that the fts5 table cannot be written while there are vocab 
-# cursors open.
-reset_db
-do_execsql_test 5.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a);
-  CREATE VIRTUAL TABLE v1 USING fts5vocab(t1, instance);
-  WITH s(i) AS (
-    VALUES(1) UNION ALL SELECT i+1 FROM s WHERE i<10000
-  )
-  INSERT INTO t1 SELECT 
-    'State Emergency Service (SES), Rural Fire Service (RFS) and Volunteers'
-  FROM s;
-}
-
-do_catchsql_test 5.1 {
-  INSERT INTO t1 SELECT rowid FROM v1
-} {1 {query aborted}}
-
-do_catchsql_test 5.2 {
-  DELETE FROM t1 WHERE rowid>100;
-  INSERT INTO t1 SELECT randomblob(3000) FROM v1
-} {1 {query aborted}}
-
-
 finish_test
-
-
@@ -12,7 +12,6 @@ proc process_cmdline {} {
  cmdline::process ::A $::argv {
    {fts5                 "use fts5 (this is the default)"}
    {fts4                 "use fts4"}
-    {trigram              "Use tokenize=trigram"}
    {colsize   "10 10 10" "list of column sizes"}
    {tblname   "t1"       "table name to create"}
    {detail    "full"     "Fts5 detail mode to use"}
@@ -176,7 +175,6 @@ proc create_table {} {
  set sql    "CREATE VIRTUAL TABLE IF NOT EXISTS $A(tblname) USING $A(fts) ("
  append sql [join $cols ,]
  if {$A(fts)=="fts5"} { append sql ",detail=$A(detail)" }
-  if {$A(trigram)} { append sql ",tokenize=trigram" }
  append sql ", prefix='$A(prefix)');"

  db eval $sql
@@ -60,8 +60,7 @@ proc fts5_source_id {zDir} {

  set L [split [readfile [file join $top manifest]]] 
  set date [lindex $L [expr [lsearch -exact $L D]+1]]
-  set idx [expr {[string last . $date]-1}]
-  set date [string range $date 0 $idx]
+  set date [string range $date 0 [string last . $date]-1]
  set date [string map {T { }} $date]

  return "fts5: $date $uuid"
@@ -24,3 +24,4 @@ int sqlite3IcuInit(sqlite3 *db);
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif  /* __cplusplus */
+
@@ -654,3 +654,5 @@ void test_data_3(
    testFree(zName);
  }
 }
+
+
@@ -322,3 +322,5 @@ void do_writer_crash_test(const char *zPattern, int *pRc){
  }

 }
+
+
@@ -138,3 +138,6 @@ void test_data_4(
    testFree(zName);
  }
 }
+
+
+
@@ -69,3 +69,7 @@ int do_bt(int nArg, char **azArg){
  sqlite4_buffer_clear(&buf.output);
  return 0;
 }
+
+
+
+
@@ -553,7 +553,7 @@ static int sql_begin(TestDb *pTestDb, int iLevel){
  /* If there are no transactions at all open, open a read transaction. */
  if( pDb->nOpenTrans==0 ){
    int rc = sqlite3_exec(pDb->db, 
-        "BEGIN; SELECT * FROM sqlite_schema LIMIT 1;" , 0, 0, 0
+        "BEGIN; SELECT * FROM sqlite_master LIMIT 1;" , 0, 0, 0
    );
    if( rc!=0 ) return rc;
    pDb->nOpenTrans = 1;
@@ -367,3 +367,4 @@ int test_mdb_scan(
 }

 #endif /* HAVE_MDB */
+
@@ -978,3 +978,5 @@ static int bgc_detach(BtDb *pDb){
 /*
 ** End of background checkpointer.
 *************************************************************************/
+
+
@@ -228,10 +228,6 @@ static int lsmPosixOsRemap(
    }

    p->pMap = mmap(0, iSz, PROT_READ|PROT_WRITE, MAP_SHARED, p->fd, 0);
-    if( p->pMap==MAP_FAILED ){
-      p->pMap = 0;
-      return LSM_IOERR_BKPT;
-    }
    p->nMap = iSz;
  }

@@ -417,10 +413,7 @@ static int lsmPosixOsShmMap(lsm_file *pFile, int iChunk, int sz, void **ppShm){
    p->apShm[iChunk] = mmap(0, LSM_SHM_CHUNK_SIZE, 
        PROT_READ|PROT_WRITE, MAP_SHARED, p->shmfd, iChunk*LSM_SHM_CHUNK_SIZE
    );
-    if( p->apShm[iChunk]==MAP_FAILED ){
-      p->apShm[iChunk] = 0;
-      return LSM_IOERR_BKPT;
-    }
+    if( p->apShm[iChunk]==0 ) return LSM_IOERR_BKPT;
  }

  *ppShm = p->apShm[iChunk];
@@ -14,23 +14,24 @@
 ** appended onto the end of some other file, such as an executable.
 **
 ** A special record must appear at the end of the file that identifies the
-** file as an appended database and provides the offset to the first page
-** of the exposed content. (Or, it is the length of the content prefix.)
-** For best performance page 1 should be located at a disk page boundary,
-** though that is not required.
+** file as an appended database and provides an offset to page 1.  For
+** best performance page 1 should be located at a disk page boundary, though
+** that is not required.
 **
 ** When opening a database using this VFS, the connection might treat
-** the file as an ordinary SQLite database, or it might treat it as a
-** database appended onto some other file.  The decision is made by
-** applying the following rules in order:
+** the file as an ordinary SQLite database, or it might treat is as a
+** database appended onto some other file.  Here are the rules:
 **
-**  (1)  An empty file is an ordinary database.
+**  (1)  When opening a new empty file, that file is treated as an ordinary
+**       database.
 **
-**  (2)  If the file ends with the appendvfs trailer string
-**       "Start-Of-SQLite3-NNNNNNNN" that file is an appended database.
+**  (2)  When opening a file that begins with the standard SQLite prefix
+**       string "SQLite format 3", that file is treated as an ordinary
+**       database.
 **
-**  (3)  If the file begins with the standard SQLite prefix string
-**       "SQLite format 3", that file is an ordinary database.
+**  (3)  When opening a file that ends with the appendvfs trailer string
+**       "Start-Of-SQLite3-NNNNNNNN" that file is treated as an appended
+**       database.
 **
 **  (4)  If none of the above apply and the SQLITE_OPEN_CREATE flag is
 **       set, then a new database is appended to the already existing file.
@@ -38,13 +39,13 @@
 **  (5)  Otherwise, SQLITE_CANTOPEN is returned.
 **
 ** To avoid unnecessary complications with the PENDING_BYTE, the size of
-** the file containing the database is limited to 1GiB. (1073741824 bytes)
-** This VFS will not read or write past the 1GiB mark.  This restriction
-** might be lifted in future versions.  For now, if you need a larger
-** database, then keep it in a separate file.
+** the file containing the database is limited to 1GB.  This VFS will refuse
+** to read or write past the 1GB mark.  This restriction might be lifted in
+** future versions.  For now, if you need a large database, then keep the
+** database in a separate file.
 **
-** If the file being opened is a plain database (not an appended one), then
-** this shim is a pass-through into the default underlying VFS. (rule 3)
+** If the file being opened is not an appended database, then this shim is
+** a pass-through into the default underlying VFS.
 **/
 #include "sqlite3ext.h"
 SQLITE_EXTENSION_INIT1
@@ -57,27 +58,17 @@ SQLITE_EXTENSION_INIT1
 **     123456789 123456789 12345
 **
 ** The NNNNNNNN represents a 64-bit big-endian unsigned integer which is
-** the offset to page 1, and also the length of the prefix content.
+** the offset to page 1.
 */
 #define APND_MARK_PREFIX     "Start-Of-SQLite3-"
 #define APND_MARK_PREFIX_SZ  17
-#define APND_MARK_FOS_SZ      8
-#define APND_MARK_SIZE       (APND_MARK_PREFIX_SZ+APND_MARK_FOS_SZ)
+#define APND_MARK_SIZE       25

 /*
 ** Maximum size of the combined prefix + database + append-mark.  This
 ** must be less than 0x40000000 to avoid locking issues on Windows.
 */
-#define APND_MAX_SIZE  (0x40000000)
-
-/*
-** Try to align the database to an even multiple of APND_ROUNDUP bytes.
-*/
-#ifndef APND_ROUNDUP
-#define APND_ROUNDUP 4096
-#endif
-#define APND_ALIGN_MASK         ((sqlite3_int64)(APND_ROUNDUP-1))
-#define APND_START_ROUNDUP(fsz) (((fsz)+APND_ALIGN_MASK) & ~APND_ALIGN_MASK)
+#define APND_MAX_SIZE  (65536*15259)

 /*
 ** Forward declaration of objects used by this utility
@@ -91,45 +82,11 @@ typedef struct ApndFile ApndFile;
 #define ORIGVFS(p)  ((sqlite3_vfs*)((p)->pAppData))
 #define ORIGFILE(p) ((sqlite3_file*)(((ApndFile*)(p))+1))

-/* An open appendvfs file
-**
-** An instance of this structure describes the appended database file.
-** A separate sqlite3_file object is always appended. The appended
-** sqlite3_file object (which can be accessed using ORIGFILE()) describes
-** the entire file, including the prefix, the database, and the
-** append-mark.
-**
-** The structure of an AppendVFS database is like this:
-**
-**   +-------------+---------+----------+-------------+
-**   | prefix-file | padding | database | append-mark |
-**   +-------------+---------+----------+-------------+
-**                           ^          ^
-**                           |          |
-**                         iPgOne      iMark
-**
-**
-** "prefix file" -  file onto which the database has been appended.
-** "padding"     -  zero or more bytes inserted so that "database"
-**                  starts on an APND_ROUNDUP boundary
-** "database"    -  The SQLite database file
-** "append-mark" -  The 25-byte "Start-Of-SQLite3-NNNNNNNN" that indicates
-**                  the offset from the start of prefix-file to the start
-**                  of "database".
-**
-** The size of the database is iMark - iPgOne.
-**
-** The NNNNNNNN in the "Start-Of-SQLite3-NNNNNNNN" suffix is the value
-** of iPgOne stored as a big-ending 64-bit integer.
-**
-** iMark will be the size of the underlying file minus 25 (APND_MARKSIZE).
-** Or, iMark is -1 to indicate that it has not yet been written.
-*/
+/* An open file */
 struct ApndFile {
-  sqlite3_file base;        /* Subclass.  MUST BE FIRST! */
-  sqlite3_int64 iPgOne;     /* Offset to the start of the database */
-  sqlite3_int64 iMark;      /* Offset of the append mark.  -1 if unwritten */
-  /* Always followed by another sqlite3_file that describes the whole file */
+  sqlite3_file base;              /* IO methods */
+  sqlite3_int64 iPgOne;           /* File offset to page 1 */
+  sqlite3_int64 iMark;            /* Start of the append-mark */
 };

 /*
@@ -221,6 +178,8 @@ static const sqlite3_io_methods apnd_io_methods = {
  apndUnfetch                     /* xUnfetch */
 };

+
+
 /*
 ** Close an apnd-file.
 */
@@ -238,37 +197,22 @@ static int apndRead(
  int iAmt, 
  sqlite_int64 iOfst
 ){
-  ApndFile *paf = (ApndFile *)pFile;
+  ApndFile *p = (ApndFile *)pFile;
  pFile = ORIGFILE(pFile);
-  return pFile->pMethods->xRead(pFile, zBuf, iAmt, paf->iPgOne+iOfst);
+  return pFile->pMethods->xRead(pFile, zBuf, iAmt, iOfst+p->iPgOne);
 }

 /*
-** Add the append-mark onto what should become the end of the file.
-*  If and only if this succeeds, internal ApndFile.iMark is updated.
-*  Parameter iWriteEnd is the appendvfs-relative offset of the new mark.
+** Add the append-mark onto the end of the file.
 */
-static int apndWriteMark(
-  ApndFile *paf,
-  sqlite3_file *pFile,
-  sqlite_int64 iWriteEnd
-){
-  sqlite_int64 iPgOne = paf->iPgOne;
+static int apndWriteMark(ApndFile *p, sqlite3_file *pFile){
+  int i;
  unsigned char a[APND_MARK_SIZE];
-  int i = APND_MARK_FOS_SZ;
-  int rc;
-  assert(pFile == ORIGFILE(paf));
  memcpy(a, APND_MARK_PREFIX, APND_MARK_PREFIX_SZ);
-  while( --i >= 0 ){
-    a[APND_MARK_PREFIX_SZ+i] = (unsigned char)(iPgOne & 0xff);
-    iPgOne >>= 8;
+  for(i=0; i<8; i++){
+    a[APND_MARK_PREFIX_SZ+i] = (p->iPgOne >> (56 - i*8)) & 0xff;
  }
-  iWriteEnd += paf->iPgOne;
-  if( SQLITE_OK==(rc = pFile->pMethods->xWrite
-                  (pFile, a, APND_MARK_SIZE, iWriteEnd)) ){
-    paf->iMark = iWriteEnd;
-  }
-  return rc;
+  return pFile->pMethods->xWrite(pFile, a, APND_MARK_SIZE, p->iMark);
 }

 /*
@@ -280,28 +224,38 @@ static int apndWrite(
  int iAmt,
  sqlite_int64 iOfst
 ){
-  ApndFile *paf = (ApndFile *)pFile;
-  sqlite_int64 iWriteEnd = iOfst + iAmt;
-  if( iWriteEnd>=APND_MAX_SIZE ) return SQLITE_FULL;
+  int rc;
+  ApndFile *p = (ApndFile *)pFile;
  pFile = ORIGFILE(pFile);
-  /* If append-mark is absent or will be overwritten, write it. */
-  if( paf->iMark < 0 || paf->iPgOne + iWriteEnd > paf->iMark ){
-    int rc = apndWriteMark(paf, pFile, iWriteEnd);
-    if( SQLITE_OK!=rc ) return rc;
+  if( iOfst+iAmt>=APND_MAX_SIZE ) return SQLITE_FULL;
+  rc = pFile->pMethods->xWrite(pFile, zBuf, iAmt, iOfst+p->iPgOne);
+  if( rc==SQLITE_OK &&  iOfst + iAmt + p->iPgOne > p->iMark ){
+    sqlite3_int64 sz = 0;
+    rc = pFile->pMethods->xFileSize(pFile, &sz);
+    if( rc==SQLITE_OK ){
+      p->iMark = sz - APND_MARK_SIZE;
+      if( iOfst + iAmt + p->iPgOne > p->iMark ){
+        p->iMark = p->iPgOne + iOfst + iAmt;
+        rc = apndWriteMark(p, pFile);
+      }
+    }
  }
-  return pFile->pMethods->xWrite(pFile, zBuf, iAmt, paf->iPgOne+iOfst);
+  return rc;
 }

 /*
 ** Truncate an apnd-file.
 */
 static int apndTruncate(sqlite3_file *pFile, sqlite_int64 size){
-  ApndFile *paf = (ApndFile *)pFile;
+  int rc;
+  ApndFile *p = (ApndFile *)pFile;
  pFile = ORIGFILE(pFile);
-  /* The append mark goes out first so truncate failure does not lose it. */
-  if( SQLITE_OK!=apndWriteMark(paf, pFile, size) ) return SQLITE_IOERR;
-  /* Truncate underlying file just past append mark */
-  return pFile->pMethods->xTruncate(pFile, paf->iMark+APND_MARK_SIZE);
+  rc = pFile->pMethods->xTruncate(pFile, size+p->iPgOne+APND_MARK_SIZE);
+  if( rc==SQLITE_OK ){
+    p->iMark = p->iPgOne+size;
+    rc = apndWriteMark(p, pFile);
+  }
+  return rc;
 }

 /*
@@ -314,12 +268,16 @@ static int apndSync(sqlite3_file *pFile, int flags){

 /*
 ** Return the current file-size of an apnd-file.
-** If the append mark is not yet there, the file-size is 0.
 */
 static int apndFileSize(sqlite3_file *pFile, sqlite_int64 *pSize){
-  ApndFile *paf = (ApndFile *)pFile;
-  *pSize = ( paf->iMark >= 0 )? (paf->iMark - paf->iPgOne) : 0;
-  return SQLITE_OK;
+  ApndFile *p = (ApndFile *)pFile;
+  int rc;
+  pFile = ORIGFILE(p);
+  rc = pFile->pMethods->xFileSize(pFile, pSize);
+  if( rc==SQLITE_OK && p->iPgOne ){
+    *pSize -= p->iPgOne + APND_MARK_SIZE;
+  }
+  return rc;
 }

 /*
@@ -350,13 +308,12 @@ static int apndCheckReservedLock(sqlite3_file *pFile, int *pResOut){
 ** File control method. For custom operations on an apnd-file.
 */
 static int apndFileControl(sqlite3_file *pFile, int op, void *pArg){
-  ApndFile *paf = (ApndFile *)pFile;
+  ApndFile *p = (ApndFile *)pFile;
  int rc;
  pFile = ORIGFILE(pFile);
-  if( op==SQLITE_FCNTL_SIZE_HINT ) *(sqlite3_int64*)pArg += paf->iPgOne;
  rc = pFile->pMethods->xFileControl(pFile, op, pArg);
  if( rc==SQLITE_OK && op==SQLITE_FCNTL_VFSNAME ){
-    *(char**)pArg = sqlite3_mprintf("apnd(%lld)/%z", paf->iPgOne,*(char**)pArg);
+    *(char**)pArg = sqlite3_mprintf("apnd(%lld)/%z", p->iPgOne, *(char**)pArg);
  }
  return rc;
 }
@@ -415,9 +372,6 @@ static int apndFetch(
  void **pp
 ){
  ApndFile *p = (ApndFile *)pFile;
-  if( p->iMark < 0 || iOfst+iAmt > p->iMark ){
-    return SQLITE_IOERR; /* Cannot read what is not yet there. */
-  }
  pFile = ORIGFILE(pFile);
  return pFile->pMethods->xFetch(pFile, iOfst+p->iPgOne, iAmt, pp);
 }
@@ -429,155 +383,95 @@ static int apndUnfetch(sqlite3_file *pFile, sqlite3_int64 iOfst, void *pPage){
  return pFile->pMethods->xUnfetch(pFile, iOfst+p->iPgOne, pPage);
 }

+/*
+** Check to see if the file is an ordinary SQLite database file.
+*/
+static int apndIsOrdinaryDatabaseFile(sqlite3_int64 sz, sqlite3_file *pFile){
+  int rc;
+  char zHdr[16];
+  static const char aSqliteHdr[] = "SQLite format 3";
+  if( sz<512 ) return 0;
+  rc = pFile->pMethods->xRead(pFile, zHdr, sizeof(zHdr), 0);
+  if( rc ) return 0;
+  return memcmp(zHdr, aSqliteHdr, sizeof(zHdr))==0;
+}
+
 /*
 ** Try to read the append-mark off the end of a file.  Return the
-** start of the appended database if the append-mark is present.
-** If there is no valid append-mark, return -1;
-**
-** An append-mark is only valid if the NNNNNNNN start-of-database offset
-** indicates that the appended database contains at least one page.  The
-** start-of-database value must be a multiple of 512.
+** start of the appended database if the append-mark is present.  If
+** there is no append-mark, return -1;
 */
 static sqlite3_int64 apndReadMark(sqlite3_int64 sz, sqlite3_file *pFile){
  int rc, i;
  sqlite3_int64 iMark;
-  int msbs = 8 * (APND_MARK_FOS_SZ-1);
  unsigned char a[APND_MARK_SIZE];

-  if( APND_MARK_SIZE!=(sz & 0x1ff) ) return -1;
+  if( sz<=APND_MARK_SIZE ) return -1;
  rc = pFile->pMethods->xRead(pFile, a, APND_MARK_SIZE, sz-APND_MARK_SIZE);
  if( rc ) return -1;
  if( memcmp(a, APND_MARK_PREFIX, APND_MARK_PREFIX_SZ)!=0 ) return -1;
-  iMark = ((sqlite3_int64)(a[APND_MARK_PREFIX_SZ] & 0x7f)) << msbs;
-  for(i=1; i<8; i++){
-    msbs -= 8;
-    iMark |= (sqlite3_int64)a[APND_MARK_PREFIX_SZ+i]<<msbs;
+  iMark = ((sqlite3_int64)(a[APND_MARK_PREFIX_SZ]&0x7f))<<56;
+  for(i=1; i<8; i++){    
+    iMark += (sqlite3_int64)a[APND_MARK_PREFIX_SZ+i]<<(56-8*i);
  }
-  if( iMark > (sz - APND_MARK_SIZE - 512) ) return -1;
-  if( iMark & 0x1ff ) return -1;
  return iMark;
 }

-static const char apvfsSqliteHdr[] = "SQLite format 3";
-/*
-** Check to see if the file is an appendvfs SQLite database file.
-** Return true iff it is such. Parameter sz is the file's size.
-*/
-static int apndIsAppendvfsDatabase(sqlite3_int64 sz, sqlite3_file *pFile){
-  int rc;
-  char zHdr[16];
-  sqlite3_int64 iMark = apndReadMark(sz, pFile);
-  if( iMark>=0 ){
-    /* If file has the correct end-marker, the expected odd size, and the
-    ** SQLite DB type marker where the end-marker puts it, then it
-    ** is an appendvfs database.
-    */
-    rc = pFile->pMethods->xRead(pFile, zHdr, sizeof(zHdr), iMark);
-    if( SQLITE_OK==rc
-     && memcmp(zHdr, apvfsSqliteHdr, sizeof(zHdr))==0
-     && (sz & 0x1ff) == APND_MARK_SIZE
-     && sz>=512+APND_MARK_SIZE
-    ){
-      return 1; /* It's an appendvfs database */
-    }
-  }
-  return 0;
-}
-
-/*
-** Check to see if the file is an ordinary SQLite database file.
-** Return true iff so. Parameter sz is the file's size.
-*/
-static int apndIsOrdinaryDatabaseFile(sqlite3_int64 sz, sqlite3_file *pFile){
-  char zHdr[16];
-  if( apndIsAppendvfsDatabase(sz, pFile) /* rule 2 */
-   || (sz & 0x1ff) != 0
-   || SQLITE_OK!=pFile->pMethods->xRead(pFile, zHdr, sizeof(zHdr), 0)
-   || memcmp(zHdr, apvfsSqliteHdr, sizeof(zHdr))!=0
-  ){
-    return 0;
-  }else{
-    return 1;
-  }
-}
-
 /*
 ** Open an apnd file handle.
 */
 static int apndOpen(
-  sqlite3_vfs *pApndVfs,
+  sqlite3_vfs *pVfs,
  const char *zName,
  sqlite3_file *pFile,
  int flags,
  int *pOutFlags
 ){
-  ApndFile *pApndFile = (ApndFile*)pFile;
-  sqlite3_file *pBaseFile = ORIGFILE(pFile);
-  sqlite3_vfs *pBaseVfs = ORIGVFS(pApndVfs);
+  ApndFile *p;
+  sqlite3_file *pSubFile;
+  sqlite3_vfs *pSubVfs;
  int rc;
-  sqlite3_int64 sz = 0;
+  sqlite3_int64 sz;
+  pSubVfs = ORIGVFS(pVfs);
  if( (flags & SQLITE_OPEN_MAIN_DB)==0 ){
-    /* The appendvfs is not to be used for transient or temporary databases.
-    ** Just use the base VFS open to initialize the given file object and
-    ** open the underlying file. (Appendvfs is then unused for this file.)
-    */
-    return pBaseVfs->xOpen(pBaseVfs, zName, pFile, flags, pOutFlags);
-  }
-  memset(pApndFile, 0, sizeof(ApndFile));
-  pFile->pMethods = &apnd_io_methods;
-  pApndFile->iMark = -1;    /* Append mark not yet written */
-
-  rc = pBaseVfs->xOpen(pBaseVfs, zName, pBaseFile, flags, pOutFlags);
-  if( rc==SQLITE_OK ){
-    rc = pBaseFile->pMethods->xFileSize(pBaseFile, &sz);
-    if( rc ){
-      pBaseFile->pMethods->xClose(pBaseFile);
-    }
+    return pSubVfs->xOpen(pSubVfs, zName, pFile, flags, pOutFlags);
  }
+  p = (ApndFile*)pFile;
+  memset(p, 0, sizeof(*p));
+  pSubFile = ORIGFILE(pFile);
+  p->base.pMethods = &apnd_io_methods;
+  rc = pSubVfs->xOpen(pSubVfs, zName, pSubFile, flags, pOutFlags);
+  if( rc ) goto apnd_open_done;
+  rc = pSubFile->pMethods->xFileSize(pSubFile, &sz);
  if( rc ){
-    pFile->pMethods = 0;
-    return rc;
+    pSubFile->pMethods->xClose(pSubFile);
+    goto apnd_open_done;
  }
-  if( apndIsOrdinaryDatabaseFile(sz, pBaseFile) ){
-    /* The file being opened appears to be just an ordinary DB. Copy
-    ** the base dispatch-table so this instance mimics the base VFS. 
-    */
-    memmove(pApndFile, pBaseFile, pBaseVfs->szOsFile);
+  if( apndIsOrdinaryDatabaseFile(sz, pSubFile) ){
+    memmove(pFile, pSubFile, pSubVfs->szOsFile);
    return SQLITE_OK;
  }
-  pApndFile->iPgOne = apndReadMark(sz, pFile);
-  if( pApndFile->iPgOne>=0 ){
-    pApndFile->iMark = sz - APND_MARK_SIZE; /* Append mark found */
+  p->iMark = 0;
+  p->iPgOne = apndReadMark(sz, pFile);
+  if( p->iPgOne>0 ){
    return SQLITE_OK;
  }
  if( (flags & SQLITE_OPEN_CREATE)==0 ){
-    pBaseFile->pMethods->xClose(pBaseFile);
+    pSubFile->pMethods->xClose(pSubFile);
    rc = SQLITE_CANTOPEN;
-    pFile->pMethods = 0;
-  }else{
-    /* Round newly added appendvfs location to #define'd page boundary. 
-    ** Note that nothing has yet been written to the underlying file.
-    ** The append mark will be written along with first content write.
-    ** Until then, paf->iMark value indicates it is not yet written.
-    */
-    pApndFile->iPgOne = APND_START_ROUNDUP(sz);
  }
+  p->iPgOne = (sz+0xfff) & ~(sqlite3_int64)0xfff;
+apnd_open_done:
+  if( rc ) pFile->pMethods = 0;
  return rc;
 }

-/*
-** Delete an apnd file.
-** For an appendvfs, this could mean delete the appendvfs portion,
-** leaving the appendee as it was before it gained an appendvfs.
-** For now, this code deletes the underlying file too.
-*/
-static int apndDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
-  return ORIGVFS(pVfs)->xDelete(ORIGVFS(pVfs), zPath, dirSync);
-}
-
 /*
 ** All other VFS methods are pass-thrus.
 */
+static int apndDelete(sqlite3_vfs *pVfs, const char *zPath, int dirSync){
+  return ORIGVFS(pVfs)->xDelete(ORIGVFS(pVfs), zPath, dirSync);
+}
 static int apndAccess(
  sqlite3_vfs *pVfs, 
  const char *zPath, 
@@ -657,7 +551,6 @@ int sqlite3_appendvfs_init(
  (void)pzErrMsg;
  (void)db;
  pOrig = sqlite3_vfs_find(0);
-  if( pOrig==0 ) return SQLITE_ERROR;
  apnd_vfs.iVersion = pOrig->iVersion;
  apnd_vfs.pAppData = pOrig;
  apnd_vfs.szOsFile = pOrig->szOsFile + sizeof(ApndFile);
@@ -21,7 +21,7 @@
 **    name TEXT,                   -- Name of table or index for this btree.
 **    tbl_name TEXT,               -- Associated table
 **    rootpage INT,                -- The root page of the btree
-**    sql TEXT,                    -- SQL for this btree - from sqlite_schema
+**    sql TEXT,                    -- SQL for this btree - from sqlite_master
 **    hasRowid BOOLEAN,            -- True if the btree has a rowid
 **    nEntry INT,                  -- Estimated number of entries
 **    nPage INT,                   -- Estimated number of pages
@@ -30,9 +30,9 @@
 **    zSchema TEXT HIDDEN          -- The schema to which this btree belongs
 ** );
 **
-** The first 5 fields are taken directly from the sqlite_schema table.
+** The first 5 fields are taken directly from the sqlite_master table.
 ** Considering only the first 5 fields, the only difference between 
-** this virtual table and the sqlite_schema table is that this virtual
+** this virtual table and the sqlite_master table is that this virtual
 ** table omits all entries that have a 0 or NULL rowid - in other words
 ** it omits triggers and views.
 **
@@ -88,7 +88,7 @@ typedef struct BinfoCursor BinfoCursor;
 /* A cursor for the sqlite_btreeinfo table */
 struct BinfoCursor {
  sqlite3_vtab_cursor base;       /* Base class.  Must be first */
-  sqlite3_stmt *pStmt;            /* Query against sqlite_schema */
+  sqlite3_stmt *pStmt;            /* Query against sqlite_master */
  int rc;                         /* Result of previous sqlite_step() call */
  int hasRowid;                   /* hasRowid value.  Negative if unknown. */
  sqlite3_int64 nEntry;           /* nEntry value */
@@ -242,10 +242,10 @@ static int binfoFilter(
    pCsr->zSchema = sqlite3_mprintf("main");
  }
  zSql = sqlite3_mprintf(
-      "SELECT 0, 'table','sqlite_schema','sqlite_schema',1,NULL "
+      "SELECT 0, 'table','sqlite_master','sqlite_master',1,NULL "
      "UNION ALL "
      "SELECT rowid, type, name, tbl_name, rootpage, sql"
-      " FROM \"%w\".sqlite_schema WHERE rootpage>=1",
+      " FROM \"%w\".sqlite_master WHERE rootpage>=1",
       pCsr->zSchema);
  sqlite3_finalize(pCsr->pStmt);
  pCsr->pStmt = 0;
@@ -56,42 +56,21 @@
 SQLITE_EXTENSION_INIT1
 #include <assert.h>
 #include <string.h>
- 
-/* Allowed values for the mFlags parameter to sqlite3_carray_bind().
-** Must exactly match the definitions in carray.h.
-*/
-#ifndef CARRAY_INT32
-# define CARRAY_INT32     0      /* Data is 32-bit signed integers */
-# define CARRAY_INT64     1      /* Data is 64-bit signed integers */
-# define CARRAY_DOUBLE    2      /* Data is doubles */
-# define CARRAY_TEXT      3      /* Data is char* */
-#endif
-
-#ifndef SQLITE_API
-# ifdef _WIN32
-#  define SQLITE_API __declspec(dllexport)
-# else
-#  define SQLITE_API
-# endif
-#endif

 #ifndef SQLITE_OMIT_VIRTUALTABLE

 /*
-** Names of allowed datatypes
+** Allowed datatypes
 */
-static const char *azType[] = { "int32", "int64", "double", "char*" };
+#define CARRAY_INT32    0
+#define CARRAY_INT64    1
+#define CARRAY_DOUBLE   2
+#define CARRAY_TEXT     3

 /*
-** Structure used to hold the sqlite3_carray_bind() information
+** Names of types
 */
-typedef struct carray_bind carray_bind;
-struct carray_bind {
-  void *aData;                /* The data */
-  int nData;                  /* Number of elements */
-  int mFlags;                 /* Control flags */
-  void (*xDel)(void*);        /* Destructor for aData */
-};
+static const char *azType[] = { "int32", "int64", "double", "char*" };


 /* carray_cursor is a subclass of sqlite3_vtab_cursor which will
@@ -260,39 +239,28 @@ static int carrayFilter(
  int argc, sqlite3_value **argv
 ){
  carray_cursor *pCur = (carray_cursor *)pVtabCursor;
-  pCur->pPtr = 0;
-  pCur->iCnt = 0;
-  switch( idxNum ){
-    case 1: {
-      carray_bind *pBind = sqlite3_value_pointer(argv[0], "carray-bind");
-      if( pBind==0 ) break;
-      pCur->pPtr = pBind->aData;
-      pCur->iCnt = pBind->nData;
-      pCur->eType = pBind->mFlags & 0x03;
-      break;
-    }
-    case 2:
-    case 3: {
-      pCur->pPtr = sqlite3_value_pointer(argv[0], "carray");
-      pCur->iCnt = pCur->pPtr ? sqlite3_value_int64(argv[1]) : 0;
-      if( idxNum<3 ){
-        pCur->eType = CARRAY_INT32;
-      }else{
-        unsigned char i;
-        const char *zType = (const char*)sqlite3_value_text(argv[2]);
-        for(i=0; i<sizeof(azType)/sizeof(azType[0]); i++){
-          if( sqlite3_stricmp(zType, azType[i])==0 ) break;
-        }
-        if( i>=sizeof(azType)/sizeof(azType[0]) ){
-          pVtabCursor->pVtab->zErrMsg = sqlite3_mprintf(
-            "unknown datatype: %Q", zType);
-          return SQLITE_ERROR;
-        }else{
-          pCur->eType = i;
-        }
+  if( idxNum ){
+    pCur->pPtr = sqlite3_value_pointer(argv[0], "carray");
+    pCur->iCnt = pCur->pPtr ? sqlite3_value_int64(argv[1]) : 0;
+    if( idxNum<3 ){
+      pCur->eType = CARRAY_INT32;
+    }else{
+      unsigned char i;
+      const char *zType = (const char*)sqlite3_value_text(argv[2]);
+      for(i=0; i<sizeof(azType)/sizeof(azType[0]); i++){
+        if( sqlite3_stricmp(zType, azType[i])==0 ) break;
+      }
+      if( i>=sizeof(azType)/sizeof(azType[0]) ){
+        pVtabCursor->pVtab->zErrMsg = sqlite3_mprintf(
+          "unknown datatype: %Q", zType);
+        return SQLITE_ERROR;
+      }else{
+        pCur->eType = i;
      }
-      break;
    }
+  }else{
+    pCur->pPtr = 0;
+    pCur->iCnt = 0;
  }
  pCur->iRowid = 1;
  return SQLITE_OK;
@@ -307,16 +275,9 @@ static int carrayFilter(
 ** In this implementation idxNum is used to represent the
 ** query plan.  idxStr is unused.
 **
-** idxNum is:
-**
-**    1    If only the pointer= constraint exists.  In this case, the
-**         parameter must be bound using sqlite3_carray_bind().
-**
-**    2    if the pointer= and count= constraints exist.
-**
-**    3    if the ctype= constraint also exists.
-**
-** idxNum is 0 otherwise and carray becomes an empty table.
+** idxNum is 2 if the pointer= and count= constraints exist,
+** 3 if the ctype= constraint also exists, and is 0 otherwise.
+** If idxNum is 0, then carray becomes an empty table.
 */
 static int carrayBestIndex(
  sqlite3_vtab *tab,
@@ -344,21 +305,18 @@ static int carrayBestIndex(
        break;
    }
  }
-  if( ptrIdx>=0 ){
+  if( ptrIdx>=0 && cntIdx>=0 ){
    pIdxInfo->aConstraintUsage[ptrIdx].argvIndex = 1;
    pIdxInfo->aConstraintUsage[ptrIdx].omit = 1;
+    pIdxInfo->aConstraintUsage[cntIdx].argvIndex = 2;
+    pIdxInfo->aConstraintUsage[cntIdx].omit = 1;
    pIdxInfo->estimatedCost = (double)1;
    pIdxInfo->estimatedRows = 100;
-    pIdxInfo->idxNum = 1;
-    if( cntIdx>=0 ){
-      pIdxInfo->aConstraintUsage[cntIdx].argvIndex = 2;
-      pIdxInfo->aConstraintUsage[cntIdx].omit = 1;
-      pIdxInfo->idxNum = 2;
-      if( ctypeIdx>=0 ){
-        pIdxInfo->aConstraintUsage[ctypeIdx].argvIndex = 3;
-        pIdxInfo->aConstraintUsage[ctypeIdx].omit = 1;
-        pIdxInfo->idxNum = 3;
-      }
+    pIdxInfo->idxNum = 2;
+    if( ctypeIdx>=0 ){
+      pIdxInfo->aConstraintUsage[ctypeIdx].argvIndex = 3;
+      pIdxInfo->aConstraintUsage[ctypeIdx].omit = 1;
+      pIdxInfo->idxNum = 3;
    }
  }else{
    pIdxInfo->estimatedCost = (double)2147483647;
@@ -395,86 +353,6 @@ static sqlite3_module carrayModule = {
  0,                         /* xRename */
 };

-/*
-** Destructor for the carray_bind object
-*/
-static void carrayBindDel(void *pPtr){
-  carray_bind *p = (carray_bind*)pPtr;
-  if( p->xDel!=SQLITE_STATIC ){
-     p->xDel(p->aData);
-  }
-  sqlite3_free(p);
-}
-
-/*
-** Invoke this interface in order to bind to the single-argument
-** version of CARRAY().
-*/
-SQLITE_API int sqlite3_carray_bind(
-  sqlite3_stmt *pStmt,
-  int idx,
-  void *aData,
-  int nData,
-  int mFlags,
-  void (*xDestroy)(void*)
-){
-  carray_bind *pNew;
-  int i;
-  pNew = sqlite3_malloc64(sizeof(*pNew));
-  if( pNew==0 ){
-    if( xDestroy!=SQLITE_STATIC && xDestroy!=SQLITE_TRANSIENT ){
-      xDestroy(aData);
-    }
-    return SQLITE_NOMEM;
-  }
-  pNew->nData = nData;
-  pNew->mFlags = mFlags;
-  if( xDestroy==SQLITE_TRANSIENT ){
-    sqlite3_int64 sz = nData;
-    switch( mFlags & 0x03 ){
-      case CARRAY_INT32:   sz *= 4;              break;
-      case CARRAY_INT64:   sz *= 8;              break;
-      case CARRAY_DOUBLE:  sz *= 8;              break;
-      case CARRAY_TEXT:    sz *= sizeof(char*);  break;
-    }
-    if( (mFlags & 0x03)==CARRAY_TEXT ){
-      for(i=0; i<nData; i++){
-        const char *z = ((char**)aData)[i];
-        if( z ) sz += strlen(z) + 1;
-      }
-    } 
-    pNew->aData = sqlite3_malloc64( sz );
-    if( pNew->aData==0 ){
-      sqlite3_free(pNew);
-      return SQLITE_NOMEM;
-    }
-    if( (mFlags & 0x03)==CARRAY_TEXT ){
-      char **az = (char**)pNew->aData;
-      char *z = (char*)&az[nData];
-      for(i=0; i<nData; i++){
-        const char *zData = ((char**)aData)[i];
-        sqlite3_int64 n;
-        if( zData==0 ){
-          az[i] = 0;
-          continue;
-        }
-        az[i] = z;
-        n = strlen(zData);
-        memcpy(z, zData, n+1);
-        z += n+1;
-      }
-    }else{
-      memcpy(pNew->aData, aData, sz);
-    }
-    pNew->xDel = sqlite3_free;
-  }else{
-    pNew->aData = aData;
-    pNew->xDel = xDestroy;
-  }
-  return sqlite3_bind_pointer(pStmt, idx, pNew, "carray-bind", carrayBindDel);
-}
-
-
 /*
 ** For testing purpose in the TCL test harness, we need a method for
 ** setting the pointer value.  The inttoptr(X) SQL function accomplishes
@@ -505,7 +383,10 @@ static void inttoptrFunc(

 #endif /* SQLITE_OMIT_VIRTUALTABLE */

-SQLITE_API int sqlite3_carray_init(
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_carray_init(
  sqlite3 *db, 
  char **pzErrMsg, 
  const sqlite3_api_routines *pApi
@@ -1,50 +0,0 @@
-/*
-** 2020-11-17
-**
-** 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.
-**
-*************************************************************************
-**
-** Interface definitions for the CARRAY table-valued function
-** extension.
-*/
-
-#ifndef _CARRAY_H
-#define _CARRAY_H
-
-#include "sqlite3.h"              /* Required for error code definitions */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Use this interface to bind an array to the single-argument version
-** of CARRAY().
-*/
-SQLITE_API int sqlite3_carray_bind(
-  sqlite3_stmt *pStmt,        /* Statement to be bound */
-  int i,                      /* Parameter index */
-  void *aData,                /* Pointer to array data */
-  int nData,                  /* Number of data elements */
-  int mFlags,                 /* CARRAY flags */
-  void (*xDel)(void*)         /* Destructgor for aData*/
-);
-
-/* Allowed values for the mFlags parameter to sqlite3_carray_bind().
-*/
-#define CARRAY_INT32     0    /* Data is 32-bit signed integers */
-#define CARRAY_INT64     1    /* Data is 64-bit signed integers */
-#define CARRAY_DOUBLE    2    /* Data is doubles */
-#define CARRAY_TEXT      3    /* Data is char* */
-
-#ifdef __cplusplus
-}  /* end of the 'extern "C"' block */
-#endif
-
-#endif /* ifndef _CARRAY_H */
-
@@ -54,11 +54,11 @@
 ** statically linked against the application, initialize it using
 ** a single API call as follows:
 **
-**     sqlite3_register_cksumvfs();
+**     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, in
+** 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
@@ -79,7 +79,7 @@
 ** the reserve-bytes value to 8 by runing:
 **
 **    int n = 8;
-**    sqlite3_file_control(db, 0, SQLITE_FCNTL_RESERVE_BYTES, &n);
+**    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
@@ -157,9 +157,6 @@
 ** 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.
 */
-#if defined(SQLITE_AMALGAMATION) && !defined(SQLITE_CKSUMVFS_STATIC)
-# define SQLITE_CKSUMVFS_STATIC
-#endif
 #ifdef SQLITE_CKSUMVFS_STATIC
 # include "sqlite3.h"
 #else
@@ -179,7 +176,7 @@ typedef struct CksmFile CksmFile;
 /*
 ** Useful datatype abbreviations
 */
-#if !defined(SQLITE_AMALGAMATION)
+#if !defined(SQLITE_CORE)
  typedef unsigned char u8;
  typedef unsigned int u32;
 #endif
@@ -356,41 +353,6 @@ static void cksmVerifyFunc(
  sqlite3_result_int(context, memcmp(data+nByte-8,cksum,8)==0);
 }

-#ifdef SQLITE_CKSUMVFS_INIT_FUNCNAME
-/*
-** SQL function:    initialize_cksumvfs(SCHEMANAME)
-**
-** This SQL functions (whose name is actually determined at compile-time
-** by the value of the SQLITE_CKSUMVFS_INIT_FUNCNAME macro) invokes:
-**
-**   sqlite3_file_control(db, SCHEMANAME, SQLITE_FCNTL_RESERVE_BYTE, &n);
-**
-** In order to set the reserve bytes value to 8, so that cksumvfs will
-** operation.  This feature is provided (if and only if the
-** SQLITE_CKSUMVFS_INIT_FUNCNAME compile-time option is set to a string
-** which is the name of the SQL function) so as to provide the ability
-** to invoke the file-control in programming languages that lack
-** direct access to the sqlite3_file_control() interface (ex: Java).
-**
-** This interface is undocumented, apart from this comment.  Usage
-** example:
-**
-**    1.  Compile with -DSQLITE_CKSUMVFS_INIT_FUNCNAME="ckvfs_init"
-**    2.  Run:  "SELECT cksum_init('main'); VACUUM;"
-*/
-static void cksmInitFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  int nByte = 8;
-  const char *zSchemaName = (const char*)sqlite3_value_text(argv[0]);
-  sqlite3 *db = sqlite3_context_db_handle(context);
-  sqlite3_file_control(db, zSchemaName, SQLITE_FCNTL_RESERVE_BYTES, &nByte);
-  /* Return NULL */
-}
-#endif /* SQLITE_CKSUMBFS_INIT_FUNCNAME */
-
 /*
 ** Close a cksm-file.
 */
@@ -433,9 +395,7 @@ static int cksmRead(
  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 || memcmp(zBuf,"ZV-",3)==0 
-    )){
+    if( iOfst==0 && iAmt>=100 && memcmp(zBuf,"SQLite format 3",16)==0 ){
      u8 *d = (u8*)zBuf;
      char hasCorrectReserveSize = (d[20]==8);
      cksmSetFlags(p, hasCorrectReserveSize);
@@ -474,9 +434,7 @@ static int cksmWrite(
 ){
  CksmFile *p = (CksmFile *)pFile;
  pFile = ORIGFILE(pFile);
-  if( iOfst==0 && iAmt>=100 && (
-        memcmp(zBuf,"SQLite format 3",16)==0 || memcmp(zBuf,"ZV-",3)==0 
-  )){
+  if( iOfst==0 && iAmt>=100 && memcmp(zBuf,"SQLite format 3",16)==0 ){
    u8 *d = (u8*)zBuf;
    char hasCorrectReserveSize = (d[20]==8);
    cksmSetFlags(p, hasCorrectReserveSize);
@@ -579,18 +537,6 @@ static int cksmFileControl(sqlite3_file *pFile, int op, void *pArg){
  }else if( op==SQLITE_FCNTL_CKPT_START || op==SQLITE_FCNTL_CKPT_DONE ){
    p->inCkpt = op==SQLITE_FCNTL_CKPT_START;
    if( p->pPartner ) p->pPartner->inCkpt = p->inCkpt;
-  }else if( op==SQLITE_FCNTL_CKSM_FILE ){
-    /* This VFS needs to obtain a pointer to the corresponding database
-    ** file handle from within xOpen() calls to open wal files. To do this,
-    ** it uses the sqlite3_database_file_object() API to obtain a pointer
-    ** to the file-handle used by SQLite to access the db file. This is
-    ** fine if cksmvfs happens to be the top-level VFS, but not if there
-    ** are one or more wrapper VFS. To handle this case, this file-control
-    ** is used to extract the cksmvfs file-handle from any wrapper file 
-    ** handle.  */
-    sqlite3_file **ppFile = (sqlite3_file**)pArg;
-    *ppFile = (sqlite3_file*)p;
-    return SQLITE_OK;
  }
  rc = pFile->pMethods->xFileControl(pFile, op, pArg);
  if( rc==SQLITE_OK && op==SQLITE_FCNTL_VFSNAME ){
@@ -658,20 +604,13 @@ static int cksmFetch(
    return SQLITE_OK;
  }
  pFile = ORIGFILE(pFile);
-  if( pFile->pMethods->iVersion>2 && pFile->pMethods->xFetch ){
-    return pFile->pMethods->xFetch(pFile, iOfst, iAmt, pp);
-  }
-  *pp = 0;
-  return SQLITE_OK;
+  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);
-  if( pFile->pMethods->iVersion>2 && pFile->pMethods->xUnfetch ){
-    return pFile->pMethods->xUnfetch(pFile, iOfst, pPage);
-  }
-  return SQLITE_OK;
+  return pFile->pMethods->xUnfetch(pFile, iOfst, pPage);
 }

 /*
@@ -695,13 +634,11 @@ static int cksmOpen(
  p = (CksmFile*)pFile;
  memset(p, 0, sizeof(*p));
  pSubFile = ORIGFILE(pFile);
-  pFile->pMethods = &cksm_io_methods;
+  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);
-    rc = pDb->pMethods->xFileControl(pDb, SQLITE_FCNTL_CKSM_FILE, (void*)&pDb);
-    assert( rc==SQLITE_OK );
    p->pPartner = (CksmFile*)pDb;
    assert( p->pPartner->pPartner==0 );
    p->pPartner->pPartner = p;
@@ -764,17 +701,7 @@ 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){
-  sqlite3_vfs *pOrig = ORIGVFS(pVfs);
-  int rc;
-  assert( pOrig->iVersion>=2 );
-  if( pOrig->xCurrentTimeInt64 ){
-    rc = pOrig->xCurrentTimeInt64(pOrig, p);
-  }else{
-    double r;
-    rc = pOrig->xCurrentTime(pOrig, &r);
-    *p = (sqlite3_int64)(r*86400000.0);
-  }
-  return rc;
+  return ORIGVFS(pVfs)->xCurrentTimeInt64(ORIGVFS(pVfs), p);
 }
 static int cksmSetSystemCall(
  sqlite3_vfs *pVfs,
@@ -805,11 +732,6 @@ static int cksmRegisterFunc(
  rc = sqlite3_create_function(db, "verify_checksum", 1,
                   SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
                   0, cksmVerifyFunc, 0, 0);
-#ifdef SQLITE_CKSUMVFS_INIT_FUNCNAME
-  (void)sqlite3_create_function(db, SQLITE_CKSUMVFS_INIT_FUNCNAME, 1,
-                   SQLITE_UTF8|SQLITE_DIRECTONLY,
-                   0, cksmInitFunc, 0, 0);
-#endif
  return rc;
 }

@@ -823,7 +745,6 @@ static int cksmRegisterVfs(void){
  sqlite3_vfs *pOrig;
  if( sqlite3_vfs_find("cksmvfs")!=0 ) return SQLITE_OK;
  pOrig = sqlite3_vfs_find(0);
-  if( pOrig==0 ) return SQLITE_ERROR;
  cksm_vfs.iVersion = pOrig->iVersion;
  cksm_vfs.pAppData = pOrig;
  cksm_vfs.szOsFile = pOrig->szOsFile + sizeof(CksmFile);
@@ -842,13 +763,6 @@ int sqlite3_register_cksumvfs(const char *NotUsed){
  (void)NotUsed;
  return cksmRegisterVfs();
 }
-int sqlite3_unregister_cksumvfs(void){
-  if( sqlite3_vfs_find("cksmvfs") ){
-    sqlite3_vfs_unregister(&cksm_vfs);
-    sqlite3_cancel_auto_extension((void(*)(void))cksmRegisterFunc);
-  }
-  return SQLITE_OK;
-}
 #endif /* defined(SQLITE_CKSUMVFS_STATIC */

 #if !defined(SQLITE_CKSUMVFS_STATIC)
@@ -871,6 +785,9 @@ int sqlite3_cksumvfs_init(
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg; /* not used */
  rc = cksmRegisterFunc(db, 0, 0);
+  if( rc==SQLITE_OK ){
+    
+  }
  if( rc==SQLITE_OK ){
    rc = cksmRegisterVfs();
  }
@@ -226,7 +226,7 @@ static int completionNext(sqlite3_vtab_cursor *cur){
            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
            zSql = sqlite3_mprintf(
               "%z%s"
-               "SELECT name FROM \"%w\".sqlite_schema",
+               "SELECT name FROM \"%w\".sqlite_master",
               zSql, zSep, zDb
            );
            if( zSql==0 ) return SQLITE_NOMEM;
@@ -250,7 +250,7 @@ static int completionNext(sqlite3_vtab_cursor *cur){
            const char *zDb = (const char*)sqlite3_column_text(pS2, 1);
            zSql = sqlite3_mprintf(
               "%z%s"
-               "SELECT pti.name FROM \"%w\".sqlite_schema AS sm"
+               "SELECT pti.name FROM \"%w\".sqlite_master AS sm"
                       " JOIN pragma_table_info(sm.name,%Q) AS pti"
               " WHERE sm.type='table'",
               zSql, zSep, zDb, zDb
@@ -776,7 +776,7 @@ static int csvtabColumn(
  CsvCursor *pCur = (CsvCursor*)cur;
  CsvTable *pTab = (CsvTable*)cur->pVtab;
  if( i>=0 && i<pTab->nCol && pCur->azVal[i]!=0 ){
-    sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
+    sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_STATIC);
  }
  return SQLITE_OK;
 }
@@ -395,7 +395,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
  if( strcmp(zTable, "sqlite_sequence")==0 ){
    p->xCallback("DELETE FROM sqlite_sequence;\n", p->pArg);
  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
-    p->xCallback("ANALYZE sqlite_schema;\n", p->pArg);
+    p->xCallback("ANALYZE sqlite_master;\n", p->pArg);
  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
    return 0;
  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
@@ -404,7 +404,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
      p->writableSchema = 1;
    }
    output_formatted(p,
-       "INSERT INTO sqlite_schema(type,name,tbl_name,rootpage,sql)"
+       "INSERT INTO sqlite_master(type,name,tbl_name,rootpage,sql)"
       "VALUES('table','%q','%q',0,'%q');",
       zTable, zTable, zSql);
    return 0;
@@ -646,27 +646,27 @@ int sqlite3_db_dump(
  xCallback("PRAGMA foreign_keys=OFF;\nBEGIN TRANSACTION;\n", pArg);
  if( zTable==0 ){
    run_schema_dump_query(&x,
-      "SELECT name, type, sql FROM \"%w\".sqlite_schema "
+      "SELECT name, type, sql FROM \"%w\".sqlite_master "
      "WHERE sql NOT NULL AND type=='table' AND name!='sqlite_sequence'",
      zSchema
    );
    run_schema_dump_query(&x,
-      "SELECT name, type, sql FROM \"%w\".sqlite_schema "
+      "SELECT name, type, sql FROM \"%w\".sqlite_master "
      "WHERE name=='sqlite_sequence'", zSchema
    );
    output_sql_from_query(&x,
-      "SELECT sql FROM sqlite_schema "
+      "SELECT sql FROM sqlite_master "
      "WHERE sql NOT NULL AND type IN ('index','trigger','view')", 0
    );
  }else{
    run_schema_dump_query(&x,
-      "SELECT name, type, sql FROM \"%w\".sqlite_schema "
+      "SELECT name, type, sql FROM \"%w\".sqlite_master "
      "WHERE tbl_name=%Q COLLATE nocase AND type=='table'"
      "  AND sql NOT NULL",
      zSchema, zTable
    );
    output_sql_from_query(&x,
-      "SELECT sql FROM \"%w\".sqlite_schema "
+      "SELECT sql FROM \"%w\".sqlite_master "
      "WHERE sql NOT NULL"
      "  AND type IN ('index','trigger','view')"
      "  AND tbl_name=%Q COLLATE nocase",
@@ -1,635 +0,0 @@
-/*
-** 2020-06-22
-**
-** 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.
-**
-******************************************************************************
-**
-** Routines to implement arbitrary-precision decimal math.
-**
-** The focus here is on simplicity and correctness, not performance.
-*/
-#include "sqlite3ext.h"
-SQLITE_EXTENSION_INIT1
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-/* Mark a function parameter as unused, to suppress nuisance compiler
-** warnings. */
-#ifndef UNUSED_PARAMETER
-# define UNUSED_PARAMETER(X)  (void)(X)
-#endif
-
-
-/* A decimal object */
-typedef struct Decimal Decimal;
-struct Decimal {
-  char sign;        /* 0 for positive, 1 for negative */
-  char oom;         /* True if an OOM is encountered */
-  char isNull;      /* True if holds a NULL rather than a number */
-  char isInit;      /* True upon initialization */
-  int nDigit;       /* Total number of digits */
-  int nFrac;        /* Number of digits to the right of the decimal point */
-  signed char *a;   /* Array of digits.  Most significant first. */
-};
-
-/*
-** Release memory held by a Decimal, but do not free the object itself.
-*/
-static void decimal_clear(Decimal *p){
-  sqlite3_free(p->a);
-}
-
-/*
-** Destroy a Decimal object
-*/
-static void decimal_free(Decimal *p){
-  if( p ){
-    decimal_clear(p);
-    sqlite3_free(p);
-  }
-}
-
-/*
-** Allocate a new Decimal object.  Initialize it to the number given
-** by the input string.
-*/
-static Decimal *decimal_new(
-  sqlite3_context *pCtx,
-  sqlite3_value *pIn,
-  int nAlt,
-  const unsigned char *zAlt
-){
-  Decimal *p;
-  int n, i;
-  const unsigned char *zIn;
-  int iExp = 0;
-  p = sqlite3_malloc( sizeof(*p) );
-  if( p==0 ) goto new_no_mem;
-  p->sign = 0;
-  p->oom = 0;
-  p->isInit = 1;
-  p->isNull = 0;
-  p->nDigit = 0;
-  p->nFrac = 0;
-  if( zAlt ){
-    n = nAlt,
-    zIn = zAlt;
-  }else{
-    if( sqlite3_value_type(pIn)==SQLITE_NULL ){
-      p->a = 0;
-      p->isNull = 1;
-      return p;
-    }
-    n = sqlite3_value_bytes(pIn);
-    zIn = sqlite3_value_text(pIn);
-  }
-  p->a = sqlite3_malloc64( n+1 );
-  if( p->a==0 ) goto new_no_mem;
-  for(i=0; isspace(zIn[i]); i++){}
-  if( zIn[i]=='-' ){
-    p->sign = 1;
-    i++;
-  }else if( zIn[i]=='+' ){
-    i++;
-  }
-  while( i<n && zIn[i]=='0' ) i++;
-  while( i<n ){
-    char c = zIn[i];
-    if( c>='0' && c<='9' ){
-      p->a[p->nDigit++] = c - '0';
-    }else if( c=='.' ){
-      p->nFrac = p->nDigit + 1;
-    }else if( c=='e' || c=='E' ){
-      int j = i+1;
-      int neg = 0;
-      if( j>=n ) break;
-      if( zIn[j]=='-' ){
-        neg = 1;
-        j++;
-      }else if( zIn[j]=='+' ){
-        j++;
-      }
-      while( j<n && iExp<1000000 ){
-        if( zIn[j]>='0' && zIn[j]<='9' ){
-          iExp = iExp*10 + zIn[j] - '0';
-        }
-        j++;
-      }
-      if( neg ) iExp = -iExp;
-      break;
-    }
-    i++;
-  }
-  if( p->nFrac ){
-    p->nFrac = p->nDigit - (p->nFrac - 1);
-  }
-  if( iExp>0 ){
-    if( p->nFrac>0 ){
-      if( iExp<=p->nFrac ){
-        p->nFrac -= iExp;
-        iExp = 0;
-      }else{
-        iExp -= p->nFrac;
-        p->nFrac = 0;
-      }
-    }
-    if( iExp>0 ){   
-      p->a = sqlite3_realloc64(p->a, p->nDigit + iExp + 1 );
-      if( p->a==0 ) goto new_no_mem;
-      memset(p->a+p->nDigit, 0, iExp);
-      p->nDigit += iExp;
-    }
-  }else if( iExp<0 ){
-    int nExtra;
-    iExp = -iExp;
-    nExtra = p->nDigit - p->nFrac - 1;
-    if( nExtra ){
-      if( nExtra>=iExp ){
-        p->nFrac += iExp;
-        iExp  = 0;
-      }else{
-        iExp -= nExtra;
-        p->nFrac = p->nDigit - 1;
-      }
-    }
-    if( iExp>0 ){
-      p->a = sqlite3_realloc64(p->a, p->nDigit + iExp + 1 );
-      if( p->a==0 ) goto new_no_mem;
-      memmove(p->a+iExp, p->a, p->nDigit);
-      memset(p->a, 0, iExp);
-      p->nDigit += iExp;
-      p->nFrac += iExp;
-    }
-  }
-  return p;
-
-new_no_mem:
-  if( pCtx ) sqlite3_result_error_nomem(pCtx);
-  sqlite3_free(p);
-  return 0;
-}
-
-/*
-** Make the given Decimal the result.
-*/
-static void decimal_result(sqlite3_context *pCtx, Decimal *p){
-  char *z;
-  int i, j;
-  int n;
-  if( p==0 || p->oom ){
-    sqlite3_result_error_nomem(pCtx);
-    return;
-  }
-  if( p->isNull ){
-    sqlite3_result_null(pCtx);
-    return;
-  }
-  z = sqlite3_malloc( p->nDigit+4 );
-  if( z==0 ){
-    sqlite3_result_error_nomem(pCtx);
-    return;
-  }
-  i = 0;
-  if( p->nDigit==0 || (p->nDigit==1 && p->a[0]==0) ){
-    p->sign = 0;
-  }
-  if( p->sign ){
-    z[0] = '-';
-    i = 1;
-  }
-  n = p->nDigit - p->nFrac;
-  if( n<=0 ){
-    z[i++] = '0';
-  }
-  j = 0;
-  while( n>1 && p->a[j]==0 ){
-    j++;
-    n--;
-  }
-  while( n>0  ){
-    z[i++] = p->a[j] + '0';
-    j++;
-    n--;
-  }
-  if( p->nFrac ){
-    z[i++] = '.';
-    do{
-      z[i++] = p->a[j] + '0';
-      j++;
-    }while( j<p->nDigit );
-  }
-  z[i] = 0;
-  sqlite3_result_text(pCtx, z, i, sqlite3_free);
-}
-
-/*
-** SQL Function:   decimal(X)
-**
-** Convert input X into decimal and then back into text
-*/
-static void decimalFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Decimal *p = decimal_new(context, argv[0], 0, 0);
-  UNUSED_PARAMETER(argc);
-  decimal_result(context, p);
-  decimal_free(p);
-}
-
-/*
-** Compare to Decimal objects.  Return negative, 0, or positive if the
-** first object is less than, equal to, or greater than the second.
-**
-** Preconditions for this routine:
-**
-**    pA!=0
-**    pA->isNull==0
-**    pB!=0
-**    pB->isNull==0
-*/
-static int decimal_cmp(const Decimal *pA, const Decimal *pB){
-  int nASig, nBSig, rc, n;
-  if( pA->sign!=pB->sign ){
-    return pA->sign ? -1 : +1;
-  }
-  if( pA->sign ){
-    const Decimal *pTemp = pA;
-    pA = pB;
-    pB = pTemp;
-  }
-  nASig = pA->nDigit - pA->nFrac;
-  nBSig = pB->nDigit - pB->nFrac;
-  if( nASig!=nBSig ){
-    return nASig - nBSig;
-  }
-  n = pA->nDigit;
-  if( n>pB->nDigit ) n = pB->nDigit;
-  rc = memcmp(pA->a, pB->a, n);
-  if( rc==0 ){
-    rc = pA->nDigit - pB->nDigit;
-  }
-  return rc;
-}
-
-/*
-** SQL Function:   decimal_cmp(X, Y)
-**
-** Return negative, zero, or positive if X is less then, equal to, or
-** greater than Y.
-*/
-static void decimalCmpFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Decimal *pA = 0, *pB = 0;
-  int rc;
-
-  UNUSED_PARAMETER(argc);
-  pA = decimal_new(context, argv[0], 0, 0);
-  if( pA==0 || pA->isNull ) goto cmp_done;
-  pB = decimal_new(context, argv[1], 0, 0);
-  if( pB==0 || pB->isNull ) goto cmp_done;
-  rc = decimal_cmp(pA, pB);
-  if( rc<0 ) rc = -1;
-  else if( rc>0 ) rc = +1;
-  sqlite3_result_int(context, rc);
-cmp_done:
-  decimal_free(pA);
-  decimal_free(pB);
-}
-
-/*
-** Expand the Decimal so that it has a least nDigit digits and nFrac
-** digits to the right of the decimal point.
-*/
-static void decimal_expand(Decimal *p, int nDigit, int nFrac){
-  int nAddSig;
-  int nAddFrac;
-  if( p==0 ) return;
-  nAddFrac = nFrac - p->nFrac;
-  nAddSig = (nDigit - p->nDigit) - nAddFrac;
-  if( nAddFrac==0 && nAddSig==0 ) return;
-  p->a = sqlite3_realloc64(p->a, nDigit+1);
-  if( p->a==0 ){
-    p->oom = 1;
-    return;
-  }
-  if( nAddSig ){
-    memmove(p->a+nAddSig, p->a, p->nDigit);
-    memset(p->a, 0, nAddSig);
-    p->nDigit += nAddSig;
-  }
-  if( nAddFrac ){
-    memset(p->a+p->nDigit, 0, nAddFrac);
-    p->nDigit += nAddFrac;
-    p->nFrac += nAddFrac;
-  }
-}
-
-/*
-** Add the value pB into pA.
-**
-** Both pA and pB might become denormalized by this routine.
-*/
-static void decimal_add(Decimal *pA, Decimal *pB){
-  int nSig, nFrac, nDigit;
-  int i, rc;
-  if( pA==0 ){
-    return;
-  }
-  if( pA->oom || pB==0 || pB->oom ){
-    pA->oom = 1;
-    return;
-  }
-  if( pA->isNull || pB->isNull ){
-    pA->isNull = 1;
-    return;
-  }
-  nSig = pA->nDigit - pA->nFrac;
-  if( nSig && pA->a[0]==0 ) nSig--;
-  if( nSig<pB->nDigit-pB->nFrac ){
-    nSig = pB->nDigit - pB->nFrac;
-  }
-  nFrac = pA->nFrac;
-  if( nFrac<pB->nFrac ) nFrac = pB->nFrac;
-  nDigit = nSig + nFrac + 1;
-  decimal_expand(pA, nDigit, nFrac);
-  decimal_expand(pB, nDigit, nFrac);
-  if( pA->oom || pB->oom ){
-    pA->oom = 1;
-  }else{
-    if( pA->sign==pB->sign ){
-      int carry = 0;
-      for(i=nDigit-1; i>=0; i--){
-        int x = pA->a[i] + pB->a[i] + carry;
-        if( x>=10 ){
-          carry = 1;
-          pA->a[i] = x - 10;
-        }else{
-          carry = 0;
-          pA->a[i] = x;
-        }
-      }
-    }else{
-      signed char *aA, *aB;
-      int borrow = 0;
-      rc = memcmp(pA->a, pB->a, nDigit);
-      if( rc<0 ){
-        aA = pB->a;
-        aB = pA->a;
-        pA->sign = !pA->sign;
-      }else{
-        aA = pA->a;
-        aB = pB->a;
-      }
-      for(i=nDigit-1; i>=0; i--){
-        int x = aA[i] - aB[i] - borrow;
-        if( x<0 ){
-          pA->a[i] = x+10;
-          borrow = 1;
-        }else{
-          pA->a[i] = x;
-          borrow = 0;
-        }
-      }
-    }
-  }
-}
-
-/*
-** Compare text in decimal order.
-*/
-static int decimalCollFunc(
-  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;
-  Decimal *pA = decimal_new(0, 0, nKey1, zA);
-  Decimal *pB = decimal_new(0, 0, nKey2, zB);
-  int rc;
-  UNUSED_PARAMETER(notUsed);
-  if( pA==0 || pB==0 ){
-    rc = 0;
-  }else{
-    rc = decimal_cmp(pA, pB);
-  }
-  decimal_free(pA);
-  decimal_free(pB);
-  return rc;
-}
-
-
-/*
-** SQL Function:   decimal_add(X, Y)
-**                 decimal_sub(X, Y)
-**
-** Return the sum or difference of X and Y.
-*/
-static void decimalAddFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Decimal *pA = decimal_new(context, argv[0], 0, 0);
-  Decimal *pB = decimal_new(context, argv[1], 0, 0);
-  UNUSED_PARAMETER(argc);
-  decimal_add(pA, pB);
-  decimal_result(context, pA);
-  decimal_free(pA);
-  decimal_free(pB);
-}
-static void decimalSubFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Decimal *pA = decimal_new(context, argv[0], 0, 0);
-  Decimal *pB = decimal_new(context, argv[1], 0, 0);
-  UNUSED_PARAMETER(argc);
-  if( pB ){
-    pB->sign = !pB->sign;
-    decimal_add(pA, pB);
-    decimal_result(context, pA);
-  }
-  decimal_free(pA);
-  decimal_free(pB);
-}
-
-/* Aggregate funcion:   decimal_sum(X)
-**
-** Works like sum() except that it uses decimal arithmetic for unlimited
-** precision.
-*/
-static void decimalSumStep(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Decimal *p;
-  Decimal *pArg;
-  UNUSED_PARAMETER(argc);
-  p = sqlite3_aggregate_context(context, sizeof(*p));
-  if( p==0 ) return;
-  if( !p->isInit ){
-    p->isInit = 1;
-    p->a = sqlite3_malloc(2);
-    if( p->a==0 ){
-      p->oom = 1;
-    }else{
-      p->a[0] = 0;
-    }
-    p->nDigit = 1;
-    p->nFrac = 0;
-  }
-  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
-  pArg = decimal_new(context, argv[0], 0, 0);
-  decimal_add(p, pArg);
-  decimal_free(pArg);
-}
-static void decimalSumInverse(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Decimal *p;
-  Decimal *pArg;
-  UNUSED_PARAMETER(argc);
-  p = sqlite3_aggregate_context(context, sizeof(*p));
-  if( p==0 ) return;
-  if( sqlite3_value_type(argv[0])==SQLITE_NULL ) return;
-  pArg = decimal_new(context, argv[0], 0, 0);
-  if( pArg ) pArg->sign = !pArg->sign;
-  decimal_add(p, pArg);
-  decimal_free(pArg);
-}
-static void decimalSumValue(sqlite3_context *context){
-  Decimal *p = sqlite3_aggregate_context(context, 0);
-  if( p==0 ) return;
-  decimal_result(context, p);
-}
-static void decimalSumFinalize(sqlite3_context *context){
-  Decimal *p = sqlite3_aggregate_context(context, 0);
-  if( p==0 ) return;
-  decimal_result(context, p);
-  decimal_clear(p);
-}
-
-/*
-** SQL Function:   decimal_mul(X, Y)
-**
-** Return the product of X and Y.
-**
-** All significant digits after the decimal point are retained.
-** Trailing zeros after the decimal point are omitted as long as
-** the number of digits after the decimal point is no less than
-** either the number of digits in either input.
-*/
-static void decimalMulFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  Decimal *pA = decimal_new(context, argv[0], 0, 0);
-  Decimal *pB = decimal_new(context, argv[1], 0, 0);
-  signed char *acc = 0;
-  int i, j, k;
-  int minFrac;
-  UNUSED_PARAMETER(argc);
-  if( pA==0 || pA->oom || pA->isNull
-   || pB==0 || pB->oom || pB->isNull 
-  ){
-    goto mul_end;
-  }
-  acc = sqlite3_malloc64( pA->nDigit + pB->nDigit + 2 );
-  if( acc==0 ){
-    sqlite3_result_error_nomem(context);
-    goto mul_end;
-  }
-  memset(acc, 0, pA->nDigit + pB->nDigit + 2);
-  minFrac = pA->nFrac;
-  if( pB->nFrac<minFrac ) minFrac = pB->nFrac;
-  for(i=pA->nDigit-1; i>=0; i--){
-    signed char f = pA->a[i];
-    int carry = 0, x;
-    for(j=pB->nDigit-1, k=i+j+3; j>=0; j--, k--){
-      x = acc[k] + f*pB->a[j] + carry;
-      acc[k] = x%10;
-      carry = x/10;
-    }
-    x = acc[k] + carry;
-    acc[k] = x%10;
-    acc[k-1] += x/10;
-  }
-  sqlite3_free(pA->a);
-  pA->a = acc;
-  acc = 0;
-  pA->nDigit += pB->nDigit + 2;
-  pA->nFrac += pB->nFrac;
-  pA->sign ^= pB->sign;
-  while( pA->nFrac>minFrac && pA->a[pA->nDigit-1]==0 ){
-    pA->nFrac--;
-    pA->nDigit--;
-  }
-  decimal_result(context, pA);
-
-mul_end:
-  sqlite3_free(acc);
-  decimal_free(pA);
-  decimal_free(pB);
-}
-
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_decimal_init(
-  sqlite3 *db, 
-  char **pzErrMsg, 
-  const sqlite3_api_routines *pApi
-){
-  int rc = SQLITE_OK;
-  static const struct {
-    const char *zFuncName;
-    int nArg;
-    void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
-  } aFunc[] = {
-    { "decimal",       1,   decimalFunc        },
-    { "decimal_cmp",   2,   decimalCmpFunc     },
-    { "decimal_add",   2,   decimalAddFunc     },
-    { "decimal_sub",   2,   decimalSubFunc     },
-    { "decimal_mul",   2,   decimalMulFunc     },
-  };
-  unsigned int i;
-  (void)pzErrMsg;  /* Unused parameter */
-
-  SQLITE_EXTENSION_INIT2(pApi);
-
-  for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
-    rc = sqlite3_create_function(db, aFunc[i].zFuncName, aFunc[i].nArg,
-                   SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC,
-                   0, aFunc[i].xFunc, 0, 0);
-  }
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_window_function(db, "decimal_sum", 1,
-                   SQLITE_UTF8|SQLITE_INNOCUOUS|SQLITE_DETERMINISTIC, 0,
-                   decimalSumStep, decimalSumFinalize,
-                   decimalSumValue, decimalSumInverse, 0);
-  }
-  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_collation(db, "decimal", SQLITE_UTF8,
-                                  0, decimalCollFunc);
-  }
-  return rc;
-}
@@ -16,7 +16,7 @@
 ** Usage example:
 **
 **     .load ./explain
-**     SELECT p2 FROM explain('SELECT * FROM sqlite_schema')
+**     SELECT p2 FROM explain('SELECT * FROM sqlite_master')
 **      WHERE opcode='OpenRead';
 **
 ** This module was originally written to help simplify SQLite testing,
@@ -72,11 +72,6 @@
 **   $path is a relative path, then $path is interpreted relative to $dir. 
 **   And the paths returned in the "name" column of the table are also 
 **   relative to directory $dir.
-**
-** Notes on building this extension for Windows:
-**   Unless linked statically with the SQLite library, a preprocessor
-**   symbol, FILEIO_WIN32_DLL, must be #define'd to create a stand-alone
-**   DLL form of this extension for WIN32. See its use below for details.
 */
 #include "sqlite3ext.h"
 SQLITE_EXTENSION_INIT1
@@ -230,22 +225,6 @@ static sqlite3_uint64 fileTimeToUnixTime(
  return (fileIntervals.QuadPart - epochIntervals.QuadPart) / 10000000;
 }

-
-#if defined(FILEIO_WIN32_DLL) && (defined(_WIN32) || defined(WIN32))
-#  /* To allow a standalone DLL, use this next replacement function: */
-#  undef sqlite3_win32_utf8_to_unicode
-#  define sqlite3_win32_utf8_to_unicode utf8_to_utf16
-#
-LPWSTR utf8_to_utf16(const char *z){
-  int nAllot = MultiByteToWideChar(CP_UTF8, 0, z, -1, NULL, 0);
-  LPWSTR rv = sqlite3_malloc(nAllot * sizeof(WCHAR));
-  if( rv!=0 && 0 < MultiByteToWideChar(CP_UTF8, 0, z, -1, rv, nAllot) )
-    return rv;
-  sqlite3_free(rv);
-  return 0;
-}
-#endif
-
 /*
 ** This function attempts to normalize the time values found in the stat()
 ** buffer to UTC.  This is necessary on Win32, where the runtime library
@@ -1019,11 +998,3 @@ int sqlite3_fileio_init(
  }
  return rc;
 }
-
-#if defined(FILEIO_WIN32_DLL) && (defined(_WIN32) || defined(WIN32))
-/* To allow a standalone DLL, make test_windirent.c use the same
- * redefined SQLite API calls as the above extension code does.
- * Just pull in this .c to accomplish this. As a beneficial side
- * effect, this extension becomes a single translation unit. */
-#  include "test_windirent.c"
-#endif
@@ -26,76 +26,16 @@
 **
 ** Examples:
 **
-**     ieee754(2.0)             ->     'ieee754(2,0)'
-**     ieee754(45.25)           ->     'ieee754(181,-2)'
-**     ieee754(2, 0)            ->     2.0
-**     ieee754(181, -2)         ->     45.25
-**
-** Two additional functions break apart the one-argument ieee754()
-** result into separate integer values:
-**
-**     ieee754_mantissa(45.25)  ->     181
-**     ieee754_exponent(45.25)  ->     -2
-**
-** These functions convert binary64 numbers into blobs and back again.
-**
-**     ieee754_from_blob(x'3ff0000000000000')  ->  1.0
-**     ieee754_to_blob(1.0)                    ->  x'3ff0000000000000'
-**
-** In all single-argument functions, if the argument is an 8-byte blob
-** then that blob is interpreted as a big-endian binary64 value.
-**
-**
-** EXACT DECIMAL REPRESENTATION OF BINARY64 VALUES
-** -----------------------------------------------
-**
-** This extension in combination with the separate 'decimal' extension
-** can be used to compute the exact decimal representation of binary64
-** values.  To begin, first compute a table of exponent values:
-**
-**    CREATE TABLE pow2(x INTEGER PRIMARY KEY, v TEXT);
-**    WITH RECURSIVE c(x,v) AS (
-**      VALUES(0,'1')
-**      UNION ALL
-**      SELECT x+1, decimal_mul(v,'2') FROM c WHERE x+1<=971
-**    ) INSERT INTO pow2(x,v) SELECT x, v FROM c;
-**    WITH RECURSIVE c(x,v) AS (
-**      VALUES(-1,'0.5')
-**      UNION ALL
-**      SELECT x-1, decimal_mul(v,'0.5') FROM c WHERE x-1>=-1075
-**    ) INSERT INTO pow2(x,v) SELECT x, v FROM c;
-**
-** Then, to compute the exact decimal representation of a floating
-** point value (the value 47.49 is used in the example) do:
-**
-**    WITH c(n) AS (VALUES(47.49))
-**          ---------------^^^^^---- Replace with whatever you want
-**    SELECT decimal_mul(ieee754_mantissa(c.n),pow2.v)
-**      FROM pow2, c WHERE pow2.x=ieee754_exponent(c.n);
-**
-** Here is a query to show various boundry values for the binary64
-** number format:
-**
-**    WITH c(name,bin) AS (VALUES
-**       ('minimum positive value',        x'0000000000000001'),
-**       ('maximum subnormal value',       x'000fffffffffffff'),
-**       ('mininum positive nornal value', x'0010000000000000'),
-**       ('maximum value',                 x'7fefffffffffffff'))
-**    SELECT c.name, decimal_mul(ieee754_mantissa(c.bin),pow2.v)
-**      FROM pow2, c WHERE pow2.x=ieee754_exponent(c.bin);
-**
+**     ieee754(2.0)       ->     'ieee754(2,0)'
+**     ieee754(45.25)     ->     'ieee754(181,-2)'
+**     ieee754(2, 0)      ->     2.0
+**     ieee754(181, -2)   ->     45.25
 */
 #include "sqlite3ext.h"
 SQLITE_EXTENSION_INIT1
 #include <assert.h>
 #include <string.h>

-/* Mark a function parameter as unused, to suppress nuisance compiler
-** warnings. */
-#ifndef UNUSED_PARAMETER
-# define UNUSED_PARAMETER(X)  (void)(X)
-#endif
-
 /*
 ** Implementation of the ieee754() function
 */
@@ -111,19 +51,8 @@ static void ieee754func(
    int isNeg;
    char zResult[100];
    assert( sizeof(m)==sizeof(r) );
-    if( sqlite3_value_type(argv[0])==SQLITE_BLOB
-     && sqlite3_value_bytes(argv[0])==sizeof(r)
-    ){
-      const unsigned char *x = sqlite3_value_blob(argv[0]);
-      unsigned int i;
-      sqlite3_uint64 v = 0;
-      for(i=0; i<sizeof(r); i++){
-        v = (v<<8) | x[i];
-      }
-      memcpy(&r, &v, sizeof(r));
-    }else{
-      r = sqlite3_value_double(argv[0]);
-    }
+    if( sqlite3_value_type(argv[0])!=SQLITE_FLOAT ) return;
+    r = sqlite3_value_double(argv[0]);
    if( r<0.0 ){
      isNeg = 1;
      r = -r;
@@ -137,49 +66,27 @@ static void ieee754func(
    }else{
      e = a>>52;
      m = a & ((((sqlite3_int64)1)<<52)-1);
-      if( e==0 ){
-        m <<= 1;
-      }else{
-        m |= ((sqlite3_int64)1)<<52;
-      }
+      m |= ((sqlite3_int64)1)<<52;
      while( e<1075 && m>0 && (m&1)==0 ){
        m >>= 1;
        e++;
      }
      if( isNeg ) m = -m;
    }
-    switch( *(int*)sqlite3_user_data(context) ){
-      case 0:
-        sqlite3_snprintf(sizeof(zResult), zResult, "ieee754(%lld,%d)",
-                         m, e-1075);
-        sqlite3_result_text(context, zResult, -1, SQLITE_TRANSIENT);
-        break;
-      case 1:
-        sqlite3_result_int64(context, m);
-        break;
-      case 2:
-        sqlite3_result_int(context, e-1075);
-        break;
-    }
-  }else{
+    sqlite3_snprintf(sizeof(zResult), zResult, "ieee754(%lld,%d)",
+                     m, e-1075);
+    sqlite3_result_text(context, zResult, -1, SQLITE_TRANSIENT);
+  }else if( argc==2 ){
    sqlite3_int64 m, e, a;
    double r;
    int isNeg = 0;
    m = sqlite3_value_int64(argv[0]);
    e = sqlite3_value_int64(argv[1]);
-
-    /* Limit the range of e.  Ticket 22dea1cfdb9151e4 2021-03-02 */
-    if( e>10000 ){
-      e = 10000;
-    }else if( e<-10000 ){
-      e = -10000;
-    }
-
    if( m<0 ){
      isNeg = 1;
      m = -m;
      if( m<0 ) return;
-    }else if( m==0 && e>-1000 && e<1000 ){
+    }else if( m==0 && e>1000 && e<1000 ){
      sqlite3_result_double(context, 0.0);
      return;
    }
@@ -192,17 +99,8 @@ static void ieee754func(
      e--;
    }
    e += 1075;
-    if( e<=0 ){
-      /* Subnormal */
-      if( 1-e >= 64 ){
-        m = 0;
-      }else{
-        m >>= 1-e;
-      }
-      e = 0;
-    }else if( e>0x7ff ){
-      e = 0x7ff;
-    }
+    if( e<0 ) e = m = 0;
+    if( e>0x7ff ) e = 0x7ff;
    a = m & ((((sqlite3_int64)1)<<52)-1);
    a |= e<<52;
    if( isNeg ) a |= ((sqlite3_uint64)1)<<63;
@@ -211,51 +109,6 @@ static void ieee754func(
  }
 }

-/*
-** Functions to convert between blobs and floats.
-*/
-static void ieee754func_from_blob(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  UNUSED_PARAMETER(argc);
-  if( sqlite3_value_type(argv[0])==SQLITE_BLOB
-   && sqlite3_value_bytes(argv[0])==sizeof(double)
-  ){
-    double r;
-    const unsigned char *x = sqlite3_value_blob(argv[0]);
-    unsigned int i;
-    sqlite3_uint64 v = 0;
-    for(i=0; i<sizeof(r); i++){
-      v = (v<<8) | x[i];
-    }
-    memcpy(&r, &v, sizeof(r));
-    sqlite3_result_double(context, r);
-  }
-}
-static void ieee754func_to_blob(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  UNUSED_PARAMETER(argc);
-  if( sqlite3_value_type(argv[0])==SQLITE_FLOAT
-   || sqlite3_value_type(argv[0])==SQLITE_INTEGER
-  ){
-    double r = sqlite3_value_double(argv[0]);
-    sqlite3_uint64 v;
-    unsigned char a[sizeof(r)];
-    unsigned int i;
-    memcpy(&v, &r, sizeof(r));
-    for(i=1; i<=sizeof(r); i++){
-      a[sizeof(r)-i] = v&0xff;
-      v >>= 8;
-    }
-    sqlite3_result_blob(context, a, sizeof(r), SQLITE_TRANSIENT);
-  }
-}
-

 #ifdef _WIN32
 __declspec(dllexport)
@@ -265,29 +118,16 @@ int sqlite3_ieee_init(
  char **pzErrMsg, 
  const sqlite3_api_routines *pApi
 ){
-  static const struct {
-    char *zFName;
-    int nArg;
-    int iAux;
-    void (*xFunc)(sqlite3_context*,int,sqlite3_value**);
-  } aFunc[] = {
-    { "ieee754",           1,   0, ieee754func },
-    { "ieee754",           2,   0, ieee754func },
-    { "ieee754_mantissa",  1,   1, ieee754func },
-    { "ieee754_exponent",  1,   2, ieee754func },
-    { "ieee754_to_blob",   1,   0, ieee754func_to_blob },
-    { "ieee754_from_blob", 1,   0, ieee754func_from_blob },
-
-  };
-  unsigned int i;
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  (void)pzErrMsg;  /* Unused parameter */
-  for(i=0; i<sizeof(aFunc)/sizeof(aFunc[0]) && rc==SQLITE_OK; i++){
-    rc = sqlite3_create_function(db, aFunc[i].zFName, aFunc[i].nArg,	
-                               SQLITE_UTF8|SQLITE_INNOCUOUS,
-                               (void*)&aFunc[i].iAux,
-                               aFunc[i].xFunc, 0, 0);
+  rc = sqlite3_create_function(db, "ieee754", 1, 
+                               SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+                               ieee754func, 0, 0);
+  if( rc==SQLITE_OK ){
+    rc = sqlite3_create_function(db, "ieee754", 2,
+                                 SQLITE_UTF8|SQLITE_INNOCUOUS, 0,
+                                 ieee754func, 0, 0);
  }
  return rc;
 }
@@ -42,10 +42,6 @@ SQLITE_EXTENSION_INIT1
 # define SMALLEST_INT64 (((sqlite3_int64)-1) - LARGEST_INT64)
 #endif

-#ifndef deliberate_fall_through
-# define deliberate_fall_through
-#endif
-
 /*
 ** Versions of isspace(), isalnum() and isdigit() to which it is safe
 ** to pass signed char values.
@@ -96,34 +92,7 @@ static const char jsonIsSpace[] = {
  typedef unsigned int u32;
  typedef unsigned short int u16;
  typedef unsigned char u8;
-# if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
-#   define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1
-# endif
-# if defined(SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS)
-#   define ALWAYS(X)      (1)
-#   define NEVER(X)       (0)
-# elif !defined(NDEBUG)
-#   define ALWAYS(X)      ((X)?1:(assert(0),0))
-#   define NEVER(X)       ((X)?(assert(0),1):0)
-# else
-#   define ALWAYS(X)      (X)
-#   define NEVER(X)       (X)
-# endif
-# define testcase(X)
 #endif
-#if defined(NDEBUG)
-#  define VVA(X)
-#else
-#  define VVA(X) X
-#endif
-
-/*
-** Some of the testcase() macros in this file are problematic for gcov
-** in that they generate false-miss errors randomly.  This is a gcov problem,
-** not a problem in this case.  But to work around it, we disable the
-** problematic test cases for production builds.
-*/
-#define json_testcase(X)

 /* Objects */
 typedef struct JsonString JsonString;
@@ -181,14 +150,13 @@ static const char * const jsonType[] = {
 struct JsonNode {
  u8 eType;              /* One of the JSON_ type values */
  u8 jnFlags;            /* JNODE flags */
-  u8 eU;                 /* Which union element to use */
  u32 n;                 /* Bytes of content, or number of sub-nodes */
  union {
-    const char *zJContent; /* 1: Content for INT, REAL, and STRING */
-    u32 iAppend;           /* 2: More terms for ARRAY and OBJECT */
-    u32 iKey;              /* 3: Key for ARRAY objects in json_tree() */
-    u32 iReplace;          /* 4: Replacement content for JNODE_REPLACE */
-    JsonNode *pPatch;      /* 5: Node chain of patch for JNODE_PATCH */
+    const char *zJContent; /* Content for INT, REAL, and STRING */
+    u32 iAppend;           /* More terms for ARRAY and OBJECT */
+    u32 iKey;              /* Key for ARRAY objects in json_tree() */
+    u32 iReplace;          /* Replacement content for JNODE_REPLACE */
+    JsonNode *pPatch;      /* Node chain of patch for JNODE_PATCH */
  } u;
 };

@@ -327,7 +295,7 @@ static void jsonAppendSeparator(JsonString *p){
 */
 static void jsonAppendString(JsonString *p, const char *zIn, u32 N){
  u32 i;
-  if( zIn==0 || ((N+p->nUsed+2 >= p->nAlloc) && jsonGrow(p,N+2)!=0) ) return;
+  if( (N+p->nUsed+2 >= p->nAlloc) && jsonGrow(p,N+2)!=0 ) return;
  p->zBuf[p->nUsed++] = '"';
  for(i=0; i<N; i++){
    unsigned char c = ((unsigned const char*)zIn)[i];
@@ -466,14 +434,11 @@ static void jsonRenderNode(
  JsonString *pOut,              /* Write JSON here */
  sqlite3_value **aReplace       /* Replacement values */
 ){
-  assert( pNode!=0 );
  if( pNode->jnFlags & (JNODE_REPLACE|JNODE_PATCH) ){
-    if( (pNode->jnFlags & JNODE_REPLACE)!=0 && ALWAYS(aReplace!=0) ){
-      assert( pNode->eU==4 );
+    if( pNode->jnFlags & JNODE_REPLACE ){
      jsonAppendValue(pOut, aReplace[pNode->u.iReplace]);
      return;
    }
-    assert( pNode->eU==5 );
    pNode = pNode->u.pPatch;
  }
  switch( pNode->eType ){
@@ -492,15 +457,13 @@ static void jsonRenderNode(
    }
    case JSON_STRING: {
      if( pNode->jnFlags & JNODE_RAW ){
-        assert( pNode->eU==1 );
        jsonAppendString(pOut, pNode->u.zJContent, pNode->n);
        break;
      }
-      /* no break */ deliberate_fall_through
+      /* Fall through into the next case */
    }
    case JSON_REAL:
    case JSON_INT: {
-      assert( pNode->eU==1 );
      jsonAppendRaw(pOut, pNode->u.zJContent, pNode->n);
      break;
    }
@@ -516,7 +479,6 @@ static void jsonRenderNode(
          j += jsonNodeSize(&pNode[j]);
        }
        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
-        assert( pNode->eU==2 );
        pNode = &pNode[pNode->u.iAppend];
        j = 1;
      }
@@ -537,7 +499,6 @@ static void jsonRenderNode(
          j += 1 + jsonNodeSize(&pNode[j+1]);
        }
        if( (pNode->jnFlags & JNODE_APPEND)==0 ) break;
-        assert( pNode->eU==2 );
        pNode = &pNode[pNode->u.iAppend];
        j = 1;
      }
@@ -617,9 +578,7 @@ static void jsonReturn(
    }
    case JSON_INT: {
      sqlite3_int64 i = 0;
-      const char *z;
-      assert( pNode->eU==1 );
-      z = pNode->u.zJContent;
+      const char *z = pNode->u.zJContent;
      if( z[0]=='-' ){ z++; }
      while( z[0]>='0' && z[0]<='9' ){
        unsigned v = *(z++) - '0';
@@ -642,17 +601,14 @@ static void jsonReturn(
      sqlite3_result_int64(pCtx, i);
      int_done:
      break;
-      int_as_real: ; /* no break */ deliberate_fall_through
+      int_as_real: /* fall through to real */;
    }
    case JSON_REAL: {
      double r;
 #ifdef SQLITE_AMALGAMATION
-      const char *z;
-      assert( pNode->eU==1 );
-      z = pNode->u.zJContent;
+      const char *z = pNode->u.zJContent;
      sqlite3AtoF(z, &r, sqlite3Strlen30(z), SQLITE_UTF8);
 #else
-      assert( pNode->eU==1 );
      r = strtod(pNode->u.zJContent, 0);
 #endif
      sqlite3_result_double(pCtx, r);
@@ -663,7 +619,6 @@ static void jsonReturn(
      ** json_insert() and json_replace() and those routines do not
      ** call jsonReturn() */
      if( pNode->jnFlags & JNODE_RAW ){
-        assert( pNode->eU==1 );
        sqlite3_result_text(pCtx, pNode->u.zJContent, pNode->n,
                            SQLITE_TRANSIENT);
      }else 
@@ -671,18 +626,15 @@ static void jsonReturn(
      assert( (pNode->jnFlags & JNODE_RAW)==0 );
      if( (pNode->jnFlags & JNODE_ESCAPE)==0 ){
        /* JSON formatted without any backslash-escapes */
-        assert( pNode->eU==1 );
        sqlite3_result_text(pCtx, pNode->u.zJContent+1, pNode->n-2,
                            SQLITE_TRANSIENT);
      }else{
        /* Translate JSON formatted string into raw text */
        u32 i;
        u32 n = pNode->n;
-        const char *z;
+        const char *z = pNode->u.zJContent;
        char *zOut;
        u32 j;
-        assert( pNode->eU==1 );
-        z = pNode->u.zJContent;
        zOut = sqlite3_malloc( n+1 );
        if( zOut==0 ){
          sqlite3_result_error_nomem(pCtx);
@@ -803,13 +755,12 @@ static int jsonParseAddNode(
  const char *zContent      /* Content */
 ){
  JsonNode *p;
-  if( pParse->aNode==0 || pParse->nNode>=pParse->nAlloc ){
+  if( pParse->nNode>=pParse->nAlloc ){
    return jsonParseAddNodeExpand(pParse, eType, n, zContent);
  }
  p = &pParse->aNode[pParse->nNode];
  p->eType = (u8)eType;
  p->jnFlags = 0;
-  VVA( p->eU = zContent ? 1 : 0 );
  p->n = n;
  p->u.zJContent = zContent;
  return pParse->nNode++;
@@ -877,7 +828,6 @@ static int jsonParseValue(JsonParse *pParse, u32 i){
    /* Parse array */
    iThis = jsonParseAddNode(pParse, JSON_ARRAY, 0, 0);
    if( iThis<0 ) return -1;
-    memset(&pParse->aNode[iThis].u, 0, sizeof(pParse->aNode[iThis].u));
    for(j=i+1;;j++){
      while( safe_isspace(z[j]) ){ j++; }
      if( ++pParse->iDepth > JSON_MAX_DEPTH ) return -1;
@@ -1142,7 +1092,6 @@ static JsonParse *jsonParseCached(
 ** a match.
 */
 static int jsonLabelCompare(JsonNode *pNode, const char *zKey, u32 nKey){
-  assert( pNode->eU==1 );
  if( pNode->jnFlags & JNODE_RAW ){
    if( pNode->n!=nKey ) return 0;
    return strncmp(pNode->u.zJContent, zKey, nKey)==0;
@@ -1208,7 +1157,6 @@ static JsonNode *jsonLookupStep(
        j += jsonNodeSize(&pRoot[j]);
      }
      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
-      assert( pRoot->eU==2 );
      iRoot += pRoot->u.iAppend;
      pRoot = &pParse->aNode[iRoot];
      j = 1;
@@ -1223,10 +1171,8 @@ static JsonNode *jsonLookupStep(
      if( pParse->oom ) return 0;
      if( pNode ){
        pRoot = &pParse->aNode[iRoot];
-        assert( pRoot->eU==0 );
        pRoot->u.iAppend = iStart - iRoot;
        pRoot->jnFlags |= JNODE_APPEND;
-        VVA( pRoot->eU = 2 );
        pParse->aNode[iLabel].jnFlags |= JNODE_RAW;
      }
      return pNode;
@@ -1249,7 +1195,6 @@ static JsonNode *jsonLookupStep(
            j += jsonNodeSize(&pBase[j]);
          }
          if( (pBase->jnFlags & JNODE_APPEND)==0 ) break;
-          assert( pBase->eU==2 );
          iBase += pBase->u.iAppend;
          pBase = &pParse->aNode[iBase];
          j = 1;
@@ -1283,7 +1228,6 @@ static JsonNode *jsonLookupStep(
        j += jsonNodeSize(&pRoot[j]);
      }
      if( (pRoot->jnFlags & JNODE_APPEND)==0 ) break;
-      assert( pRoot->eU==2 );
      iRoot += pRoot->u.iAppend;
      pRoot = &pParse->aNode[iRoot];
      j = 1;
@@ -1299,10 +1243,8 @@ static JsonNode *jsonLookupStep(
      if( pParse->oom ) return 0;
      if( pNode ){
        pRoot = &pParse->aNode[iRoot];
-        assert( pRoot->eU==0 );
        pRoot->u.iAppend = iStart - iRoot;
        pRoot->jnFlags |= JNODE_APPEND;
-        VVA( pRoot->eU = 2 );
      }
      return pNode;
    }
@@ -1456,13 +1398,9 @@ static void jsonParseFunc(
    }
    jsonPrintf(100, &s,"node %3u: %7s n=%-4d up=%-4d",
               i, zType, x.aNode[i].n, x.aUp[i]);
-    assert( x.aNode[i].eU==0 || x.aNode[i].eU==1 );
    if( x.aNode[i].u.zJContent!=0 ){
-      assert( x.aNode[i].eU==1 );
      jsonAppendRaw(&s, " ", 1);
      jsonAppendRaw(&s, x.aNode[i].u.zJContent, x.aNode[i].n);
-    }else{
-      assert( x.aNode[i].eU==0 );
    }
    jsonAppendRaw(&s, "\n", 1);
  }
@@ -1645,7 +1583,6 @@ static JsonNode *jsonMergePatch(
    const char *zKey;
    assert( pPatch[i].eType==JSON_STRING );
    assert( pPatch[i].jnFlags & JNODE_LABEL );
-    assert( pPatch[i].eU==1 );
    nKey = pPatch[i].n;
    zKey = pPatch[i].u.zJContent;
    assert( (pPatch[i].jnFlags & JNODE_RAW)==0 );
@@ -1662,9 +1599,6 @@ static JsonNode *jsonMergePatch(
          if( pNew==0 ) return 0;
          pTarget = &pParse->aNode[iTarget];
          if( pNew!=&pTarget[j+1] ){
-            assert( pTarget[j+1].eU==0 || pTarget[j+1].eU==1 );
-            testcase( pTarget[j+1].eU==1 );
-            VVA( pTarget[j+1].eU = 5 );
            pTarget[j+1].u.pPatch = pNew;
            pTarget[j+1].jnFlags |= JNODE_PATCH;
          }
@@ -1680,14 +1614,9 @@ static JsonNode *jsonMergePatch(
      if( pParse->oom ) return 0;
      jsonRemoveAllNulls(pPatch);
      pTarget = &pParse->aNode[iTarget];
-      assert( pParse->aNode[iRoot].eU==0 || pParse->aNode[iRoot].eU==2 );
-      testcase( pParse->aNode[iRoot].eU==2 );
      pParse->aNode[iRoot].jnFlags |= JNODE_APPEND;
-      VVA( pParse->aNode[iRoot].eU = 2 );
      pParse->aNode[iRoot].u.iAppend = iStart - iRoot;
      iRoot = iStart;
-      assert( pParse->aNode[iPatch].eU==0 );
-      VVA( pParse->aNode[iPatch].eU = 5 );
      pParse->aNode[iPatch].jnFlags |= JNODE_PATCH;
      pParse->aNode[iPatch].u.pPatch = &pPatch[i+1];
    }
@@ -1829,15 +1758,11 @@ static void jsonReplaceFunc(
    pNode = jsonLookup(&x, zPath, 0, ctx);
    if( x.nErr ) goto replace_err;
    if( pNode ){
-      assert( pNode->eU==0 || pNode->eU==1 || pNode->eU==4 );
-      json_testcase( pNode->eU!=0 && pNode->eU!=1 );
      pNode->jnFlags |= (u8)JNODE_REPLACE;
-      VVA( pNode->eU =  4 );
      pNode->u.iReplace = i + 1;
    }
  }
  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
-    assert( x.aNode[0].eU==4 );
    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
  }else{
    jsonReturnJson(x.aNode, ctx, argv);
@@ -1887,15 +1812,11 @@ static void jsonSetFunc(
    }else if( x.nErr ){
      goto jsonSetDone;
    }else if( pNode && (bApnd || bIsSet) ){
-      json_testcase( pNode->eU!=0 && pNode->eU!=1 && pNode->eU!=4 );
-      assert( pNode->eU!=3 || pNode->eU!=5 );
-      VVA( pNode->eU = 4 );
      pNode->jnFlags |= (u8)JNODE_REPLACE;
      pNode->u.iReplace = i + 1;
    }
  }
  if( x.aNode[0].jnFlags & JNODE_REPLACE ){
-    assert( x.aNode[0].eU==4 );
    sqlite3_result_value(ctx, argv[x.aNode[0].u.iReplace]);
  }else{
    jsonReturnJson(x.aNode, ctx, argv);
@@ -1973,8 +1894,8 @@ static void jsonArrayStep(
      jsonAppendChar(pStr, '[');
    }else if( pStr->nUsed>1 ){
      jsonAppendChar(pStr, ',');
+      pStr->pCtx = ctx;
    }
-    pStr->pCtx = ctx;
    jsonAppendValue(pStr, argv[0]);
  }
 }
@@ -2034,7 +1955,11 @@ static void jsonGroupInverse(
  if( NEVER(!pStr) ) return;
 #endif
  z = pStr->zBuf;
-  for(i=1; i<pStr->nUsed && ((c = z[i])!=',' || inStr || nNest); i++){
+  for(i=1; (c = z[i])!=',' || inStr || nNest; i++){
+    if( i>=pStr->nUsed ){
+      pStr->nUsed = 1;
+      return;
+    }
    if( c=='"' ){
      inStr = !inStr;
    }else if( c=='\\' ){
@@ -2044,13 +1969,8 @@ static void jsonGroupInverse(
      if( c=='}' || c==']' ) nNest--;
    }
  }
-  if( i<pStr->nUsed ){
-    pStr->nUsed -= i;
-    memmove(&z[1], &z[i+1], (size_t)pStr->nUsed-1);
-    z[pStr->nUsed] = 0;
-  }else{
-    pStr->nUsed = 1;
-  }
+  pStr->nUsed -= i;      
+  memmove(&z[1], &z[i+1], (size_t)pStr->nUsed-1);
 }
 #else
 # define jsonGroupInverse 0
@@ -2078,8 +1998,8 @@ static void jsonObjectStep(
      jsonAppendChar(pStr, '{');
    }else if( pStr->nUsed>1 ){
      jsonAppendChar(pStr, ',');
+      pStr->pCtx = ctx;
    }
-    pStr->pCtx = ctx;
    z = (const char*)sqlite3_value_text(argv[0]);
    n = (u32)sqlite3_value_bytes(argv[0]);
    jsonAppendString(pStr, z, n);
@@ -2246,9 +2166,6 @@ static int jsonEachNext(sqlite3_vtab_cursor *cur){
      JsonNode *pUp = &p->sParse.aNode[iUp];
      p->eType = pUp->eType;
      if( pUp->eType==JSON_ARRAY ){
-        assert( pUp->eU==0 || pUp->eU==3 );
-        json_testcase( pUp->eU==3 );
-        VVA( pUp->eU = 3 );
        if( iUp==p->i-1 ){
          pUp->u.iKey = 0;
        }else{
@@ -2295,15 +2212,12 @@ static void jsonEachComputePath(
  pNode = &p->sParse.aNode[i];
  pUp = &p->sParse.aNode[iUp];
  if( pUp->eType==JSON_ARRAY ){
-    assert( pUp->eU==3 || (pUp->eU==0 && pUp->u.iKey==0) );
-    testcase( pUp->eU==0 );
    jsonPrintf(30, pStr, "[%d]", pUp->u.iKey);
  }else{
    assert( pUp->eType==JSON_OBJECT );
    if( (pNode->jnFlags & JNODE_LABEL)==0 ) pNode--;
    assert( pNode->eType==JSON_STRING );
    assert( pNode->jnFlags & JNODE_LABEL );
-    assert( pNode->eU==1 );
    jsonPrintf(pNode->n+1, pStr, ".%.*s", pNode->n-2, pNode->u.zJContent+1);
  }
 }
@@ -2325,7 +2239,6 @@ static int jsonEachColumn(
        u32 iKey;
        if( p->bRecursive ){
          if( p->iRowid==0 ) break;
-          assert( p->sParse.aNode[p->sParse.aUp[p->i]].eU==3 );
          iKey = p->sParse.aNode[p->sParse.aUp[p->i]].u.iKey;
        }else{
          iKey = p->iRowid;
@@ -2375,7 +2288,6 @@ static int jsonEachColumn(
        if( p->eType==JSON_ARRAY ){
          jsonPrintf(30, &x, "[%d]", p->iRowid);
        }else if( p->eType==JSON_OBJECT ){
-          assert( pThis->eU==1 );
          jsonPrintf(pThis->n, &x, ".%.*s", pThis->n-2, pThis->u.zJContent+1);
        }
      }
@@ -2392,7 +2304,6 @@ static int jsonEachColumn(
      }
      /* For json_each() path and root are the same so fall through
      ** into the root case */
-      /* no break */ deliberate_fall_through
    }
    default: {
      const char *zRoot = p->zRoot;
@@ -2443,7 +2354,6 @@ static int jsonEachBestIndex(
    if( pConstraint->iColumn < JEACH_JSON ) continue;
    iCol = pConstraint->iColumn - JEACH_JSON;
    assert( iCol==0 || iCol==1 );
-    testcase( iCol==0 );
    iMask = 1 << iCol;
    if( pConstraint->usable==0 ){
      unusableMask |= iMask;
@@ -2541,8 +2451,6 @@ static int jsonEachFilter(
    p->iBegin = p->i = (int)(pNode - p->sParse.aNode);
    p->eType = pNode->eType;
    if( p->eType>=JSON_ARRAY ){
-      assert( pNode->eU==0 );
-      VVA( pNode->eU = 3 );
      pNode->u.iKey = 0;
      p->iEnd = p->i + pNode->n + 1;
      if( p->bRecursive ){
@@ -559,7 +559,6 @@ int sqlite3_memvfs_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  mem_vfs.pAppData = sqlite3_vfs_find(0);
-  if( mem_vfs.pAppData==0 ) return SQLITE_ERROR;
  mem_vfs.szOsFile = sizeof(MemFile);
  rc = sqlite3_vfs_register(&mem_vfs, 1);
 #ifdef MEMVFS_TEST
@@ -43,7 +43,7 @@ int sqlite3_mmap_warm(sqlite3 *db, const char *zDb){
  if( 0==sqlite3_get_autocommit(db) ) return SQLITE_MISUSE;

  /* Open a read-only transaction on the file in question */
-  zSql = sqlite3_mprintf("BEGIN; SELECT * FROM %s%q%ssqlite_schema", 
+  zSql = sqlite3_mprintf("BEGIN; SELECT * FROM %s%q%ssqlite_master", 
      (zDb ? "'" : ""), (zDb ? zDb : ""), (zDb ? "'." : "")
  );
  if( zSql==0 ) return SQLITE_NOMEM;
@@ -286,13 +286,6 @@ static const unsigned char sqlite3CtypeMap[256] = {
 #define TK_VARIABLE TK_LITERAL
 #define TK_BLOB     TK_LITERAL

-/* Disable nuisence warnings about case fall-through */
-#if !defined(deliberate_fall_through) && defined(__GCC__) && __GCC__>=7
-# define deliberate_fall_through __attribute__((fallthrough));
-#else
-# define deliberate_fall_through
-#endif
-
 /*
 ** Return the length (in bytes) of the token that begins at z[0]. 
 ** Store the token type in *tokenType before returning.
@@ -443,7 +436,6 @@ static int sqlite3GetToken(const unsigned char *z, int *tokenType){
      }
      /* If the next character is a digit, this is a floating point
      ** number that begins with ".".  Fall thru into the next case */
-      /* no break */ deliberate_fall_through
    }
    case CC_DIGIT: {
      *tokenType = TK_INTEGER;
@@ -536,7 +528,6 @@ static int sqlite3GetToken(const unsigned char *z, int *tokenType){
      }
      /* If it is not a BLOB literal, then it must be an ID, since no
      ** SQL keywords start with the letter 'x'.  Fall through */
-      /* no break */ deliberate_fall_through
    }
    case CC_ID: {
      i = 1;
@@ -248,7 +248,7 @@ static int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
          break;
        }
        case RE_OP_ANY: {
-          if( c!=0 ) re_add_state(pNext, x+1);
+          re_add_state(pNext, x+1);
          break;
        }
        case RE_OP_WORD: {
@@ -256,7 +256,7 @@ static int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
          break;
        }
        case RE_OP_NOTWORD: {
-          if( !re_word_char(c) && c!=0 ) re_add_state(pNext, x+1);
+          if( !re_word_char(c) ) re_add_state(pNext, x+1);
          break;
        }
        case RE_OP_DIGIT: {
@@ -264,7 +264,7 @@ static int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
          break;
        }
        case RE_OP_NOTDIGIT: {
-          if( !re_digit_char(c) && c!=0 ) re_add_state(pNext, x+1);
+          if( !re_digit_char(c) ) re_add_state(pNext, x+1);
          break;
        }
        case RE_OP_SPACE: {
@@ -272,7 +272,7 @@ static int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
          break;
        }
        case RE_OP_NOTSPACE: {
-          if( !re_space_char(c) && c!=0 ) re_add_state(pNext, x+1);
+          if( !re_space_char(c) ) re_add_state(pNext, x+1);
          break;
        }
        case RE_OP_BOUNDARY: {
@@ -297,11 +297,8 @@ static int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
          rc = 1;
          goto re_match_end;
        }
+        case RE_OP_CC_INC:
        case RE_OP_CC_EXC: {
-          if( c==0 ) break;
-          /* fall-through */ goto re_op_cc_inc;
-        }
-        case RE_OP_CC_INC: re_op_cc_inc: {
          int j = 1;
          int n = pRe->aArg[x];
          int hit = 0;
@@ -322,7 +319,7 @@ static int re_match(ReCompiled *pRe, const unsigned char *zIn, int nIn){
          }
          if( pRe->aOp[x]==RE_OP_CC_EXC ) hit = !hit;
          if( hit ) re_add_state(pNext, x+n);
-          break;
+          break;            
        }
      }
    }
@@ -483,7 +480,7 @@ static const char *re_subcompile_string(ReCompiled *p){
    iStart = p->nState;
    switch( c ){
      case '|':
-      case '$':
+      case '$': 
      case ')': {
        p->sIn.i--;
        return 0;
@@ -499,7 +496,7 @@ static const char *re_subcompile_string(ReCompiled *p){
        if( rePeek(p)=='*' ){
          re_append(p, RE_OP_ANYSTAR, 0);
          p->sIn.i++;
-        }else{
+        }else{ 
          re_append(p, RE_OP_ANY, 0);
        }
        break;
@@ -676,8 +673,8 @@ static const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
  ** regex engine over the string.  Do not worry able trying to match
  ** unicode characters beyond plane 0 - those are very rare and this is
  ** just an optimization. */
-  if( pRe->aOp[0]==RE_OP_ANYSTAR && !noCase ){
-    for(j=0, i=1; j<(int)sizeof(pRe->zInit)-2 && pRe->aOp[i]==RE_OP_MATCH; i++){
+  if( pRe->aOp[0]==RE_OP_ANYSTAR ){
+    for(j=0, i=1; j<sizeof(pRe->zInit)-2 && pRe->aOp[i]==RE_OP_MATCH; i++){
      unsigned x = pRe->aArg[i];
      if( x<=127 ){
        pRe->zInit[j++] = (unsigned char)x;
@@ -708,8 +705,8 @@ static const char *re_compile(ReCompiled **ppRe, const char *zIn, int noCase){
 ** is implemented as regexp(B,A).
 */
 static void re_sql_func(
-  sqlite3_context *context,
-  int argc,
+  sqlite3_context *context, 
+  int argc, 
  sqlite3_value **argv
 ){
  ReCompiled *pRe;          /* Compiled regular expression */
@@ -718,12 +715,11 @@ static void re_sql_func(
  const char *zErr;         /* Compile error message */
  int setAux = 0;           /* True to invoke sqlite3_set_auxdata() */

-  (void)argc;  /* Unused */
  pRe = sqlite3_get_auxdata(context, 0);
  if( pRe==0 ){
    zPattern = (const char*)sqlite3_value_text(argv[0]);
    if( zPattern==0 ) return;
-    zErr = re_compile(&pRe, zPattern, sqlite3_user_data(context)!=0);
+    zErr = re_compile(&pRe, zPattern, 0);
    if( zErr ){
      re_free(pRe);
      sqlite3_result_error(context, zErr, -1);
@@ -758,14 +754,7 @@ int sqlite3_regexp_init(
 ){
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
-  (void)pzErrMsg;  /* Unused */
  rc = sqlite3_create_function(db, "regexp", 2, SQLITE_UTF8|SQLITE_INNOCUOUS,
                               0, re_sql_func, 0, 0);
-  if( rc==SQLITE_OK ){
-    /* The regexpi(PATTERN,STRING) function is a case-insensitive version
-    ** of regexp(PATTERN,STRING). */
-    rc = sqlite3_create_function(db, "regexpi", 2, SQLITE_UTF8|SQLITE_INNOCUOUS,
-                                 (void*)db, re_sql_func, 0, 0);
-  }
  return rc;
 }
@@ -166,7 +166,7 @@ static void scrubBackupOpenSrc(ScrubState *p){
                      sqlite3_errmsg(p->dbSrc));
    return;
  }
-  p->rcErr = sqlite3_exec(p->dbSrc, "SELECT 1 FROM sqlite_schema; BEGIN;",
+  p->rcErr = sqlite3_exec(p->dbSrc, "SELECT 1 FROM sqlite_master; BEGIN;",
                          0, 0, 0);
  if( p->rcErr ){
    scrubBackupErr(p,
@@ -535,7 +535,7 @@ int sqlite3_scrub_backup(
  /* Copy all of the btrees */
  scrubBackupBtree(&s, 1, 0);
  pStmt = scrubBackupPrepare(&s, s.dbSrc,
-       "SELECT rootpage FROM sqlite_schema WHERE coalesce(rootpage,0)>0");
+       "SELECT rootpage FROM sqlite_master WHERE coalesce(rootpage,0)>0");
  if( pStmt==0 ) goto scrub_abort;
  while( sqlite3_step(pStmt)==SQLITE_ROW ){
    i = (u32)sqlite3_column_int(pStmt, 0);
@@ -106,10 +106,10 @@ struct series_cursor {
 */
 static int seriesConnect(
  sqlite3 *db,
-  void *pUnused,
-  int argcUnused, const char *const*argvUnused,
+  void *pAux,
+  int argc, const char *const*argv,
  sqlite3_vtab **ppVtab,
-  char **pzErrUnused
+  char **pzErr
 ){
  sqlite3_vtab *pNew;
  int rc;
@@ -120,10 +120,6 @@ static int seriesConnect(
 #define SERIES_COLUMN_STOP  2
 #define SERIES_COLUMN_STEP  3

-  (void)pUnused;
-  (void)argcUnused;
-  (void)argvUnused;
-  (void)pzErrUnused;
  rc = sqlite3_declare_vtab(db,
     "CREATE TABLE x(value,start hidden,stop hidden,step hidden)");
  if( rc==SQLITE_OK ){
@@ -146,9 +142,8 @@ static int seriesDisconnect(sqlite3_vtab *pVtab){
 /*
 ** Constructor for a new series_cursor object.
 */
-static int seriesOpen(sqlite3_vtab *pUnused, sqlite3_vtab_cursor **ppCursor){
+static int seriesOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
  series_cursor *pCur;
-  (void)pUnused;
  pCur = sqlite3_malloc( sizeof(*pCur) );
  if( pCur==0 ) return SQLITE_NOMEM;
  memset(pCur, 0, sizeof(*pCur));
@@ -247,8 +242,7 @@ static int seriesEof(sqlite3_vtab_cursor *cur){
 **    4:    step=VALUE
 **
 ** Also, if bit 8 is set, that means that the series should be output
-** in descending order rather than in ascending order.  If bit 16 is
-** set, then output must appear in ascending order.
+** in descending order rather than in ascending order.
 **
 ** This routine should initialize the cursor and position it so that it
 ** is pointing at the first row, or pointing off the end of the table
@@ -256,12 +250,11 @@ static int seriesEof(sqlite3_vtab_cursor *cur){
 */
 static int seriesFilter(
  sqlite3_vtab_cursor *pVtabCursor, 
-  int idxNum, const char *idxStrUnused,
+  int idxNum, const char *idxStr,
  int argc, sqlite3_value **argv
 ){
  series_cursor *pCur = (series_cursor *)pVtabCursor;
  int i = 0;
-  (void)idxStrUnused;
  if( idxNum & 1 ){
    pCur->mnValue = sqlite3_value_int64(argv[i++]);
  }else{
@@ -274,12 +267,7 @@ static int seriesFilter(
  }
  if( idxNum & 4 ){
    pCur->iStep = sqlite3_value_int64(argv[i++]);
-    if( pCur->iStep==0 ){
-      pCur->iStep = 1;
-    }else if( pCur->iStep<0 ){
-      pCur->iStep = -pCur->iStep;
-      if( (idxNum & 16)==0 ) idxNum |= 8;
-    }
+    if( pCur->iStep<1 ) pCur->iStep = 1;
  }else{
    pCur->iStep = 1;
  }
@@ -323,12 +311,11 @@ static int seriesFilter(
 **  (8)  output in descending order
 */
 static int seriesBestIndex(
-  sqlite3_vtab *pVTab,
+  sqlite3_vtab *tab,
  sqlite3_index_info *pIdxInfo
 ){
  int i, j;              /* Loop over constraints */
  int idxNum = 0;        /* The query plan bitmask */
-  int bStartSeen = 0;    /* EQ constraint seen on the START column */
  int unusableMask = 0;  /* Mask of unusable constraints */
  int nArg = 0;          /* Number of arguments that seriesFilter() expects */
  int aIdx[3];           /* Constraints on start, stop, and step */
@@ -338,7 +325,6 @@ static int seriesBestIndex(
  ** are the last three columns in the virtual table. */
  assert( SERIES_COLUMN_STOP == SERIES_COLUMN_START+1 );
  assert( SERIES_COLUMN_STEP == SERIES_COLUMN_START+2 );
-
  aIdx[0] = aIdx[1] = aIdx[2] = -1;
  pConstraint = pIdxInfo->aConstraint;
  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
@@ -348,7 +334,6 @@ static int seriesBestIndex(
    iCol = pConstraint->iColumn - SERIES_COLUMN_START;
    assert( iCol>=0 && iCol<=2 );
    iMask = 1 << iCol;
-    if( iCol==0 ) bStartSeen = 1;
    if( pConstraint->usable==0 ){
      unusableMask |=  iMask;
      continue;
@@ -363,18 +348,6 @@ static int seriesBestIndex(
      pIdxInfo->aConstraintUsage[j].omit = !SQLITE_SERIES_CONSTRAINT_VERIFY;
    }
  }
-  /* The current generate_column() implementation requires at least one
-  ** argument (the START value).  Legacy versions assumed START=0 if the
-  ** first argument was omitted.  Compile with -DZERO_ARGUMENT_GENERATE_SERIES
-  ** to obtain the legacy behavior */
-#ifndef ZERO_ARGUMENT_GENERATE_SERIES
-  if( !bStartSeen ){
-    sqlite3_free(pVTab->zErrMsg);
-    pVTab->zErrMsg = sqlite3_mprintf(
-        "first argument to \"generate_series()\" missing or unusable");
-    return SQLITE_ERROR;
-  }
-#endif
  if( (unusableMask & ~idxNum)!=0 ){
    /* The start, stop, and step columns are inputs.  Therefore if there
    ** are unusable constraints on any of start, stop, or step then
@@ -387,11 +360,7 @@ static int seriesBestIndex(
    pIdxInfo->estimatedCost = (double)(2 - ((idxNum&4)!=0));
    pIdxInfo->estimatedRows = 1000;
    if( pIdxInfo->nOrderBy==1 ){
-      if( pIdxInfo->aOrderBy[0].desc ){
-        idxNum |= 8;
-      }else{
-        idxNum |= 16;
-      }
+      if( pIdxInfo->aOrderBy[0].desc ) idxNum |= 8;
      pIdxInfo->orderByConsumed = 1;
    }
  }else{
@@ -429,10 +398,6 @@ static sqlite3_module seriesModule = {
  0,                         /* xRollback */
  0,                         /* xFindMethod */
  0,                         /* xRename */
-  0,                         /* xSavepoint */
-  0,                         /* xRelease */
-  0,                         /* xRollbackTo */
-  0                          /* xShadowName */
 };

 #endif /* SQLITE_OMIT_VIRTUALTABLE */
@@ -448,7 +413,7 @@ int sqlite3_series_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
 #ifndef SQLITE_OMIT_VIRTUALTABLE
-  if( sqlite3_libversion_number()<3008012 && pzErrMsg!=0 ){
+  if( sqlite3_libversion_number()<3008012 ){
    *pzErrMsg = sqlite3_mprintf(
        "generate_series() requires SQLite 3.8.12 or later");
    return SQLITE_ERROR;
@@ -31,10 +31,7 @@ SQLITE_EXTENSION_INIT1
 #include <assert.h>
 #include <string.h>
 #include <stdarg.h>
-
-#ifndef SQLITE_AMALGAMATION
 typedef sqlite3_uint64 u64;
-#endif /* SQLITE_AMALGAMATION */

 /******************************************************************************
 ** The Hash Engine
@@ -624,11 +621,9 @@ static void sha3QueryFunc(
    }
    nCol = sqlite3_column_count(pStmt);
    z = sqlite3_sql(pStmt);
-    if( z ){
-      n = (int)strlen(z);
-      hash_step_vformat(&cx,"S%d:",n);
-      SHA3Update(&cx,(unsigned char*)z,n);
-    }
+    n = (int)strlen(z);
+    hash_step_vformat(&cx,"S%d:",n);
+    SHA3Update(&cx,(unsigned char*)z,n);

    /* Compute a hash over the result of the query */
    while( SQLITE_ROW==sqlite3_step(pStmt) ){
@@ -754,7 +754,6 @@ static int vlogCurrentTimeInt64(sqlite3_vfs *pVfs, sqlite3_int64 *p){
 */
 int sqlite3_register_vfslog(const char *zArg){
  vlog_vfs.pVfs = sqlite3_vfs_find(0);
-  if( vlog_vfs.pVfs==0 ) return SQLITE_ERROR;
  vlog_vfs.base.szOsFile = sizeof(VLogFile) + vlog_vfs.pVfs->szOsFile;
  return sqlite3_vfs_register(&vlog_vfs.base, 1);
 }
@@ -806,7 +806,6 @@ int sqlite3_vfsstat_init(
  int rc = SQLITE_OK;
  SQLITE_EXTENSION_INIT2(pApi);
  vstat_vfs.pVfs = sqlite3_vfs_find(0);
-  if( vstat_vfs.pVfs==0 ) return SQLITE_ERROR;
  vstat_vfs.base.szOsFile = sizeof(VStatFile) + vstat_vfs.pVfs->szOsFile;
  rc = sqlite3_vfs_register(&vstat_vfs.base, 1);
  if( rc==SQLITE_OK ){
@@ -220,7 +220,7 @@ static int wholenumberBestIndex(
    pIdxInfo->orderByConsumed = 1;
  }
  if( (idxNum & 12)==0 ){
-    pIdxInfo->estimatedCost = 1e99;
+    pIdxInfo->estimatedCost = (double)100000000;
  }else if( (idxNum & 3)==0 ){
    pIdxInfo->estimatedCost = (double)5;
  }else{
@@ -36,30 +36,13 @@ SQLITE_EXTENSION_INIT1

 #ifndef SQLITE_AMALGAMATION

-#ifndef UINT32_TYPE
-# ifdef HAVE_UINT32_T
-#  define UINT32_TYPE uint32_t
-# else
-#  define UINT32_TYPE unsigned int
-# endif
-#endif
-#ifndef UINT16_TYPE
-# ifdef HAVE_UINT16_T
-#  define UINT16_TYPE uint16_t
-# else
-#  define UINT16_TYPE unsigned short int
-# endif
-#endif
 typedef sqlite3_int64 i64;
 typedef unsigned char u8;
-typedef UINT32_TYPE u32;           /* 4-byte unsigned integer */
-typedef UINT16_TYPE u16;           /* 2-byte unsigned integer */
+typedef unsigned short u16;
+typedef unsigned long u32;
 #define MIN(a,b) ((a)<(b) ? (a) : (b))

 #if defined(SQLITE_COVERAGE_TEST) || defined(SQLITE_MUTATION_TEST)
-# define SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS 1
-#endif
-#if defined(SQLITE_OMIT_AUXILIARY_SAFETY_CHECKS)
 # define ALWAYS(X)      (1)
 # define NEVER(X)       (0)
 #elif !defined(NDEBUG)
@@ -540,16 +523,14 @@ static int zipfileAppendData(
  const u8 *aWrite,
  int nWrite
 ){
-  if( nWrite>0 ){
-    size_t n = nWrite;
-    fseek(pTab->pWriteFd, (long)pTab->szCurrent, SEEK_SET);
-    n = fwrite(aWrite, 1, nWrite, pTab->pWriteFd);
-    if( (int)n!=nWrite ){
-      pTab->base.zErrMsg = sqlite3_mprintf("error in fwrite()");
-      return SQLITE_ERROR;
-    }
-    pTab->szCurrent += nWrite;
+  size_t n;
+  fseek(pTab->pWriteFd, (long)pTab->szCurrent, SEEK_SET);
+  n = fwrite(aWrite, 1, nWrite, pTab->pWriteFd);
+  if( (int)n!=nWrite ){
+    pTab->base.zErrMsg = sqlite3_mprintf("error in fwrite()");
+    return SQLITE_ERROR;
  }
+  pTab->szCurrent += nWrite;
  return SQLITE_OK;
 }

@@ -564,7 +545,6 @@ static u16 zipfileGetU16(const u8 *aBuf){
 ** Read and return a 32-bit little-endian unsigned integer from buffer aBuf.
 */
 static u32 zipfileGetU32(const u8 *aBuf){
-  if( aBuf==0 ) return 0;
  return ((u32)(aBuf[3]) << 24)
       + ((u32)(aBuf[2]) << 16)
       + ((u32)(aBuf[1]) <<  8)
@@ -724,24 +704,34 @@ static int zipfileScanExtra(u8 *aExtra, int nExtra, u32 *pmTime){
 ** https://msdn.microsoft.com/en-us/library/9kkf9tah.aspx
 */
 static u32 zipfileMtime(ZipfileCDS *pCDS){
-  int Y,M,D,X1,X2,A,B,sec,min,hr;
-  i64 JDsec;
-  Y = (1980 + ((pCDS->mDate >> 9) & 0x7F));
-  M = ((pCDS->mDate >> 5) & 0x0F);
-  D = (pCDS->mDate & 0x1F);
-  sec = (pCDS->mTime & 0x1F)*2;
-  min = (pCDS->mTime >> 5) & 0x3F;
-  hr = (pCDS->mTime >> 11) & 0x1F;
-  if( M<=2 ){
-    Y--;
-    M += 12;
+  int Y = (1980 + ((pCDS->mDate >> 9) & 0x7F));
+  int M = ((pCDS->mDate >> 5) & 0x0F);
+  int D = (pCDS->mDate & 0x1F);
+  int B = -13;
+
+  int sec = (pCDS->mTime & 0x1F)*2;
+  int min = (pCDS->mTime >> 5) & 0x3F;
+  int hr = (pCDS->mTime >> 11) & 0x1F;
+  i64 JD;
+
+  /* JD = INT(365.25 * (Y+4716)) + INT(30.6001 * (M+1)) + D + B - 1524.5 */
+
+  /* Calculate the JD in seconds for noon on the day in question */
+  if( M<3 ){
+    Y = Y-1;
+    M = M+12;
  }
-  X1 = 36525*(Y+4716)/100;
-  X2 = 306001*(M+1)/10000;
-  A = Y/100;
-  B = 2 - A + (A/4);
-  JDsec = (i64)((X1 + X2 + D + B - 1524.5)*86400) + hr*3600 + min*60 + sec;
-  return (u32)(JDsec - (i64)24405875*(i64)8640);
+  JD = (i64)(24*60*60) * (
+      (int)(365.25 * (Y + 4716))
+    + (int)(30.6001 * (M + 1))
+    + D + B - 1524
+  );
+
+  /* Correct the JD for the time within the day */
+  JD += (hr-12) * 3600 + min * 60 + sec;
+
+  /* Convert JD to unix timestamp (the JD epoch is 2440587.5) */
+  return (u32)(JD - (i64)(24405875) * 24*60*6);
 }

 /*
@@ -867,7 +857,7 @@ static int zipfileGetEntry(
        aRead = (u8*)&aBlob[pNew->cds.iOffset];
      }

-      if( rc==SQLITE_OK ) rc = zipfileReadLFH(aRead, &lfh);
+      rc = zipfileReadLFH(aRead, &lfh);
      if( rc==SQLITE_OK ){
        pNew->iDataOff =  pNew->cds.iOffset + ZIPFILE_LFH_FIXED_SZ;
        pNew->iDataOff += lfh.nFile + lfh.nExtra;
@@ -1143,13 +1133,13 @@ static int zipfileReadEOCD(
  int nRead;                      /* Bytes to read from file */
  int rc = SQLITE_OK;

-  memset(pEOCD, 0, sizeof(ZipfileEOCD));
  if( aBlob==0 ){
    i64 iOff;                     /* Offset to read from */
    i64 szFile;                   /* Total size of file in bytes */
    fseek(pFile, 0, SEEK_END);
    szFile = (i64)ftell(pFile);
    if( szFile==0 ){
+      memset(pEOCD, 0, sizeof(ZipfileEOCD));
      return SQLITE_OK;
    }
    nRead = (int)(MIN(szFile, ZIPFILE_BUFFER_SIZE));
@@ -1490,7 +1480,6 @@ static int zipfileBegin(sqlite3_vtab *pVtab){
 static u32 zipfileTime(void){
  sqlite3_vfs *pVfs = sqlite3_vfs_find(0);
  u32 ret;
-  if( pVfs==0 ) return 0;
  if( pVfs->iVersion>=2 && pVfs->xCurrentTimeInt64 ){
    i64 ms;
    pVfs->xCurrentTimeInt64(pVfs, &ms);
@@ -2179,10 +2168,6 @@ static int zipfileRegister(sqlite3 *db){
        zipfileStep, zipfileFinal
    );
  }
-  assert( sizeof(i64)==8 );
-  assert( sizeof(u32)==4 );
-  assert( sizeof(u16)==2 );
-  assert( sizeof(u8)==1 );
  return rc;
 }
 #else         /* SQLITE_OMIT_VIRTUALTABLE */
@@ -56,7 +56,7 @@ void usage(const char *zArgv0){

 void report_default_vfs(){
  sqlite3_vfs *pVfs = sqlite3_vfs_find(0);
-  fprintf(stdout, "default vfs is \"%s\"\n", pVfs ? pVfs->zName : "NULL");
+  fprintf(stdout, "default vfs is \"%s\"\n", pVfs->zName);
 }

 void report_rbu_vfs(sqlite3rbu *pRbu){
@@ -183,13 +183,6 @@ int main(int argc, char **argv){
      break;
  }

-  if( nStatStep>0 ){
-    sqlite3_int64 nUsed;
-    sqlite3_int64 nHighwater;
-    sqlite3_status64(SQLITE_STATUS_MEMORY_USED, &nUsed, &nHighwater, 0);
-    fprintf(stdout, "memory used=%lld highwater=%lld\n", nUsed, nHighwater);
-  }
-
  sqlite3_free(zErrmsg);
  return (rc==SQLITE_OK || rc==SQLITE_DONE) ? 0 : 1;
 }
@@ -132,11 +132,6 @@ foreach {tn3 create_vfs destroy_vfs} {
  } {
    sqlite3rbu_destroy_vfs myrbu
  }
-  3 {
-    sqlite3_register_cksumvfs
-  } {
-    sqlite3_unregister_cksumvfs
-  }
 } {

  eval $create_vfs
@@ -50,7 +50,7 @@ do_test 1.1 {
 #
 ifcapable fts3 {
  do_execsql_test 2.0 {
-    create virtual TABLE ft USING fts4(a, b, languageid='langid');
+    CREATE VIRTUAL TABLE ft USING fts4(a, b, languageid='langid');
  }
  do_test 2.1 {
    apply_rbu {
@@ -268,14 +268,6 @@ tablE t1 USING FTs5(c);
      DELETE FROM t1 WHERE rowid = 1;
      INSERT INTO t1 VALUES('a b c');
    }
-    4 {
-      creAte virTUal tablE	t1	USING FTs5(c);
-      INSERT INTO t1 VALUES('a b c');
-      INSERT INTO t1 VALUES('a b c');
-    } {
-      DELETE FROM t1 WHERE rowid = 1;
-      INSERT INTO t1 VALUES('a b c');
-    }

  } {
    forcedelete test.db test.db2
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .37.0
 .33.0