Version 3.44.4

FossilOrigin-Name: f1e31fd9961ac82535a5d0702b127d84de8ca21d4df1c51c73e078ea0ad4afa8
Cherry pick recent fixes into branch-3.44.
2025-02-19 00:18:53 +00:00 · 2025-02-18 18:05:16 +00:00 · 2024-04-12 15:15:05 +00:00 · 2024-04-09 14:08:39 +00:00 · 2024-04-05 14:13:43 +00:00 · 2024-04-05 11:28:30 +00:00
573 changed files with 13514 additions and 42397 deletions
@@ -83,13 +83,9 @@ TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@
 # based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*).
 # The same set of OMIT and ENABLE flags should be passed to the
 # LEMON parser generator and the mkkeywordhash tool as well.
-#
-# Add OPTIONS=... on the command line to append additional options
-# to the OPT_FEATURE_FLAGS.
-#
-OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS)
+OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@

-TCC += $(OPT_FEATURE_FLAGS) 
+TCC += $(OPT_FEATURE_FLAGS)

 # Add in any optional parameters specified on the make commane line
 # ie.  make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1".
@@ -121,15 +117,14 @@ HAVE_TCL = @HAVE_TCL@
 #
 TCLSH_CMD = @TCLSH_CMD@

-# Additional options when running tests using testrunner.tcl
-# This is usually either blank, or else --status
-#
-TSTRNNR_OPTS = @TSTRNNR_OPTS@
-
 # Where do we want to install the tcl plugin
 #
 TCLLIBDIR = @TCLLIBDIR@

+# The suffix used on shared libraries.  Ex:  ".dll", ".so", ".dylib"
+#
+SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@
+
 # If gcov support was enabled by the configure script, add the appropriate
 # flags here.  It's not always as easy as just having the user add the right
 # CFLAGS / LDFLAGS, because libtool wants to use CFLAGS when linking, which
@@ -423,8 +418,6 @@ TESTSRC = \
  $(TOP)/ext/recover/sqlite3recover.c \
  $(TOP)/ext/recover/dbdata.c \
  $(TOP)/ext/recover/test_recover.c \
-  $(TOP)/ext/intck/test_intck.c  \
-  $(TOP)/ext/intck/sqlite3intck.c \
  $(TOP)/ext/rbu/test_rbu.c

 # Statically linked extensions
@@ -454,12 +447,10 @@ TESTSRC += \
  $(TOP)/ext/misc/percentile.c \
  $(TOP)/ext/misc/prefixes.c \
  $(TOP)/ext/misc/qpvtab.c \
-  $(TOP)/ext/misc/randomjson.c \
  $(TOP)/ext/misc/regexp.c \
  $(TOP)/ext/misc/remember.c \
  $(TOP)/ext/misc/series.c \
  $(TOP)/ext/misc/spellfix.c \
-  $(TOP)/ext/misc/stmtrand.c \
  $(TOP)/ext/misc/totype.c \
  $(TOP)/ext/misc/unionvtab.c \
  $(TOP)/ext/misc/wholenumber.c \
@@ -609,7 +600,6 @@ 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_STRICT_SUBTYPE=1
 FUZZERSHELL_OPT =
 FUZZCHECK_OPT += -I$(TOP)/test
 FUZZCHECK_OPT += -I$(TOP)/ext/recover
@@ -640,9 +630,7 @@ FUZZCHECK_OPT += \
  -DSQLITE_MAX_MMAP_SIZE=0 \
  -DSQLITE_OMIT_LOAD_EXTENSION \
  -DSQLITE_PRINTF_PRECISION_LIMIT=1000 \
-  -DSQLITE_PRIVATE="" \
-  -DSQLITE_STRICT_SUBTYPE=1 \
-  -DSQLITE_STATIC_RANDOMJSON
+  -DSQLITE_PRIVATE=""

 FUZZCHECK_SRC += $(TOP)/test/fuzzcheck.c
 FUZZCHECK_SRC += $(TOP)/test/ossfuzz.c
@@ -650,8 +638,6 @@ FUZZCHECK_SRC += $(TOP)/test/fuzzinvariants.c
 FUZZCHECK_SRC += $(TOP)/ext/recover/dbdata.c
 FUZZCHECK_SRC += $(TOP)/ext/recover/sqlite3recover.c
 FUZZCHECK_SRC += $(TOP)/test/vt02.c
-FUZZCHECK_SRC += $(TOP)/ext/misc/percentile.c
-FUZZCHECK_SRC += $(TOP)/ext/misc/randomjson.c
 DBFUZZ_OPT =
 ST_OPT = -DSQLITE_OS_KV_OPTIONAL

@@ -661,16 +647,11 @@ SQLITE3_SHELL_TARGET_  = sqlite3$(TEXE)
 SQLITE3_SHELL_TARGET_1 =
 SQLITE3_SHELL_TARGET   = $(SQLITE3_SHELL_TARGET_@HAVE_WASI_SDK@)

-# Use $(libtclsqlite3.la_$(HAVE_TCL)) to resolve to either
-# libtclsqlite3.la or an empty value.
-libtclsqlite3.la_0 =
-libtclsqlite3.la_1 = libtclsqlite3.la
-
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
 all:	sqlite3.h libsqlite3.la $(SQLITE3_SHELL_TARGET) \
-  $(libtclsqlite3.la_$(HAVE_TCL))
+  $(HAVE_TCL:1=libtclsqlite3.la)

 Makefile: $(TOP)/Makefile.in
 	./config.status
@@ -700,20 +681,6 @@ sqldiff$(TEXE):	$(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
 dbhash$(TEXE):	$(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
 	$(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)

-RSYNC_SRC = \
-  $(TOP)/tool/sqlite3-rsync.c \
-  sqlite3.c
-
-RSYNC_OPT = \
-  -DSQLITE_ENABLE_DBPAGE_VTAB \
-  -USQLITE_THREADSAFE \
-  -DSQLITE_THREADSAFE=0 \
-  -DSQLITE_OMIT_LOAD_EXTENSION \
-  -DSQLITE_OMIT_DEPRECATED
-
-sqlite3-rsync$(TEXE):	$(RSYNC_SRC)
-	$(TCC) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(TLIBS)
-
 scrub$(TEXE):	$(TOP)/ext/misc/scrub.c sqlite3.lo
 	$(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
 		$(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
@@ -743,21 +710,6 @@ fuzzcheck-asan$(TEXE):	$(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP)
 fuzzcheck-ubsan$(TEXE):	$(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP)
 	$(LTLINK) -o $@ -fsanitize=undefined $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) sqlite3.c $(TLIBS)

-# Usage:    FUZZDB=filename make run-fuzzcheck
-#
-# Where filename is a fuzzcheck database, this target builds and runs
-# fuzzcheck, fuzzcheck-asan, and fuzzcheck-ubsan on that database.
-#
-# FUZZDB can be a glob pattern of two or more databases. Example:
-#
-#     FUZZDB=test/fuzzdata*.db make run-fuzzcheck
-#
-run-fuzzcheck:	fuzzcheck$(TEXE) fuzzcheck-asan$(TEXE) fuzzcheck-ubsan$(TEXE)
-	@if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi
-	./fuzzcheck$(TEXE) --spinner $(FUZZDB)
-	./fuzzcheck-asan$(TEXE) --spinner $(FUZZDB)
-	./fuzzcheck-ubsan$(TEXE) --spinner $(FUZZDB)
-
 ossshell$(TEXE):	$(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h
 	$(LTLINK) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/ossshell.c \
             $(TOP)/test/ossfuzz.c sqlite3.c $(TLIBS)
@@ -825,10 +777,6 @@ has_tclsh85:
 	sh $(TOP)/tool/cktclsh.sh 8.5 $(TCLSH_CMD)
 	touch has_tclsh85

-has_tclconfig:
-	@ if test x"$(HAVE_TCL)" != "x1"; then	echo 'ERROR: Requires access to "tclConfig.sh" which "configure" was not able to locate'; exit 1; fi
-	touch has_tclconfig
-

 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
@@ -847,7 +795,7 @@ has_tclconfig:
 	touch .target_source

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

@@ -858,7 +806,7 @@ sqlite3r.c: sqlite3.c sqlite3r.h has_tclsh84
 	cp $(TOP)/ext/recover/sqlite3recover.c tsrc/
 	cp $(TOP)/ext/recover/sqlite3recover.h tsrc/
 	cp $(TOP)/ext/recover/dbdata.c tsrc/
-	$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS) $(EXTRA_SRC)
+	$(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_LINE_MACROS)

 sqlite3ext.h:	.target_source
 	cp tsrc/sqlite3ext.h .
@@ -1151,7 +1099,7 @@ tclsqlite-shell.lo:	$(TOP)/src/tclsqlite.c $(HDR)
 tclsqlite-stubs.lo:	$(TOP)/src/tclsqlite.c $(HDR)
 	$(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c

-tclsqlite3$(TEXE):	has_tclconfig tclsqlite-shell.lo libsqlite3.la
+tclsqlite3$(TEXE):	tclsqlite-shell.lo libsqlite3.la
 	$(LTLINK) -o $@ tclsqlite-shell.lo \
 		 libsqlite3.la $(LIBTCL)

@@ -1184,40 +1132,35 @@ keywordhash.h:	$(TOP)/tool/mkkeywordhash.c
 	$(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
 	./mkkeywordhash$(BEXE) >keywordhash.h

-# Source and header files that shell.c depends on
-SHELL_DEP = \
-    $(TOP)/src/shell.c.in \
-    $(TOP)/ext/consio/console_io.c \
-    $(TOP)/ext/consio/console_io.h \
-    $(TOP)/ext/expert/sqlite3expert.c \
-    $(TOP)/ext/expert/sqlite3expert.h \
-    $(TOP)/ext/intck/sqlite3intck.c \
-    $(TOP)/ext/intck/sqlite3intck.h \
-    $(TOP)/ext/misc/appendvfs.c \
-    $(TOP)/ext/misc/base64.c \
-    $(TOP)/ext/misc/base85.c \
-    $(TOP)/ext/misc/completion.c \
-    $(TOP)/ext/misc/decimal.c \
-    $(TOP)/ext/misc/fileio.c \
-    $(TOP)/ext/misc/ieee754.c \
-    $(TOP)/ext/misc/memtrace.c \
-    $(TOP)/ext/misc/pcachetrace.c \
-    $(TOP)/ext/misc/percentile.c \
-    $(TOP)/ext/misc/regexp.c \
-    $(TOP)/ext/misc/series.c \
-    $(TOP)/ext/misc/sha1.c \
-    $(TOP)/ext/misc/shathree.c \
-    $(TOP)/ext/misc/sqlar.c \
-    $(TOP)/ext/misc/uint.c \
-    $(TOP)/ext/misc/vfstrace.c \
-    $(TOP)/ext/misc/zipfile.c \
-    $(TOP)/ext/recover/dbdata.c \
-    $(TOP)/ext/recover/sqlite3recover.c \
-    $(TOP)/ext/recover/sqlite3recover.h \
-    $(TOP)/src/test_windirent.c \
-    $(TOP)/src/test_windirent.h
+# Source files that go into making shell.c
+SHELL_SRC = \
+	$(TOP)/src/shell.c.in \
+        $(TOP)/ext/misc/appendvfs.c \
+	$(TOP)/ext/misc/completion.c \
+        $(TOP)/ext/consio/console_io.c \
+        $(TOP)/ext/consio/console_io.h \
+        $(TOP)/ext/misc/decimal.c \
+        $(TOP)/ext/misc/basexx.c \
+        $(TOP)/ext/misc/base64.c \
+        $(TOP)/ext/misc/base85.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/sqlar.c \
+        $(TOP)/ext/misc/uint.c \
+	$(TOP)/ext/expert/sqlite3expert.c \
+	$(TOP)/ext/expert/sqlite3expert.h \
+	$(TOP)/ext/misc/zipfile.c \
+	$(TOP)/ext/misc/memtrace.c \
+	$(TOP)/ext/misc/pcachetrace.c \
+	$(TOP)/ext/recover/dbdata.c \
+	$(TOP)/ext/recover/sqlite3recover.c \
+	$(TOP)/ext/recover/sqlite3recover.h \
+        $(TOP)/src/test_windirent.c

-shell.c:	$(SHELL_DEP) $(TOP)/tool/mkshellc.tcl has_tclsh84
+shell.c:	$(SHELL_SRC) $(TOP)/tool/mkshellc.tcl has_tclsh84
 	$(TCLSH_CMD) $(TOP)/tool/mkshellc.tcl >shell.c


@@ -1333,21 +1276,19 @@ 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_STATIC_RANDOMJSON
-TESTFIXTURE_FLAGS += -DSQLITE_STRICT_SUBTYPE=1

 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 TESTFIXTURE_SRC1 = sqlite3.c
 TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
 TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))

-testfixture$(TEXE):	has_tclconfig has_tclsh85 $(TESTFIXTURE_SRC)
+testfixture$(TEXE):	has_tclsh85 $(TESTFIXTURE_SRC)
 	$(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
 		-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)

-coretestprogs:	testfixture$(BEXE) sqlite3$(BEXE)
+coretestprogs:	$(TESTPROGS)

-testprogs:	$(TESTPROGS) srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)
+testprogs:	coretestprogs srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)

 # A very detailed test running most or all test cases
 fulltest:	alltest fuzztest
@@ -1390,20 +1331,15 @@ tcltest:	./testfixture$(TEXE)
 testrunner:	testfixture$(TEXE)
 	./testfixture$(TEXE) $(TOP)/test/testrunner.tcl

-# This is the testing target preferred by the core SQLite developers.
-# It runs tests under a standard configuration, regardless of how
-# ./configure was run.  The devs run "make devtest" prior to each
-# check-in, at a minimum.  Probably other tests too, but at least this
-# one.
+# Runs both fuzztest and testrunner, consecutively.
 #
-devtest:	srctree-check sourcetest
-	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest $(TSTRNNR_OPTS)
+devtest:	srctree-check testfixture$(TEXE) fuzztest testrunner

 mdevtest: srctree-check has_tclsh85
-	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest $(TSTRNNR_OPTS)
+	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest

 sdevtest: has_tclsh85
-	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl sdevtest $(TSTRNNR_OPTS)
+	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl sdevtest

 # Validate that various generated files in the source tree
 # are up-to-date.
@@ -1413,19 +1349,16 @@ srctree-check:	$(TOP)/tool/srctree-check.tcl

 # Testing for a release
 #
-releasetest: srctree-check has_tclsh85 verify-source
-	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl release $(TSTRNNR_OPTS)
+releasetest: srctree-check testfixture$(TEXE)
+	./testfixture$(TEXE) $(TOP)/test/testrunner.tcl release

 # Minimal testing that runs in less than 3 minutes
 #
 quicktest:	./testfixture$(TEXE)
 	./testfixture$(TEXE) $(TOP)/test/extraquick.test $(TESTOPTS)

-# Try to run tests on whatever options are specified by the
-# ./configure.  The developers seldom use this target.  Instead
-# they use "make devtest" which runs tests on a standard set of
-# options regardless of how SQLite is configured.  This "test"
-# target is provided for legacy only.
+# This is the common case.  Run many tests that do not take too long,
+# including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
 #
 test:	srctree-check fuzztest sourcetest $(TESTPROGS) tcltest

@@ -1442,19 +1375,19 @@ valgrindtest:	$(TESTPROGS) valgrindfuzz
 smoketest:	$(TESTPROGS) fuzzcheck$(TEXE)
 	./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)

-shelltest:
-	$(TCLSH_CMD) $(TOP)/test/testrunner.tcl release shell
+shelltest: $(TESTPROGS)
+	./testfixture$(TEXT) $(TOP)/test/permutations.test shell

 sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in has_tclsh85
 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c

-sqlite3_analyzer$(TEXE): has_tclconfig sqlite3_analyzer.c
+sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
 	$(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)

 sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in has_tclsh85
 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c

-sqltclsh$(TEXE): has_tclconfig sqltclsh.c
+sqltclsh$(TEXE): sqltclsh.c
 	$(LTLINK) sqltclsh.c -o $@ $(LIBTCL) $(TLIBS)

 sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c $(TOP)/ext/expert/expert.c sqlite3.c
@@ -1473,7 +1406,7 @@ CHECKER_DEPS =\
 sqlite3_checker.c:	$(CHECKER_DEPS) has_tclsh85
 	$(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@

-sqlite3_checker$(TEXE):	has_tclconfig sqlite3_checker.c
+sqlite3_checker$(TEXE):	sqlite3_checker.c
 	$(LTLINK) sqlite3_checker.c -o $@ $(LIBTCL) $(TLIBS)

 dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.lo
@@ -1587,12 +1520,7 @@ lib_install:	libsqlite3.la
 	$(INSTALL) -d $(DESTDIR)$(libdir)
 	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)

-# Use $(tcl_install_$(HAVE_TCL)) to resolve to either tcl_install or
-# an empty value.
-tcl_install_0 =
-tcl_install_1 = tcl_install
-
-install:	sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc $(tcl_install_$(HAVE_TCL))
+install:	sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
 	$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(LTINSTALL) sqlite3$(TEXE) $(DESTDIR)$(bindir)
 	$(INSTALL) -d $(DESTDIR)$(includedir)
@@ -1603,71 +1531,49 @@ install:	sqlite3$(TEXE) lib_install sqlite3.h sqlite3.pc $(tcl_install_$(HAVE_TC

 pkgIndex.tcl:
 	echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@
-
 tcl_install:	lib_install libtclsqlite3.la pkgIndex.tcl
 	$(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
 	$(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
 	rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
 	$(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)

-# Build the SQLite TCL extension in a way that make it compatible
-# with whatever version of TCL is running as $TCLSH_CMD, possibly defined
-# by --with-tclsh=
-#
-tclextension:	tclsqlite3.c
-	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --build-only --cc $(CC) $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
-
-# Install the SQLite TCL extension in a way that is appropriate for $TCLSH_CMD
-# to find it.
-#
-tclextension-install:	tclsqlite3.c
-	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --cc $(CC) $(CFLAGS) $(OPT_FEATURE_FLAGS) $(OPTS)
-
-# Install the SQLite TCL extension that is used by $TCLSH_CMD
-#
-tclextension-uninstall: 
-	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --uninstall
-
-# List all installed the SQLite TCL extension that is are accessible
-# by $TCLSH_CMD, included prior versions.
-#
-tclextension-list: 
-	$(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --info
-
-
-# Remove build products sufficient so that subsequent makes will recompile
-# everything from scratch.  Do not remove:
-#
-#   *   test results and test logs
-#   *   output from ./configure
-#
-tidy:
-	rm -f *.lo *.la *.o *.c *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE)
-	rm -f fts5.h keywordhash.h opcodes.h sqlite3.h sqlite3ext.h sqlite3session.h
-	rm -rf .libs .deps tsrc .target_source
-	rm -f lemon$(BEXE) sqlite*.tar.gz
-	rm -f mkkeywordhash$(BEXE) mksourceid$(BEXE)
-	rm -f parse.* fts5parse.*
-	rm -f tclsqlite3$(TEXE) $(TESTPROGS)
+clean:
+	rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
+	rm -f sqlite3.h opcodes.*
+	rm -rf .libs .deps
+	rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
+	rm -f mkkeywordhash$(BEXE) keywordhash.h
+	rm -f mksourceid$(BEXE)
+	rm -f *.da *.bb *.bbg gmon.out
+	rm -rf tsrc .target_source
+	rm -f tclsqlite3$(TEXE)
+	rm -f testfixture$(TEXE) test.db
 	rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
 	rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
-	rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE)
-	rm -f *.dll *.lib *.exp *.def *.pc *.vsix *.so *.dylib pkgIndex.tcl
-	rm -f sqlite3_analyzer$(TEXE) sqlite3-rsync$(TEXE)
-	rm -f mptester$(TEXE) rbu$(TEXE)	srcck1$(TEXE)
-	rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
-	rm -f threadtest5$(TEXE)
-	rm -f src-verify has_tclsh*
+	rm -f wordcount$(TEXE) changeset$(TEXE)
+	rm -f version-info$(TEXT)
+	rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
+	rm -f sqlite3.c
+	rm -f sqlite3rc.h
+	rm -f shell.c sqlite3ext.h
+	rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
+	rm -f sqlite-*-output.vsix
+	rm -f mptester mptester.exe
+	rm -f rbu rbu.exe
+	rm -f srcck1 srcck1.exe
+	rm -f fuzzershell fuzzershell.exe
+	rm -f fuzzcheck fuzzcheck.exe
+	rm -f sqldiff sqldiff.exe
+	rm -f dbhash dbhash.exe
+	rm -f fts5.* fts5parse.*
+	rm -f threadtest5
+	rm -f src-verify
+	rm -f custom.rws
+	rm -f has_tclsh84 has_tclsh85

-# Removes build products and test logs.  Retains ./configure outputs.
-#
-clean:	tidy
-	rm -rf omittest* testrunner* testdir*
-
-# Clean up everything.  No exceptions.
-#
 distclean:	clean
-	rm -f sqlite_cfg.h config.log config.status Makefile $(LIBTOOL)
+	rm -f sqlite_cfg.h config.log config.status libtool Makefile sqlite3.pc \
+		$(TESTPROGS)

 #
 # Windows section
@@ -18,13 +18,6 @@ USE_AMALGAMATION = 1
 !ENDIF
 # <</mark>>

-# Optionally set EXTRA_SRC to a list of C files to append to
-# the generated sqlite3.c.
-#
-!IFNDEF EXTRA_SRC
-EXTRA_SRC =
-!ENDIF
-
 # Set this non-0 to enable full warnings (-W4, etc) when compiling.
 #
 !IFNDEF USE_FULLWARN
@@ -379,7 +372,6 @@ SQLITE_TCL_DEP =
 # the Windows platform.
 #
 !IFNDEF OPT_FEATURE_FLAGS
-OPT_FEATURE_FLAGS = $(OPT_XTRA)
 !IF $(MINIMAL_AMALGAMATION)==0
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5=1
@@ -393,14 +385,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF

-# Additional feature-options above and beyond what are normally used can be
-# be added using OPTIONS=.... on the command-line.  These values are
-# appended to the OPT_FEATURE_FLAGS variable.
-#
-!IFDEF OPTIONS
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) $(OPTIONS)
-!ENDIF
-
 # Should the session extension be enabled?  If so, add compilation options
 # to enable it.
 #
@@ -938,7 +922,7 @@ TCLSUFFIX =
 !ENDIF

 !IFNDEF TCLDIR
-TCLDIR = C:\Tcl
+TCLDIR = $(TOP)\compat\tcl
 !ENDIF

 !IFNDEF TCLINCDIR
@@ -1600,20 +1584,16 @@ TESTEXT = \
  $(TOP)\ext\misc\percentile.c \
  $(TOP)\ext\misc\prefixes.c \
  $(TOP)\ext\misc\qpvtab.c \
-  $(TOP)\ext\misc\randomjson.c \
  $(TOP)\ext\misc\regexp.c \
  $(TOP)\ext\misc\remember.c \
  $(TOP)\ext\misc\series.c \
  $(TOP)\ext\misc\spellfix.c \
-  $(TOP)\ext\misc\stmtrand.c \
  $(TOP)\ext\misc\totype.c \
  $(TOP)\ext\misc\unionvtab.c \
  $(TOP)\ext\misc\wholenumber.c \
  $(TOP)\ext\rtree\test_rtreedoc.c \
  $(TOP)\ext\recover\sqlite3recover.c \
  $(TOP)\ext\recover\test_recover.c \
-  $(TOP)\ext\intck\test_intck.c  \
-  $(TOP)\ext\intck\sqlite3intck.c \
  $(TOP)\ext\recover\dbdata.c 

 # If use of zlib is enabled, add the "zipfile.c" source file.
@@ -1712,7 +1692,6 @@ 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_UNKNOWN_SQL_FUNCTION=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_STMT_SCANSTATUS=1
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_STRICT_SUBTYPE=1
 !ENDIF

 # <<mark>>
@@ -1749,8 +1728,6 @@ FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_MAX_MMAP_SIZE=0
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_OMIT_LOAD_EXTENSION
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_PRINTF_PRECISION_LIMIT=1000
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_PRIVATE=""
-FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_STRICT_SUBTYPE=1
-FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_STATIC_RANDOMJSON

 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_MAX_MEMORY=50000000
 FUZZCHECK_OPTS = $(FUZZCHECK_OPTS) -DSQLITE_PRINTF_PRECISION_LIMIT=1000
@@ -1767,8 +1744,6 @@ FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\fuzzinvariants.c
 FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\test\vt02.c
 FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\recover\dbdata.c
 FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\recover\sqlite3recover.c
-FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\misc\percentile.c
-FUZZCHECK_SRC = $(FUZZCHECK_SRC) $(TOP)\ext\misc\randomjson.c

 OSSSHELL_SRC = $(TOP)\test\ossshell.c $(TOP)\test\ossfuzz.c
 DBFUZZ_COMPILE_OPTS = -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
@@ -1830,19 +1805,6 @@ pkgIndex.tcl:	$(TOP)\VERSION

 $(SQLITE3TCLDLL):	libtclsqlite3.lib $(LIBRESOBJS) tclsqlite3.def pkgIndex.tcl
 	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /DEF:tclsqlite3.def /OUT:$@ libtclsqlite3.lib $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
-
-tclextension:	$(SQLITE3TCLDLL)
-
-tclextension-install:	$(SQLITE3TCLDLL)
-	$(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --install-only
-
-tclextension-uninstall:
-	$(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --uninstall
-
-tclextension-list:
-	$(TCLSH_CMD) $(TOP)\tool\buildtclext.tcl --info
-
-
 # <</mark>>

 $(SQLITE3DLL):	$(LIBOBJ) $(LIBRESOBJS) $(CORE_LINK_DEP)
@@ -1861,25 +1823,12 @@ $(SQLITE3EXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLIT
 		/link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)

 # <<mark>>
-sqldiff.exe:	$(TOP)\tool\sqldiff.c $(TOP)\ext\consio\console_io.h $(TOP)\ext\consio\console_io.c $(SQLITE3C) $(SQLITE3H) $(LIBRESOBJS)
-	$(LTLINK) $(NO_WARN) -I$(TOP)\ext\consio $(TOP)\tool\sqldiff.c $(TOP)\ext\consio\console_io.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS) $(LIBRESOBJS)
+sqldiff.exe:	$(TOP)\tool\sqldiff.c $(SQLITE3C) $(SQLITE3H) $(LIBRESOBJS)
+	$(LTLINK) $(NO_WARN) $(TOP)\tool\sqldiff.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS) $(LIBRESOBJS)

 dbhash.exe:	$(TOP)\tool\dbhash.c $(SQLITE3C) $(SQLITE3H)
 	$(LTLINK) $(NO_WARN) $(TOP)\tool\dbhash.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)

-RSYNC_SRC = \
-  $(TOP)\tool\sqlite3-rsync.c \
-  $(SQLITE3C)
-
-RSYNC_OPT = \
-  -DSQLITE_ENABLE_DBPAGE_VTAB \
-  -DSQLITE_THREADSAFE=0 \
-  -DSQLITE_OMIT_LOAD_EXTENSION \
-  -DSQLITE_OMIT_DEPRECATED
-
-sqlite3-rsync.exe:	$(RSYNC_SRC) $(LIBRESOBJS)
-	$(LTLINK) $(RSYNC_OPT) $(NO_WARN) $(RSYNC_SRC) /link $(LDFLAGS) $(LTLINKOPTS) $(LIBRESOBJS)
-
 scrub.exe:	$(TOP)\ext\misc\scrub.c $(SQLITE3C) $(SQLITE3H)
 	$(LTLINK) $(NO_WARN) -DSCRUB_STANDALONE=1 $(TOP)\ext\misc\scrub.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)

@@ -1907,10 +1856,6 @@ fuzzcheck.exe:	$(FUZZCHECK_SRC) $(SQLITE3C) $(SQLITE3H)
 fuzzcheck-asan.exe:	$(FUZZCHECK_SRC) $(SQLITE3C) $(SQLITE3H)
 	$(LTLINK) $(NO_WARN) /fsanitize=address $(FUZZCHECK_OPTS) $(FUZZCHECK_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)

-run-fuzzcheck:	fuzzcheck.exe fuzzcheck-asan.exe
-	fuzzcheck --spinner $(FUZZDB)
-	fuzzcheck-asan --spinner $(FUZZDB)
-
 ossshell.exe:	$(OSSSHELL_SRC) $(SQLITE3C) $(SQLITE3H)
 	$(LTLINK) $(NO_WARN) $(FUZZCHECK_OPTS) $(OSSSHELL_SRC) $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)

@@ -1963,7 +1908,7 @@ mptest:	mptester.exe
 	echo > .target_source

 sqlite3.c:	.target_source sqlite3ext.h sqlite3session.h $(MKSQLITE3C_TOOL) src-verify.exe
-	$(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS) $(EXTRA_SRC)
+	$(TCLSH_CMD) $(MKSQLITE3C_TOOL) $(MKSQLITE3C_ARGS)

 sqlite3-all.c:	sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
 	$(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl
@@ -2313,47 +2258,39 @@ mkkeywordhash.exe:	$(TOP)\tool\mkkeywordhash.c
 keywordhash.h:	$(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
 	.\mkkeywordhash.exe > keywordhash.h

-# Source and header files that shell.c depends on
-SHELL_DEP = \
-    $(TOP)\src\shell.c.in \
-    $(TOP)\ext\consio\console_io.c \
-    $(TOP)\ext\consio\console_io.h \
-    $(TOP)\ext\expert\sqlite3expert.c \
-    $(TOP)\ext\expert\sqlite3expert.h \
-    $(TOP)\ext\intck\sqlite3intck.c \
-    $(TOP)\ext\intck\sqlite3intck.h \
-    $(TOP)\ext\misc\appendvfs.c \
-    $(TOP)\ext\misc\base64.c \
-    $(TOP)\ext\misc\base85.c \
-    $(TOP)\ext\misc\completion.c \
-    $(TOP)\ext\misc\decimal.c \
-    $(TOP)\ext\misc\fileio.c \
-    $(TOP)\ext\misc\ieee754.c \
-    $(TOP)\ext\misc\memtrace.c \
-    $(TOP)\ext\misc\pcachetrace.c \
-    $(TOP)\ext\misc\percentile.c \
-    $(TOP)\ext\misc\regexp.c \
-    $(TOP)\ext\misc\series.c \
-    $(TOP)\ext\misc\sha1.c \
-    $(TOP)\ext\misc\shathree.c \
-    $(TOP)\ext\misc\sqlar.c \
-    $(TOP)\ext\misc\uint.c \
-    $(TOP)\ext\misc\vfstrace.c \
-    $(TOP)\ext\misc\zipfile.c \
-    $(TOP)\ext\recover\dbdata.c \
-    $(TOP)\ext\recover\sqlite3recover.c \
-    $(TOP)\ext\recover\sqlite3recover.h \
-    $(TOP)\src\test_windirent.c \
-    $(TOP)\src\test_windirent.h
+# Source files that go into making shell.c
+SHELL_SRC = \
+	$(TOP)\src\shell.c.in \
+	$(TOP)\ext\consio\console_io.c \
+	$(TOP)\ext\consio\console_io.h \
+	$(TOP)\ext\misc\appendvfs.c \
+	$(TOP)\ext\misc\completion.c \
+	$(TOP)\ext\misc\base64.c \
+	$(TOP)\ext\misc\base85.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\uint.c \
+	$(TOP)\ext\expert\sqlite3expert.c \
+	$(TOP)\ext\expert\sqlite3expert.h \
+	$(TOP)\ext\misc\memtrace.c \
+	$(TOP)\ext\misc\pcachetrace.c \
+	$(TOP)\ext\recover\dbdata.c \
+	$(TOP)\ext\recover\sqlite3recover.c \
+	$(TOP)\ext\recover\sqlite3recover.h \
+	$(TOP)\src\test_windirent.c

 # If use of zlib is enabled, add the "zipfile.c" source file.
 #
 !IF $(USE_ZLIB)!=0
-SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\sqlar.c
-SHELL_DEP = $(SHELL_DEP) $(TOP)\ext\misc\zipfile.c
+SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\sqlar.c
+SHELL_SRC = $(SHELL_SRC) $(TOP)\ext\misc\zipfile.c
 !ENDIF

-shell.c:	$(SHELL_DEP) $(TOP)\tool\mkshellc.tcl
+shell.c:	$(SHELL_SRC) $(TOP)\tool\mkshellc.tcl
 	$(TCLSH_CMD) $(TOP)\tool\mkshellc.tcl > shell.c

 zlib:
@@ -2496,8 +2433,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CKSUMVFS_STATIC=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
-TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_STATIC_RANDOMJSON
-TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_STRICT_SUBTYPE=1

 TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
 TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
@@ -2540,9 +2475,9 @@ extensiontest:	testfixture.exe testloadext.dll
 tool-zip:	testfixture.exe sqlite3.exe sqldiff.exe sqlite3_analyzer.exe $(TOP)\tool\mktoolzip.tcl
 	.\testfixture.exe $(TOP)\tool\mktoolzip.tcl

-coretestprogs:	testfixture.exe sqlite3.exe
+coretestprogs:	$(TESTPROGS)

-testprogs:	$(TESTPROGS) srcck1.exe fuzzcheck.exe sessionfuzz.exe
+testprogs:	coretestprogs srcck1.exe fuzzcheck.exe sessionfuzz.exe

 fulltest:	alltest fuzztest

@@ -2565,13 +2500,6 @@ queryplantest:	testfixture.exe shell
 fuzztest:	fuzzcheck.exe
 	.\fuzzcheck.exe $(FUZZDATA)

-# Legacy testing target for third-party integrators.  The SQLite
-# developers seldom use this target themselves.  Instead
-# they use "nmake /f Makefile.msc devtest" which runs tests on
-# a standard set of options
-#
-test:	$(TESTPROGS) sourcetest fuzztest tcltest
-
 # Minimal testing that runs in less than 3 minutes (on a fast machine)
 #
 quicktest:	testfixture.exe sourcetest
@@ -2581,6 +2509,7 @@ quicktest:	testfixture.exe sourcetest
 # This is the common case.  Run many tests that do not take too long,
 # including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
 #
+test:	$(TESTPROGS) sourcetest fuzztest tcltest

 # The veryquick.test TCL tests.
 #
@@ -2594,27 +2523,17 @@ tcltest: testfixture.exe
 testrunner:	testfixture.exe
 	.\testfixture.exe $(TOP)\test\testrunner.tcl

-# This is the testing target preferred by the core SQLite developers.
-# It runs tests under a standard configuration.  The devs run 
-# "nmake /f Makefile.msc devtest" prior to each check-in, at a minimum.
-# Probably other tests too, but at least this one.
+# Runs both fuzztest and testrunner, consecutively.
 #
-devtest:	srctree-check sourcetest
-	$(TCLSH_CMD) $(TOP)\test\testrunner.tcl mdevtest
+devtest:	testfixture.exe fuzztest testrunner

 mdevtest:
 	$(TCLSH_CMD) $(TOP)\test\testrunner.tcl mdevtest

-# Validate that various generated files in the source tree
-# are up-to-date.
-#
-srctree-check:	$(TOP)\tool\srctree-check.tcl
-	$(TCLSH_CMD) $(TOP)\tool\srctree-check.tcl
-
 # Testing for a release
 #
-releasetest:
-	$(TCLSH_CMD) $(TOP)\test\testrunner.tcl release
+releasetest: testfixture.exe fuzztest
+	testfixture.exe $(TOP)\test\testrunner.tcl release


 smoketest:	$(TESTPROGS)
@@ -2624,7 +2543,7 @@ smoketest:	$(TESTPROGS)
 shelltest: $(TESTPROGS)
 	.\testfixture.exe $(TOP)\test\permutations.test shell

-sqlite3_analyzer.c:	$(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in $(TOP)\ext\consio\console_io.h $(TOP)\ext\consio\console_io.c $(SQLITE_TCL_DEP)
+sqlite3_analyzer.c:	$(SQLITE3C) $(SQLITE3H) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in $(SQLITE_TCL_DEP)
 	$(TCLSH_CMD) $(TOP)\tool\mkccode.tcl $(TOP)\tool\sqlite3_analyzer.c.in > $@

 sqlite3_analyzer.exe:	sqlite3_analyzer.c $(LIBRESOBJS)
@@ -2779,7 +2698,7 @@ clean:
 	del /Q sqlite3.c sqlite3-*.c sqlite3.h 2>NUL
 	del /Q sqlite3rc.h 2>NUL
 	del /Q shell.c sqlite3ext.h sqlite3session.h 2>NUL
-	del /Q sqlite3_analyzer.exe sqlite3_analyzer.c sqlite3-rsync.exe 2>NUL
+	del /Q sqlite3_analyzer.exe sqlite3_analyzer.c 2>NUL
 	del /Q sqlite-*-output.vsix 2>NUL
 	del /Q fuzzershell.exe fuzzcheck.exe sqldiff.exe dbhash.exe 2>NUL
 	del /Q sqltclsh.* 2>NUL
@@ -1,19 +1,14 @@
 <h1 align="center">SQLite Source Repository</h1>

 This repository contains the complete source code for the
-[SQLite database engine](https://sqlite.org/), including
-many test scripts.  However, other test scripts
+[SQLite database engine](https://sqlite.org/).  Some test scripts
+are also included.  However, many other test scripts
 and most of the documentation are managed separately.

-See the [on-line documentation](https://sqlite.org/) for more information
-about what SQLite is and how it works from a user's perspective.  This
-README file is about the source code that goes into building SQLite,
-not about how SQLite is used.
-
 ## Version Control

 SQLite sources are managed using
-[Fossil](https://fossil-scm.org/), a distributed version control system
+[Fossil](https://www.fossil-scm.org/), a distributed version control system
 that was specifically designed and written to support SQLite development.
 The [Fossil repository](https://sqlite.org/src/timeline) contains the urtext.

@@ -73,26 +68,24 @@ archives or [SQLite archives](https://sqlite.org/cli.html#sqlar) as follows:
     then click on the "Tarball" or "ZIP Archive" links on the information
     page.

-To access sources directly using [Fossil](https://fossil-scm.org/home),
+If you do want to use Fossil to check out the source tree,
 first install Fossil version 2.0 or later.
-Source tarballs and precompiled binaries available at
-<https://fossil-scm.org/home/uv/download.html>.  Fossil is
+(Source tarballs and precompiled binaries available
+[here](https://www.fossil-scm.org/fossil/uv/download.html).  Fossil is
 a stand-alone program.  To install, simply download or build the single
-executable file and put that file someplace on your $PATH.
+executable file and put that file someplace on your $PATH.)
 Then run commands like this:

-        mkdir -p ~/sqlite
+        mkdir -p ~/sqlite ~/Fossils
        cd ~/sqlite
-        fossil open https://sqlite.org/src
+        fossil clone https://www.sqlite.org/src ~/Fossils/sqlite.fossil
+        fossil open ~/Fossils/sqlite.fossil

-The "fossil open" command will take two or three minutes.  Afterwards,
-you can do fast, bandwidth-efficient updates to the whatever versions
-of SQLite you like.  Some examples:
+After setting up a repository using the steps above, you can always
+update to the latest version using:

-        fossil update trunk             ;# latest trunk check-in
-        fossil update release           ;# latest official release
-        fossil update trunk:2024-01-01  ;# First trunk check-in after 2024-01-01
-        fossil update version-3.39.0    ;# Version 3.39.0
+        fossil update trunk   ;# latest trunk check-in
+        fossil update release ;# latest official release

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

@@ -106,42 +99,15 @@ script found at the root of the source tree.  Then run "make".

 For example:

-        apt install gcc make tcl-dev  ;#  Make sure you have all the necessary build tools
-        tar xzf sqlite.tar.gz         ;#  Unpack the source tree into "sqlite"
-        mkdir bld                     ;#  Build will occur in a sibling directory
-        cd bld                        ;#  Change to the build directory
-        ../sqlite/configure           ;#  Run the configure script
-        make sqlite3                  ;#  Builds the "sqlite3" command-line tool
-        make sqlite3.c                ;#  Build the "amalgamation" source file
-        make sqldiff                  ;#  Builds the "sqldiff" command-line tool
-        # Makefile targets below this point require tcl-dev
-        make tclextension-install     ;#  Build and install the SQLite TCL extension
-        make devtest                  ;#  Run development tests
-        make releasetest              ;#  Run full release tests
-        make sqlite3_analyzer         ;#  Builds the "sqlite3_analyzer" tool
+        tar xzf sqlite.tar.gz    ;#  Unpack the source tree into "sqlite"
+        mkdir bld                ;#  Build will occur in a sibling directory
+        cd bld                   ;#  Change to the build directory
+        ../sqlite/configure      ;#  Run the configure script
+        make                     ;#  Builds the "sqlite3" command-line tool
+        make sqlite3.c           ;#  Build the "amalgamation" source file
+        make devtest             ;#  Run some tests (requires Tcl)

-See the makefile for additional targets.  For debugging builds, the
-core developers typically run "configure" with options like this:
-
-        ../sqlite/configure --enable-all --enable-debug CFLAGS='-O0 -g'
-
-For release builds, the core developers usually do:
-
-        ../sqlite/configure --enable-all
-
-Almost all makefile targets require a "tclsh" TCL interpreter version 8.6 or
-later.  The "tclextension-install" target and the test targets that follow
-all require TCL development libraries too.  ("apt install tcl-dev").  It is
-helpful, but is not required, to install the SQLite TCL extension (the
-"tclextension-install" target) prior to running tests.  The "releasetest"
-target has additional requiremenst, such as "valgrind".
-
-On "make" command-lines, one can add "OPTIONS=..." to specify additional
-compile-time options over and above those set by ./configure.  For example,
-to compile with the SQLITE_OMIT_DEPRECATED compile-time option, one could say:
-
-        ./configure --enable-all
-        make OPTIONS=-DSQLITE_OMIT_DEPRECATED sqlite3
+See the makefile for additional targets.

 The configure script uses autoconf 2.61 and libtool.  If the configure
 script does not work out for you, there is a generic makefile named
@@ -151,7 +117,7 @@ show what changes are needed.

 ## Compiling for Windows Using MSVC

-On Windows, everything can be compiled with MSVC.
+On Windows, all applicable build products can be compiled with MSVC.
 You will also need a working installation of TCL.
 See the [compile-for-windows.md](doc/compile-for-windows.md) document for
 additional information about how to install MSVC and TCL and configure your
@@ -162,72 +128,48 @@ TCL library, using a command like this:

        set TCLDIR=c:\Tcl

-SQLite uses "tclsh.exe" as part of the build process, and so that
-program will need to be somewhere on your %PATH%.  SQLite itself
-does not contain any TCL code, but it does use TCL to help with the
-build process and to run tests.  You may need to install TCL development
-libraries in order to successfully complete some makefile targets.
-It is helpful, but is not required, to install the SQLite TCL extension
-(the "tclextension-install" target) prior to running tests.
+SQLite uses "tclsh.exe" as part of the build process, and so that utility
+program will need to be somewhere on your %PATH%.  The finished SQLite library
+does not contain any TCL code, but it does use TCL to help with the build process
+and to run tests.

 Build using Makefile.msc.  Example:

-        nmake /f Makefile.msc sqlite3.exe
+        nmake /f Makefile.msc
        nmake /f Makefile.msc sqlite3.c
-        nmake /f Makefile.msc sqldiff.exe
-        # Makefile targets below this point require TCL development libraries
-        nmake /f Makefile.msc tclextension-install
        nmake /f Makefile.msc devtest
        nmake /f Makefile.msc releasetest
-        nmake /f Makefile.msc sqlite3_analyzer.exe
 
 There are many other makefile targets.  See comments in Makefile.msc for
 details.

-As with the unix Makefile, the OPTIONS=... argument can be passed on the nmake
-command-line to enable new compile-time options.  For example:
+## Source Code Tour

-        nmake /f Makefile.msc OPTIONS=-DSQLITE_OMIT_DEPRECATED sqlite3.exe
+Most of the core source files are in the **src/** subdirectory.  The
+**src/** folder also contains files used to build the "testfixture" test
+harness. The names of the source files used by "testfixture" all begin
+with "test".
+The **src/** also contains the "shell.c" file
+which is the main program for the "sqlite3.exe"
+[command-line shell](https://sqlite.org/cli.html) and
+the "tclsqlite.c" file which implements the
+[Tcl bindings](https://sqlite.org/tclsqlite.html) for SQLite.
+(Historical note:  SQLite began as a Tcl
+extension and only later escaped to the wild as an independent library.)

-## Source Tree Map
+Test scripts and programs are found in the **test/** subdirectory.
+Additional test code is found in other source repositories.
+See [How SQLite Is Tested](http://www.sqlite.org/testing.html) for
+additional information.

-  *  **src/** - This directory contains the primary source code for the
-     SQLite core.  For historical reasons, C-code used for testing is
-     also found here.  Source files intended for testing begin with "`test`".
-     The `tclsqlite3.c` and `tclsqlite3.h` files are the TCL interface
-     for SQLite and are also not part of the core.
+The **ext/** subdirectory contains code for extensions.  The
+Full-text search engine is in **ext/fts3**.  The R-Tree engine is in
+**ext/rtree**.  The **ext/misc** subdirectory contains a number of
+smaller, single-file extensions, such as a REGEXP operator.

-  *  **test/** - This directory and its subdirectories contains code used
-     for testing.  Files that end in "`.test`" are TCL scripts that run
-     tests using an augmented TCL interpreter named "testfixture".  Use
-     a command like "`make testfixture`" (unix) or 
-     "`nmake /f Makefile.msc testfixture.exe`" (windows) to build that
-     augmented TCL interpreter, then run individual tests using commands like
-     "`testfixture test/main.test`".  This test/ subdirectory also contains
-     additional C code modules and scripts for other kinds of testing.
-
-  *  **tool/** - This directory contains programs and scripts used to
-     build some of the machine-generated code that goes into the SQLite
-     core, as well as to build and run tests and perform diagnostics.
-     The source code to [the Lemon parser generator](./doc/lemon.html) is
-     found here.  There are also TCL scripts used to build and/or transform
-     source code files.  For example, the tool/mksqlite3h.tcl script reads
-     the src/sqlite.h.in file and uses it as a template to construct
-     the deliverable "sqlite3.h" file that defines the SQLite interface.
-
-  *  **ext/** - Various extensions to SQLite are found under this
-     directory.  For example, the FTS5 subsystem is in "ext/fts5/".
-     Some of these extensions (ex: FTS3/4, FTS5, RTREE) might get built
-     into the SQLite amalgamation, but not all of them.  The
-     "ext/misc/" subdirectory contains an assortment of one-file extensions,
-     many of which are omitted from the SQLite core, but which are included
-     in the [SQLite CLI](https://sqlite.org/cli.html).
-     
-  *  **doc/** - Some documentation files about SQLite internals are found
-     here.  Note, however, that the primary documentation designed for
-     application developers and users of SQLite is in a completely separate
-     repository.  Note also that the primary API documentation is derived
-     from specially constructed comments in the src/sqlite.h.in file.
+The **tool/** subdirectory contains various scripts and programs used
+for building generated source code files or for testing or for generating
+accessory programs such as "sqlite3_analyzer(.exe)".

 ### Generated Source Code Files

@@ -241,7 +183,7 @@ manually-edited files and automatically-generated files.

 The SQLite interface is defined by the **sqlite3.h** header file, which is
 generated from src/sqlite.h.in, ./manifest.uuid, and ./VERSION.  The
-[Tcl script](https://www.tcl.tk) at tool/mksqlite3h.tcl does the conversion.
+[Tcl script](http://www.tcl.tk) at tool/mksqlite3h.tcl does the conversion.
 The manifest.uuid file contains the SHA3 hash of the particular check-in
 and is used to generate the SQLITE\_SOURCE\_ID macro.  The VERSION file
 contains the current SQLite version number.  The sqlite3.h header is really
@@ -308,39 +250,33 @@ individual source file exceeds 32K lines in length.
 ## How It All Fits Together

 SQLite is modular in design.
-See the [architectural description](https://www.sqlite.org/arch.html)
+See the [architectural description](http://www.sqlite.org/arch.html)
 for details. Other documents that are useful in
-helping to understand how SQLite works include the
-[file format](https://www.sqlite.org/fileformat2.html) description,
-the [virtual machine](https://www.sqlite.org/opcode.html) that runs
+(helping to understand how SQLite works include the
+[file format](http://www.sqlite.org/fileformat2.html) description,
+the [virtual machine](http://www.sqlite.org/opcode.html) that runs
 prepared statements, the description of
-[how transactions work](https://www.sqlite.org/atomiccommit.html), and
-the [overview of the query planner](https://www.sqlite.org/optoverview.html).
+[how transactions work](http://www.sqlite.org/atomiccommit.html), and
+the [overview of the query planner](http://www.sqlite.org/optoverview.html).

-Decades of effort have gone into optimizing SQLite, both
+Years of effort have gone into optimizing SQLite, both
 for small size and high performance.  And optimizations tend to result in
 complex code.  So there is a lot of complexity in the current SQLite
 implementation.  It will not be the easiest library in the world to hack.

-### Key source code files
+Key files:

  *  **sqlite.h.in** - This file defines the public interface to the SQLite
     library.  Readers will need to be familiar with this interface before
-     trying to understand how the library works internally.  This file is
-     really a template that is transformed into the "sqlite3.h" deliverable
-     using a script invoked by the makefile.
+     trying to understand how the library works internally.

  *  **sqliteInt.h** - this header file defines many of the data objects
     used internally by SQLite.  In addition to "sqliteInt.h", some
-     subsystems inside of sQLite have their own header files.  These internal
-     interfaces are not for use by applications.  They can and do change
-     from one release of SQLite to the next.
+     subsystems have their own header files.

  *  **parse.y** - This file describes the LALR(1) grammar that SQLite uses
     to parse SQL statements, and the actions that are taken at each step
-     in the parsing process.  The file is processed by the
-     [Lemon Parser Generator](./doc/lemon.html) to produce the actual C code
-     used for parsing.
+     in the parsing process.

  *  **vdbe.c** - This file implements the virtual machine that runs
     prepared statements.  There are various helper files whose names
@@ -383,11 +319,6 @@ implementation.  It will not be the easiest library in the world to hack.
     (and some other test programs too) is built and run when you type
     "make test".

-  *  **VERSION**, **manifest**, and **manifest.uuid** - These files define
-     the current SQLite version number.  The "VERSION" file is human generated,
-     but the "manifest" and "manifest.uuid" files are automatically generated
-     by the [Fossil version control system](https://fossil-scm.org/).
-
 There are many other source files.  Each has a succinct header comment that
 describes its purpose and role within the larger system.

@@ -405,7 +336,7 @@ The `manifest.uuid` file should contain the SHA3-256 hash of the
 `manifest` file. If all of the above hash comparisons are correct, then
 you can be confident that your source tree is authentic and unadulterated.
 Details on the format for the `manifest` files are available
-[on the Fossil website](https://fossil-scm.org/home/doc/trunk/www/fileformat.wiki#manifest).
+[on the Fossil website](https://fossil-scm.org/fossil/doc/trunk/www/fileformat.wiki#manifest).

 The process of checking source code authenticity is automated by the 
 makefile:
@@ -422,11 +353,7 @@ hidden by also modifying the makefiles.

 ## Contacts

-The main SQLite website is [https://sqlite.org/](https://sqlite.org/)
+The main SQLite website is [http:/sqlite.org/](http://sqlite.org/)
 with geographically distributed backups at
-[https://www2.sqlite.org/](https://www2.sqlite.org) and
-[https://www3.sqlite.org/](https://www3.sqlite.org).
-
-Contact the SQLite developers through the
-[SQLite Forum](https://sqlite.org/forum/).  In an emergency, you
-can send private email to the lead developer at drh at sqlite dot org.
+[http://www2.sqlite.org/](http://www2.sqlite.org) and
+[http://www3.sqlite.org/](http://www3.sqlite.org).
@@ -1 +1 @@
-3.47.0
+3.44.4
@@ -18,13 +18,6 @@
 TOP = .


-# Optionally set EXTRA_SRC to a list of C files to append to
-# the generated sqlite3.c.
-#
-!IFNDEF EXTRA_SRC
-EXTRA_SRC =
-!ENDIF
-
 # Set this non-0 to enable full warnings (-W4, etc) when compiling.
 #
 !IFNDEF USE_FULLWARN
@@ -301,7 +294,6 @@ SQLITE3EXEPDB = /pdb:sqlite3sh.pdb
 # the Windows platform.
 #
 !IFNDEF OPT_FEATURE_FLAGS
-OPT_FEATURE_FLAGS = $(OPT_XTRA)
 !IF $(MINIMAL_AMALGAMATION)==0
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS5=1
@@ -315,14 +307,6 @@ OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
 OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
 !ENDIF

-# Additional feature-options above and beyond what are normally used can be
-# be added using OPTIONS=.... on the command-line.  These values are
-# appended to the OPT_FEATURE_FLAGS variable.
-#
-!IFDEF OPTIONS
-OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) $(OPTIONS)
-!ENDIF
-
 # Should the session extension be enabled?  If so, add compilation options
 # to enable it.
 #
@@ -1006,7 +990,6 @@ 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_UNKNOWN_SQL_FUNCTION=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_STMT_SCANSTATUS=1
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_STRICT_SUBTYPE=1
 !ENDIF


@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------

-AC_INIT([sqlite],[3.47.0])
+AC_INIT([sqlite],[3.44.4])

 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
@@ -4064,4 +4064,4 @@ AC_DEFUN([TEA_ZIPFS_SUPPORT], [

 # Local Variables:
 # mode: autoconf
-# End:
+# End:
@@ -708,3 +708,4 @@ TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"
 !message *** Link options '$(LINKERFLAGS)'

 !endif
+
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.47.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.44.4.
 #
 #
 # 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.47.0'
-PACKAGE_STRING='sqlite 3.47.0'
+PACKAGE_VERSION='3.44.4'
+PACKAGE_STRING='sqlite 3.44.4'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''

@@ -781,6 +781,18 @@ TARGET_HAVE_EDITLINE
 TARGET_HAVE_READLINE
 TARGET_READLINE_INC
 TARGET_READLINE_LIBS
+HAVE_TCL
+TCL_SHLIB_SUFFIX
+TCL_STUB_LIB_SPEC
+TCL_STUB_LIB_FLAG
+TCL_STUB_LIB_FILE
+TCL_LIB_SPEC
+TCL_LIB_FLAG
+TCL_LIB_FILE
+TCL_INCLUDE_SPEC
+TCL_SRC_DIR
+TCL_BIN_DIR
+TCL_VERSION
 TARGET_EXEEXT
 SQLITE_OS_WIN
 SQLITE_OS_UNIX
@@ -793,12 +805,7 @@ HAVE_WASI_SDK
 RELEASE
 VERSION
 program_prefix
-TSTRNNR_OPTS
 TCLLIBDIR
-HAVE_TCL
-TCL_STUB_LIB_SPEC
-TCL_LIB_SPEC
-TCL_INCLUDE_SPEC
 TCLSH_CMD
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -887,14 +894,12 @@ enable_fast_install
 with_gnu_ld
 enable_libtool_lock
 enable_largefile
-with_tclsh
-with_tcl
-enable_tcl
-enable_test_status
 with_wasi_sdk
 enable_threadsafe
 enable_releasemode
 enable_tempstore
+enable_tcl
+with_tcl
 enable_editline
 enable_readline
 with_readline_lib
@@ -1467,7 +1472,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.47.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.44.4 to adapt to many kinds of systems.

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

@@ -1532,7 +1537,7 @@ fi

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

@@ -1546,13 +1551,11 @@ Optional Features:
                          optimize for fast installation [default=yes]
  --disable-libtool-lock  avoid locking (might break parallel builds)
  --disable-largefile     omit support for large files
-  --disable-tcl           omit building accessory programs that require
-                          TCL-dev
-  --enable-test-status    Full-screen status of tests
  --disable-threadsafe    Disable mutexing
  --enable-releasemode    Support libtool link to release mode
  --enable-tempstore      Use an in-ram database for temporary tables
                          (never,no,yes,always)
+  --disable-tcl           do not build TCL extension
  --enable-editline       enable BSD editline support
  --disable-readline      disable readline support
  --enable-debug          enable debugging & verbose explain
@@ -1580,10 +1583,10 @@ Optional Packages:
  --with-pic              try to use only PIC/non-PIC objects [default=use
                          both]
  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-tclsh=PATHNAME   full pathname of a tclsh to use
-  --with-tcl=DIR          directory containing (tclConfig.sh)
  --with-wasi-sdk=DIR     directory containing the WASI SDK. Triggers
                          cross-compile to WASM.
+  --with-tcl=DIR          directory containing tcl configuration
+                          (tclConfig.sh)
  --with-readline-lib     specify readline library
  --with-readline-inc     specify readline include paths
  --with-linenoise=DIR    source directory for linenoise library
@@ -1665,7 +1668,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-sqlite configure 3.47.0
+sqlite configure 3.44.4
 generated by GNU Autoconf 2.69

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

  $ $0 $@
@@ -3942,13 +3945,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:3945: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3948: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3948: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3951: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3951: output\"" >&5)
+  (eval echo "\"\$as_me:3954: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -5154,7 +5157,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 5157 "configure"' > conftest.$ac_ext
+  echo '#line 5160 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -6679,11 +6682,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:6682: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6685: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:6686: \$? = $ac_status" >&5
+   echo "$as_me:6689: \$? = $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.
@@ -7018,11 +7021,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:7021: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7024: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7025: \$? = $ac_status" >&5
+   echo "$as_me:7028: \$? = $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.
@@ -7123,11 +7126,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:7126: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7129: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7130: \$? = $ac_status" >&5
+   echo "$as_me:7133: \$? = $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
@@ -7178,11 +7181,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:7181: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7184: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7185: \$? = $ac_status" >&5
+   echo "$as_me:7188: \$? = $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
@@ -9558,7 +9561,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 9561 "configure"
+#line 9564 "configure"
 #include "confdefs.h"

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

 #if HAVE_DLFCN_H
@@ -10311,31 +10314,11 @@ done
 USE_AMALGAMATION=1

 #########
-# Figure out all the name of a working tclsh and parameters needed to compile against Tcl.
-# The --with-tcl= and/or --with-tclsh= configuration arguments might be useful for this.
+# See whether we can run specific tclsh versions known to work well;
+# if not, then we fall back to plain tclsh.
+# TODO: try other versions before falling back?
 #
-
-# Check whether --with-tclsh was given.
-if test "${with_tclsh+set}" = set; then :
-  withval=$with_tclsh;
-fi
-
-
-# Check whether --with-tcl was given.
-if test "${with_tcl+set}" = set; then :
-  withval=$with_tcl;
-fi
-
-# Check whether --enable-tcl was given.
-if test "${enable_tcl+set}" = set; then :
-  enableval=$enable_tcl; use_tcl=$enableval
-else
-  use_tcl=yes
-fi
-
-original_use_tcl=${use_tcl}
-if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
-  for ac_prog in tclsh8.6 tclsh tclsh9.0
+for ac_prog in tclsh8.7 tclsh8.6 tclsh8.5 tclsh
 do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -10378,99 +10361,10 @@ fi
 done
 test -n "$TCLSH_CMD" || TCLSH_CMD="none"

-  with_tclsh=${TCLSH_CMD}
-fi
-if test x"${with_tclsh}" != x -a x"${with_tclsh}" != xnone; then
-  TCLSH_CMD=${with_tclsh}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using tclsh at \"$TCLSH_CMD\"" >&5
-$as_echo "using tclsh at \"$TCLSH_CMD\"" >&6; }
-  if test x"${use_tcl}" = "xyes"; then
-    with_tcl=`${with_tclsh} <${srcdir}/tool/find_tclconfig.tcl`
-    if test x"${with_tcl}" != x; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}" >&5
-$as_echo "$TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $TCLSH_CMD is unable to recommend a tclConfig.sh" >&5
-$as_echo "$as_me: WARNING: $TCLSH_CMD is unable to recommend a tclConfig.sh" >&2;}
-      use_tcl=no
-    fi
-  fi
-fi
-if test x"${use_tcl}" = "xyes"; then
-  if test x"${with_tcl}" != x; then
-    if test -r ${with_tcl}/tclConfig.sh; then
-      tclconfig="${with_tcl}/tclConfig.sh"
-    else
-      for i in tcl8.6 tcl9.0 lib; do
-        if test -r ${with_tcl}/$i/tclConfig.sh; then
-          tclconfig=${with_tcl}/$i/tclConfig.sh
-          break
-        fi
-      done
-    fi
-    if test ! -r "${tclconfig}"; then
-      as_fn_error $? "no tclConfig.sh file found under ${with_tcl}" "$LINENO" 5
-    fi
-  else
-    # If we have not yet found a tclConfig.sh file, look in $libdir whic is
-    # set automatically by autoconf or by the --prefix command-line option.
-    # See https://sqlite.org/forum/forumpost/e04e693439a22457
-    libdir=${prefix}/lib
-    if test -r ${libdir}/tclConfig.sh; then
-      tclconfig=${libdir}/tclConfig.sh
-    else
-      for i in tcl8.6 tcl9.0 lib; do
-        if test -r ${libdir}/$i/tclConfig.sh; then
-          tclconfig=${libdir}/$i/tclConfig.sh
-          break
-        fi
-      done
-    fi
-    if test ! -r "${tclconfig}"; then
-      as_fn_error $? "cannot find a usable tclConfig.sh file.
-        Use --with-tcl=DIR to specify a directory where tclConfig.sh can be found.
-        SQLite does not use TCL internally, but TCL is required to build SQLite
-        from canonical sources and TCL is required for testing." "$LINENO" 5
-    fi
-  fi
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading TCL configuration from ${tclconfig}" >&5
-$as_echo "loading TCL configuration from ${tclconfig}" >&6; }
-  . ${tclconfig}
-
-
-
-  # There are lots of other configuration variables that are provided by the
-  # tclConfig.sh file and that could be included here.  But as of right now,
-  # TCL_LIB_SPEC is the only what that the Makefile uses.
-  HAVE_TCL=1
-elif test x"${original_use_tcl}" = "xno"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to run tests because of --disable-tcl" >&5
-$as_echo "unable to run tests because of --disable-tcl" >&6; }
-  HAVE_TCL=0
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to run tests because no tclConfig.sh file could be located" >&5
-$as_echo "unable to run tests because no tclConfig.sh file could be located" >&6; }
-  HAVE_TCL=0
-fi
-
-if test x"$TCLSH_CMD" == x; then
-  TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
-  if test ! -x ${TCLSH_CMD}; then
-    TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh
-    if test ! -x ${TCLSH_CMD_2}; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find a usable tclsh at either ${TCLSH_CMD} or ${TCLSH_CMD_2}" >&5
-$as_echo "$as_me: WARNING: cannot find a usable tclsh at either ${TCLSH_CMD} or ${TCLSH_CMD_2}" >&2;}
-      TCLSH_CMD=none
-    else
-      TCLSH_CMD=${TCLSH_CMD_2}
-    fi
-  fi
-fi
 if test "$TCLSH_CMD" = "none"; then
  # If we can't find a local tclsh, then building the amalgamation will fail.
  # We act as though --disable-amalgamation has been used.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Warning: can't find tclsh - defaulting to non-amalgamation build." >&5
-$as_echo "$as_me: WARNING: Warning: can't find tclsh - defaulting to non-amalgamation build." >&2;}
+  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
  USE_AMALGAMATION=0
  TCLSH_CMD="tclsh"
 fi
@@ -10478,6 +10372,7 @@ 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
@@ -10487,23 +10382,6 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR="${TCLLIBDIR}/sqlite3"
 fi

-#########
-# Set up options for running tests.
-#
-# Check whether --enable-test-status was given.
-if test "${enable_test_status+set}" = set; then :
-  enableval=$enable_test_status; use_vt100=$enableval
-else
-  use_vt100=no
-fi
-
-if test $use_vt100 != no; then
-  TSTRNNR_OPTS=--status
-else
-  TSTRNNR_OPTS=
-fi
-
-

 #########
 # Set up an appropriate program prefix
@@ -10891,6 +10769,213 @@ fi



+##########
+# Figure out all the parameters needed to compile against Tcl.
+#
+# This code is derived from the SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG
+# macros in the in the tcl.m4 file of the standard TCL distribution.
+# Those macros could not be used directly since we have to make some
+# minor changes to accomodate systems that do not have TCL installed.
+#
+# Check whether --enable-tcl was given.
+if test "${enable_tcl+set}" = set; then :
+  enableval=$enable_tcl; use_tcl=$enableval
+else
+  use_tcl=yes
+fi
+
+if test "${use_tcl}" = "yes" ; then
+
+# Check whether --with-tcl was given.
+if test "${with_tcl+set}" = set; then :
+  withval=$with_tcl; with_tclconfig=${withval}
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
+$as_echo_n "checking for Tcl configuration... " >&6; }
+  if ${ac_cv_c_tclconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    # First check to see if --with-tcl was specified.
+    if test x"${with_tclconfig}" != x ; then
+      if test -f "${with_tclconfig}/tclConfig.sh" ; then
+        ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
+      else
+        as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5
+      fi
+    fi
+
+    # Start autosearch by asking tclsh
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
+    fi
+
+    # On ubuntu 14.10, $auto_path on tclsh is not quite correct.
+    # So try again after applying corrections.
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD} | sed 's,/tcltk/tcl,/tcl,g'`
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
+    fi
+
+    # Recent versions of Xcode on Macs hid the tclConfig.sh file
+    # in a strange place.
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX*.sdk/usr/lib
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
+    fi
+
+    # then check for a private Tcl installation
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      for i in \
+            ../tcl \
+            `ls -dr ../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \
+            `ls -dr ../tcl[8-9].[0-9] 2>/dev/null` \
+            `ls -dr ../tcl[8-9].[0-9]* 2>/dev/null` \
+            ../../tcl \
+            `ls -dr ../../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \
+            `ls -dr ../../tcl[8-9].[0-9] 2>/dev/null` \
+            `ls -dr ../../tcl[8-9].[0-9]* 2>/dev/null` \
+            ../../../tcl \
+            `ls -dr ../../../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \
+            `ls -dr ../../../tcl[8-9].[0-9] 2>/dev/null` \
+            `ls -dr ../../../tcl[8-9].[0-9]* 2>/dev/null`
+      do
+        if test -f "$i/unix/tclConfig.sh" ; then
+          ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+          break
+        fi
+      done
+    fi
+
+    # check in a few common install locations
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      for i in \
+            `ls -d ${libdir} 2>/dev/null` \
+            `ls -d /usr/local/lib 2>/dev/null` \
+            `ls -d /usr/contrib/lib 2>/dev/null` \
+            `ls -d /usr/lib 2>/dev/null`
+      do
+        if test -f "$i/tclConfig.sh" ; then
+           ac_cv_c_tclconfig=`(cd $i; pwd)`
+           break
+        fi
+      done
+    fi
+
+    # check in a few other private locations
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      for i in \
+         ${srcdir}/../tcl \
+         `ls -dr ${srcdir}/../tcl[8-9].[0-9].[0-9]* 2>/dev/null` \
+         `ls -dr ${srcdir}/../tcl[8-9].[0-9] 2>/dev/null` \
+         `ls -dr ${srcdir}/../tcl[8-9].[0-9]* 2>/dev/null`
+      do
+        if test -f "$i/unix/tclConfig.sh" ; then
+          ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+          break
+        fi
+      done
+    fi
+
+fi
+
+
+  if test x"${ac_cv_c_tclconfig}" = x ; then
+    use_tcl=no
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find Tcl configuration definitions" >&5
+$as_echo "$as_me: WARNING: Can't find Tcl configuration definitions" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&5
+$as_echo "$as_me: WARNING: *** Without Tcl the regression tests cannot be executed ***" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&5
+$as_echo "$as_me: WARNING: *** Consider using --with-tcl=... to define location of Tcl ***" >&2;}
+  else
+    TCL_BIN_DIR=${ac_cv_c_tclconfig}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found $TCL_BIN_DIR/tclConfig.sh" >&5
+$as_echo "found $TCL_BIN_DIR/tclConfig.sh" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+$as_echo_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh... " >&6; }
+    if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
+      . $TCL_BIN_DIR/tclConfig.sh
+    else
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: file not found" >&5
+$as_echo "file not found" >&6; }
+    fi
+
+    #
+    # If the TCL_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable TCL_LIB_SPEC will be set to the value
+    # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
+    # instead of TCL_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+
+    if test -f $TCL_BIN_DIR/Makefile ; then
+      TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
+      TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
+      TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
+    fi
+
+    #
+    # eval is required to do the TCL_DBGX substitution
+    #
+
+    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
+    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
+    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
+
+    eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+    eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
+    eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  fi
+fi
+if test "${use_tcl}" = "no" ; then
+  HAVE_TCL=""
+else
+  HAVE_TCL=1
+fi
+
+
 ##########
 # Figure out what C libraries are required to compile programs
 # that use "readline()" library.
@@ -12396,7 +12481,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.47.0, which was
+This file was extended by sqlite $as_me 3.44.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

  CONFIG_FILES    = $CONFIG_FILES
@@ -12462,7 +12547,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.47.0
+sqlite config.status 3.44.4
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"

@@ -74,7 +74,7 @@
 # you don't need (for example BLT) by erasing or commenting out
 # the corresponding code.
 #
-AC_INIT([sqlite],m4_esyscmd(cat VERSION | tr -d '\n'))
+AC_INIT([sqlite],[m4_esyscmd(cat VERSION | tr -d '\n')])

 dnl Make sure the local VERSION file matches this configure script
 sqlite_version_sanity_check=`cat $srcdir/VERSION | tr -d '\n'`
@@ -116,101 +116,15 @@ AC_CHECK_FUNCS([fdatasync gmtime_r isnan localtime_r localtime_s malloc_usable_s
 USE_AMALGAMATION=1

 #########
-# Figure out all the name of a working tclsh and parameters needed to compile against Tcl.
-# The --with-tcl= and/or --with-tclsh= configuration arguments might be useful for this.
-#
-AC_ARG_WITH(tclsh, AS_HELP_STRING([--with-tclsh=PATHNAME],[full pathname of a tclsh to use]))
-AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing (tclConfig.sh)]))
-AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[omit building accessory programs that require TCL-dev]),
-      [use_tcl=$enableval],[use_tcl=yes])
-original_use_tcl=${use_tcl}
-if test x"${with_tclsh}" == x -a x"${with_tcl}" == x; then
-  AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.6 tclsh tclsh9.0],none)
-  with_tclsh=${TCLSH_CMD}
-fi
-if test x"${with_tclsh}" != x -a x"${with_tclsh}" != xnone; then
-  TCLSH_CMD=${with_tclsh}
-  AC_MSG_RESULT([using tclsh at "$TCLSH_CMD"])
-  if test x"${use_tcl}" = "xyes"; then
-    with_tcl=`${with_tclsh} <${srcdir}/tool/find_tclconfig.tcl`
-    if test x"${with_tcl}" != x; then
-      AC_MSG_RESULT([$TCLSH_CMD recommends the tclConfig.sh at ${with_tcl}])
-    else
-      AC_MSG_WARN([$TCLSH_CMD is unable to recommend a tclConfig.sh])
-      use_tcl=no
-    fi
-  fi
-fi
-if test x"${use_tcl}" = "xyes"; then
-  if test x"${with_tcl}" != x; then
-    if test -r ${with_tcl}/tclConfig.sh; then
-      tclconfig="${with_tcl}/tclConfig.sh"
-    else
-      for i in tcl8.6 tcl9.0 lib; do
-        if test -r ${with_tcl}/$i/tclConfig.sh; then
-          tclconfig=${with_tcl}/$i/tclConfig.sh
-          break
-        fi
-      done
-    fi
-    if test ! -r "${tclconfig}"; then
-      AC_MSG_ERROR([no tclConfig.sh file found under ${with_tcl}])
-    fi
-  else
-    # If we have not yet found a tclConfig.sh file, look in $libdir whic is
-    # set automatically by autoconf or by the --prefix command-line option.
-    # See https://sqlite.org/forum/forumpost/e04e693439a22457
-    libdir=${prefix}/lib
-    if test -r ${libdir}/tclConfig.sh; then
-      tclconfig=${libdir}/tclConfig.sh
-    else
-      for i in tcl8.6 tcl9.0 lib; do
-        if test -r ${libdir}/$i/tclConfig.sh; then
-          tclconfig=${libdir}/$i/tclConfig.sh
-          break
-        fi
-      done
-    fi
-    if test ! -r "${tclconfig}"; then
-      AC_MSG_ERROR([cannot find a usable tclConfig.sh file. 
-        Use --with-tcl=DIR to specify a directory where tclConfig.sh can be found.
-        SQLite does not use TCL internally, but TCL is required to build SQLite
-        from canonical sources and TCL is required for testing.])
-    fi
-  fi
-  AC_MSG_RESULT([loading TCL configuration from ${tclconfig}])
-  . ${tclconfig}
-  AC_SUBST(TCL_INCLUDE_SPEC)
-  AC_SUBST(TCL_LIB_SPEC)
-  AC_SUBST(TCL_STUB_LIB_SPEC)
-  # There are lots of other configuration variables that are provided by the
-  # tclConfig.sh file and that could be included here.  But as of right now,
-  # TCL_LIB_SPEC is the only what that the Makefile uses.
-  HAVE_TCL=1
-elif test x"${original_use_tcl}" = "xno"; then
-  AC_MSG_RESULT([unable to run tests because of --disable-tcl])
-  HAVE_TCL=0
-else
-  AC_MSG_RESULT([unable to run tests because no tclConfig.sh file could be located])
-  HAVE_TCL=0
-fi
-AC_SUBST(HAVE_TCL)
-if test x"$TCLSH_CMD" == x; then
-  TCLSH_CMD=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
-  if test ! -x ${TCLSH_CMD}; then
-    TCLSH_CMD_2=${TCL_EXEC_PREFIX}/bin/tclsh
-    if test ! -x ${TCLSH_CMD_2}; then
-      AC_MSG_WARN([cannot find a usable tclsh at either ${TCLSH_CMD} or ${TCLSH_CMD_2}])
-      TCLSH_CMD=none
-    else
-      TCLSH_CMD=${TCLSH_CMD_2}
-    fi
-  fi
-fi
+# See whether we can run specific tclsh versions known to work well;
+# if not, then we fall back to plain tclsh.
+# TODO: try other versions before falling back?
+# 
+AC_CHECK_PROGS(TCLSH_CMD, [tclsh8.7 tclsh8.6 tclsh8.5 tclsh], none)
 if test "$TCLSH_CMD" = "none"; then
  # If we can't find a local tclsh, then building the amalgamation will fail.
  # We act as though --disable-amalgamation has been used.
-  AC_MSG_WARN([Warning: can't find tclsh - defaulting to non-amalgamation build.])
+  echo "Warning: can't find tclsh - defaulting to non-amalgamation build."
  USE_AMALGAMATION=0
  TCLSH_CMD="tclsh"
 fi
@@ -218,6 +132,7 @@ AC_SUBST(TCLSH_CMD)

 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
@@ -227,18 +142,6 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then
  TCLLIBDIR="${TCLLIBDIR}/sqlite3"
 fi

-#########
-# Set up options for running tests.
-#
-AC_ARG_ENABLE(test-status, AS_HELP_STRING([--enable-test-status],[Full-screen status of tests]),
-      [use_vt100=$enableval],[use_vt100=no])
-if test $use_vt100 != no; then
-  TSTRNNR_OPTS=--status
-else
-  TSTRNNR_OPTS=
-fi
-AC_SUBST(TSTRNNR_OPTS)
-

 #########
 # Set up an appropriate program prefix
@@ -436,6 +339,190 @@ AC_SUBST(SQLITE_OS_UNIX)
 AC_SUBST(SQLITE_OS_WIN)
 AC_SUBST(TARGET_EXEEXT)

+##########
+# Figure out all the parameters needed to compile against Tcl.
+#
+# This code is derived from the SC_PATH_TCLCONFIG and SC_LOAD_TCLCONFIG
+# macros in the in the tcl.m4 file of the standard TCL distribution.
+# Those macros could not be used directly since we have to make some
+# minor changes to accomodate systems that do not have TCL installed.
+#
+AC_ARG_ENABLE(tcl, AS_HELP_STRING([--disable-tcl],[do not build TCL extension]),
+      [use_tcl=$enableval],[use_tcl=yes])
+if test "${use_tcl}" = "yes" ; then
+  AC_ARG_WITH(tcl, AS_HELP_STRING([--with-tcl=DIR],[directory containing tcl configuration (tclConfig.sh)]), with_tclconfig=${withval})
+  AC_MSG_CHECKING([for Tcl configuration])
+  AC_CACHE_VAL(ac_cv_c_tclconfig,[
+    # First check to see if --with-tcl was specified.
+    if test x"${with_tclconfig}" != x ; then
+      if test -f "${with_tclconfig}/tclConfig.sh" ; then
+        ac_cv_c_tclconfig=`(cd ${with_tclconfig}; pwd)`
+      else
+        AC_MSG_ERROR([${with_tclconfig} directory doesn't contain tclConfig.sh])
+      fi
+    fi
+
+    # Start autosearch by asking tclsh
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD}`
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
+    fi
+
+    # On ubuntu 14.10, $auto_path on tclsh is not quite correct.
+    # So try again after applying corrections.
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in `echo 'puts stdout $auto_path' | ${TCLSH_CMD} | sed 's,/tcltk/tcl,/tcl,g'`
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
+    fi
+
+    # Recent versions of Xcode on Macs hid the tclConfig.sh file
+    # in a strange place.
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      if test x"$cross_compiling" = xno; then
+        for i in /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX*.sdk/usr/lib
+        do
+          if test -f "$i/tclConfig.sh" ; then
+            ac_cv_c_tclconfig="$i"
+            break
+          fi
+        done
+      fi
+    fi
+
+    # then check for a private Tcl installation
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      for i in \
+            ../tcl \
+            `ls -dr ../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+            `ls -dr ../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+            `ls -dr ../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+            ../../tcl \
+            `ls -dr ../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+            `ls -dr ../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+            `ls -dr ../../tcl[[8-9]].[[0-9]]* 2>/dev/null` \
+            ../../../tcl \
+            `ls -dr ../../../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+            `ls -dr ../../../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+            `ls -dr ../../../tcl[[8-9]].[[0-9]]* 2>/dev/null`
+      do
+        if test -f "$i/unix/tclConfig.sh" ; then
+          ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+          break
+        fi
+      done
+    fi
+
+    # check in a few common install locations
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      for i in \
+            `ls -d ${libdir} 2>/dev/null` \
+            `ls -d /usr/local/lib 2>/dev/null` \
+            `ls -d /usr/contrib/lib 2>/dev/null` \
+            `ls -d /usr/lib 2>/dev/null`
+      do
+        if test -f "$i/tclConfig.sh" ; then
+           ac_cv_c_tclconfig=`(cd $i; pwd)`
+           break
+        fi
+      done
+    fi
+
+    # check in a few other private locations
+    if test x"${ac_cv_c_tclconfig}" = x ; then
+      for i in \
+         ${srcdir}/../tcl \
+         `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]].[[0-9]]* 2>/dev/null` \
+         `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]] 2>/dev/null` \
+         `ls -dr ${srcdir}/../tcl[[8-9]].[[0-9]]* 2>/dev/null`
+      do
+        if test -f "$i/unix/tclConfig.sh" ; then
+          ac_cv_c_tclconfig=`(cd $i/unix; pwd)`
+          break
+        fi
+      done
+    fi
+  ])
+
+  if test x"${ac_cv_c_tclconfig}" = x ; then
+    use_tcl=no
+    AC_MSG_WARN(Can't find Tcl configuration definitions)
+    AC_MSG_WARN(*** Without Tcl the regression tests cannot be executed ***)
+    AC_MSG_WARN(*** Consider using --with-tcl=... to define location of Tcl ***)
+  else
+    TCL_BIN_DIR=${ac_cv_c_tclconfig}
+    AC_MSG_RESULT(found $TCL_BIN_DIR/tclConfig.sh)
+
+    AC_MSG_CHECKING([for existence of $TCL_BIN_DIR/tclConfig.sh])
+    if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
+      AC_MSG_RESULT([loading])
+      . $TCL_BIN_DIR/tclConfig.sh
+    else
+      AC_MSG_RESULT([file not found])
+    fi
+    
+    #
+    # If the TCL_BIN_DIR is the build directory (not the install directory),
+    # then set the common variable name to the value of the build variables.
+    # For example, the variable TCL_LIB_SPEC will be set to the value
+    # of TCL_BUILD_LIB_SPEC. An extension should make use of TCL_LIB_SPEC
+    # instead of TCL_BUILD_LIB_SPEC since it will work with both an
+    # installed and uninstalled version of Tcl.
+    #
+    
+    if test -f $TCL_BIN_DIR/Makefile ; then
+      TCL_LIB_SPEC=${TCL_BUILD_LIB_SPEC}
+      TCL_STUB_LIB_SPEC=${TCL_BUILD_STUB_LIB_SPEC}
+      TCL_STUB_LIB_PATH=${TCL_BUILD_STUB_LIB_PATH}
+    fi
+    
+    #
+    # eval is required to do the TCL_DBGX substitution
+    #
+    
+    eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
+    eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
+    eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
+    
+    eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
+    eval "TCL_STUB_LIB_FLAG=\"${TCL_STUB_LIB_FLAG}\""
+    eval "TCL_STUB_LIB_SPEC=\"${TCL_STUB_LIB_SPEC}\""
+    
+    AC_SUBST(TCL_VERSION)
+    AC_SUBST(TCL_BIN_DIR)
+    AC_SUBST(TCL_SRC_DIR)
+    AC_SUBST(TCL_INCLUDE_SPEC)
+    
+    AC_SUBST(TCL_LIB_FILE)
+    AC_SUBST(TCL_LIB_FLAG)
+    AC_SUBST(TCL_LIB_SPEC)
+    
+    AC_SUBST(TCL_STUB_LIB_FILE)
+    AC_SUBST(TCL_STUB_LIB_FLAG)
+    AC_SUBST(TCL_STUB_LIB_SPEC)
+    AC_SUBST(TCL_SHLIB_SUFFIX)
+  fi
+fi
+if test "${use_tcl}" = "no" ; then
+  HAVE_TCL=""
+else
+  HAVE_TCL=1
+fi
+AC_SUBST(HAVE_TCL)
+
 ##########
 # Figure out what C libraries are required to compile programs
 # that use "readline()" library.
@@ -1,7 +1,7 @@
 # Notes On Compiling SQLite On Windows 11

 Here are step-by-step instructions on how to build SQLite from
-canonical source on a new Windows 11 PC, as of 2023-11-01:
+canonical source on a new Windows 11 PC, as of 2023-08-16:

  1.  Install Microsoft Visual Studio. The free "community edition" 
      will work fine.  Do a standard install for C++ development.
@@ -57,29 +57,10 @@ canonical source on a new Windows 11 PC, as of 2023-11-01:
      <ul>
      <li>  `nmake /f makefile.msc`
      <li>  `nmake /f makefile.msc sqlite3.c`
-      <li>  `nmake /f makefile.msc sqlite3.exe`
-      <li>  `nmake /f makefile.msc sqldiff.exe`
-      <li>  `nmake /f makefile.msc tclextension-install`
      <li>  `nmake /f makefile.msc devtest`
      <li>  `nmake /f makefile.msc releasetest`
-      <li>  `nmake /f makefile.msc sqlite3_analyzer.exe`
      </ul>

-      It is not required that you run the "tclextension-install" target prior to
-      running tests.  However, the tests will run more smoothly if you do.
-      The version of SQLite used for the TCL extension does *not* need to
-      correspond to the version of SQLite under test.  So you can install the
-      SQLite TCL extension once, and then use it to test many different versions
-      of SQLite.
-
-
-  7.  For a debugging build of the CLI, where the ".treetrace" and ".wheretrace"
-      commands work, add the DEBUG=3 argument to nmake.  Like this:
-      <ul>
-      <li> `nmake /f makefile.msc DEBUG=3 clean sqlite3.exe`
-      </ul>
-   
-
 ## 32-bit Builds

 Doing a 32-bit build is just like doing a 64-bit build with the
@@ -103,18 +84,6 @@ following minor changes:
      <li>  `set PATH=c:\tcl32\bin;%PATH%`
      </ul>

-## Building a DLL
-
-The command the developers use for building the deliverable DLL on the 
-[download page](https://sqlite.org/download.html) is as follows:
-
-> ~~~~
-nmake /f Makefile.msc sqlite3.dll USE_NATIVE_LIBPATHS=1 "OPTS=-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1 -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_JSON1=1 -DSQLITE_ENABLE_GEOPOLY=1 -DSQLITE_ENABLE_SESSION=1 -DSQLITE_ENABLE_PREUPDATE_HOOK=1 -DSQLITE_ENABLE_SERIALIZE=1 -DSQLITE_ENABLE_MATH_FUNCTIONS=1"
-~~~~
-
-That command generates both the sqlite3.dll and sqlite3.def files.  The same
-command works for both 32-bit and 64-bit builds.
-
 ## Statically Linking The TCL Library

 Some utility programs associated with SQLite need to be linked
@@ -1,290 +0,0 @@
-# The JSONB Format
-
-This document describes SQLite's JSONB binary encoding of
-JSON.
-
-## 1.0 What Is JSONB?
-
-Beginning with version 3.45.0 (circa 2024-01-01), SQLite supports an
-alternative binary encoding of JSON which we call "JSONB".  JSONB is
-a binary format that stored as a BLOB.
-
-The advantage of JSONB over ordinary text RFC 8259 JSON is that JSONB
-is both slightly smaller (by between 5% and 10% in most cases) and
-can be processed in less than half the number of CPU cycles.  The built-in
-[JSON SQL functions] of SQLite can accept either ordinary text JSON
-or the binary JSONB encoding for any of their JSON inputs.
-
-The "JSONB" name is inspired by [PostgreSQL](https://postgresql.org), but the
-on-disk format for SQLite's JSONB is not the same as PostgreSQL's.
-The two formats have the same name, but they have wildly different internal
-representations and are not in any way binary compatible.
-
-The central idea behind this JSONB specification is that each element
-begins with a header that includes the size and type of that element.
-The header takes the place of punctuation such as double-quotes,
-curly-brackes, square-brackets, commas, and colons.  Since the size
-and type of each element is contained in its header, the element can
-be read faster since it is no longer necessary to carefully scan forward
-looking for the closing delimiter.  The payload of JSONB is the same
-as for corresponding text JSON.  The same payload bytes occur in the
-same order.  The only real difference between JSONB and ordinary text
-JSON is that JSONB includes a binary header on
-each element and omits delimiter and separator punctuation.
-
-### 1.1 Internal Use Only
-
-The details of the JSONB are not intended to be visible to application
-developers.  Application developers should look at JSONB as an opaque BLOB
-used internally by SQLite.  Nevertheless, we want the format to be backwards
-compatible across all future versions of SQLite.  To that end, the format
-is documented by this file in the source tree.  But this file should be
-used only by SQLite core developers, not by developers of applications
-that only use SQLite.
-
-## 2.0 The Purpose Of This Document
-
-JSONB is not intended as an external format to be used by
-applications.  JSONB is designed for internal use by SQLite only.
-Programmers do not need to understand the JSONB format in order to
-use it effectively.
-Applications should access JSONB only through the [JSON SQL functions],
-not by looking at individual bytes of the BLOB.
-
-However, JSONB is intended to be portable and backwards compatible
-for all future versions of SQLite.  In other words, you should not have
-to export and reimport your SQLite database files when you upgrade to
-a newer SQLite version.  For that reason, the JSONB format needs to
-be well-defined.
-
-This document is therefore similar in purpose to the
-[SQLite database file format] document that describes the on-disk
-format of an SQLite database file.  Applications are not expected
-to directly read and write the bits and bytes of SQLite database files.
-The SQLite database file format is carefully documented so that it
-can be stable and enduring.  In the same way, the JSONB representation
-of JSON is documented here so that it too can be stable and enduring,
-not so that applications can read or writes individual bytes.
-
-## 3.0 Encoding
-
-JSONB is a direct translation of the underlying text JSON. The difference
-is that JSONB uses a binary encoding that is faster to parse compared to
-the detailed syntax of text JSON.
-
-Each JSON element is encoded as a header and a payload.  The header
-determines type of element (string, numeric, boolean, null, object, or
-array) and the size of the payload.  The header can be between 1 and
-9 bytes in size.  The payload can be any size from zero bytes up to the
-maximum allowed BLOB size.
-
-### 3.1 Payload Size
-
-The upper four bits of the first byte of the header determine size of the
-header and possibly also the size of the payload.
-If the upper four bits have a value between 0 and 11, then the header is
-exactly one byte in size and the payload size is determined by those
-upper four bits.  If the upper four bits have a value between 12 and 15,
-that means that the total header size is 2, 3, 5, or 9 bytes and the
-payload size is unsigned big-endian integer that is contained in the
-subsequent bytes.  The size integer is the one byte that following the
-initial header byte if the upper four bits
-are 12, two bytes if the upper bits are 13, four bytes if the upper bits
-are 14, and eight bytes if the upper bits are 15.  The current design
-of SQLite does not support BLOB values larger than 2GiB, so the eight-byte
-variant of the payload size integer will never be used by the current code.
-The eight-byte payload size integer is included in the specification
-to allow for future expansion.
-
-The header for an element does *not* need to be in its simplest
-form.  For example, consider the JSON numeric value "`1`".
-That element can be encode in five different ways:
-
-  *  `0x13 0x31`
-  *  `0xc3 0x01 0x31`
-  *  `0xd3 0x00 0x01 0x31`
-  *  `0xe3 0x00 0x00 0x00 0x01 0x31`
-  *  `0xf3 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x01 0x31`
-
-The shortest encoding is preferred, of course, and usually happens with
-primitive elements such as numbers.  However the total size of an array
-or object might not be known exactly when the header of the element is
-first generated.  It is convenient to reserve space for the largest
-possible header and then go back and fill in the correct payload size
-at the end.  This technique can result in array or object headers that
-are larger than absolutely necessary.
-
-### 3.2 Element Type
-
-The least-significant four bits of the first byte of the header (the first
-byte masked against 0x0f) determine element type.  The following codes are
-used:
-
-<ol>
-<li type="0"><p><b>NULL</b> &rarr;
-The element is a JSON "null".  The payload size for a true JSON NULL must
-must be zero.  Future versions of SQLite might extend the JSONB format
-with elements that have a zero element type but a non-zero size.  In that
-way, legacy versions of SQLite will interpret the element as a NULL 
-for backwards compatibility while newer versions will interpret the
-element in some other way.
-
-<li value="1"><p><b>TRUE</b> &rarr;
-The element is a JSON "true".  The payload size must be zero for a actual
-"true" value.  Elements with type 1 and a non-zero payload size are
-reserved for future expansion.  Legacy implementations that see an element
-type of 1 with a non-zero payload size should continue to interpret that
-element as "true" for compatibility.
-
-<li value="2"><p><b>FALSE</b> &rarr;
-The element is a JSON "false".  The payload size must be zero for a actual
-"false" value.  Elements with type 2 and a non-zero payload size are
-reserved for future expansion.  Legacy implementations that see an element
-type of 2 with a non-zero payload size should continue to interpret that
-element as "false" for compatibility.
-
-<li value="3"><p><b>INT</b> &rarr;
-The element is a JSON integer value in the canonical
-RFC 8259 format, without extensions.  The payload is the ASCII
-text representation of that numeric value.
-
-<li value="4"><p><b>INT5</b> &rarr;
-The element is a JSON integer value that is not in the
-canonical format.   The payload is the ASCII
-text representation of that numeric value.  Because the payload is in a
-non-standard format, it will need to be translated when the JSONB is
-converted into RFC 8259 text JSON.
-
-<li value="5"><p><b>FLOAT</b> &rarr;
-The element is a JSON floating-point value in the canonical
-RFC 8259 format, without extensions.  The payload is the ASCII
-text representation of that numeric value.
-
-<li value="6"><p><b>FLOAT5</b> &rarr;
-The element is a JSON floating-point value that is not in the
-canonical format.   The payload is the ASCII
-text representation of that numeric value.  Because the payload is in a
-non-standard format, it will need to be translated when the JSONB is
-converted into RFC 8259 text JSON.
-
-<li value="7"><p><b>TEXT</b> &rarr;
-The element is a JSON string value that does not contain
-any escapes nor any characters that need to be escaped for either SQL or
-JSON.  The payload is the UTF8 text representation of the string value.
-The payload does <i>not</i> include string delimiters.
-
-<li value="8"><p><b>TEXTJ</b> &rarr;
-The element is a JSON string value that contains
-RFC 8259 character escapes (such as "<tt>\n</tt>" or "<tt>\u0020</tt>").
-Those escapes will need to be translated into actual UTF8 if this element
-is [json_extract|extracted] into SQL.
-The payload is the UTF8 text representation of the escaped string value.
-The payload does <i>not</i> include string delimiters.
-
-<li value="9"><p><b>TEXT5</b> &rarr;
-The element is a JSON string value that contains
-character escapes, including some character escapes that part of JSON5
-and which are not found in the canonical RFC 8259 spec.
-Those escapes will need to be translated into standard JSON prior to
-rendering the JSON as text, or into their actual UTF8 characters if this
-element is [json_extract|extracted] into SQL.
-The payload is the UTF8 text representation of the escaped string value.
-The payload does <i>not</i> include string delimiters.
-
-<li value="10"><p><b>TEXTRAW</b> &rarr;
-The element is a JSON string value that contains
-UTF8 characters that need to be escaped if this string is rendered into
-standard JSON text.
-The payload does <i>not</i> include string delimiters.
-
-<li value="11"><p><b>ARRAY</b> &rarr;
-The element is a JSON array.  The payload contains
-JSONB elements that comprise values contained within the array.
-
-<li value="12"><p><b>OBJECT</b> &rarr;
-The element is a JSON object.  The payload contains
-pairs of JSONB elements that comprise entries for the JSON object.
-The first element in each pair must be a string (types 7 through 10).
-The second element of each pair may be any types, including nested
-arrays or objects.
-
-<li value="13"><p><b>RESERVED-13</b> &rarr;
-Reserved for future expansion.  Legacy implements that encounter this
-element type should raise an error.
-
-<li value="14"><p><b>RESERVED-14</b> &rarr;
-Reserved for future expansion.  Legacy implements that encounter this
-element type should raise an error.
-
-<li value="15"><p><b>RESERVED-15</b> &rarr;
-Reserved for future expansion.  Legacy implements that encounter this
-element type should raise an error.
-</ol>
-
-Element types outside the range of 0 to 12 are reserved for future
-expansion.  The current implement raises an error if see an element type
-other than those listed above.  However, future versions of SQLite might
-use of the three remaining element types to implement indexing or similar
-optimizations, to speed up lookup against large JSON arrays and/or objects.
-
-### 3.3 Design Rationale For Element Types
-
-A key goal of JSONB is that it should be quick to translate
-to and from text JSON and/or be constructed from SQL values.
-When converting from text into JSONB, we do not want the
-converter subroutine to burn CPU cycles converting elements
-values into some standard format which might never be used.
-Format conversion is "lazy" - it is deferred until actually
-needed.  This has implications for the JSONB format design:
-
-  1.   Numeric values are stored as text, not a numbers.  The values are
-       a direct copy of the text JSON values from which they are derived.
-
-  2.   There are multiple element types depending on the details of value
-       formats.  For example, INT is used for pure RFC-8259 integer
-       literals and INT5 exists for JSON5 extensions such as hexadecimal
-       notation.  FLOAT is used for pure RFC-8259 floating point literals
-       and FLOAT5 is used for JSON5 extensions.  There are four different
-       representations of strings, depending on where the string came from
-       and how special characters within the string are escaped.
-
-A second goal of JSONB is that it should be capable of serving as the
-"parse tree" for JSON when a JSON value is being processed by the
-various [JSON SQL functions] built into SQLite.  Before JSONB was
-developed, operations such [json_replace()] and [json_patch()]
-and similar worked in three stages:
-
-
-  1.  Translate the text JSON into a internal format that is
-      easier to scan and edit.
-  2.  Perform the requested operation on the JSON.
-  3.  Translate the internal format back into text.
-
-JSONB seeks to serve as the internal format directly - bypassing
-the first and third stages of that process.  Since most of the CPU
-cycles are spent on the first and third stages, that suggests that
-JSONB processing will be much faster than text JSON processing.
-
-So when processing JSONB, only the second stage of the three-stage
-process is required.  But when processing text JSON, it is still necessary
-to do stages one and three.  If JSONB is to be used as the internal
-binary representation, this is yet another reason to store numeric
-values as text.  Storing numbers as text minimizes the amount of
-conversion work needed for stages one and three.  This is also why
-there are four different representations of text in JSONB.  Different
-text representations are used for text coming from different sources
-(RFC-8259 JSON, JSON5, or SQL string values) and conversions only
-happen if and when they are actually needed.
-
-### 3.4 Valid JSONB BLOBs
-
-A valid JSONB BLOB consists of a single JSON element.  The element must
-exactly fill the BLOB.  This one element is often a JSON object or array
-and those usually contain additional elements as its payload, but the
-element can be a primite value such a string, number, boolean, or null.
-
-When the built-in JSON functions are attempting to determine if a BLOB
-argument is a JSONB or just a random BLOB, they look at the header of
-the outer element to see that it is well-formed and that the element
-completely fills the BLOB.  If these conditions are met, then the BLOB
-is accepted as a JSONB value.
@@ -683,7 +683,6 @@ other than that, the order of directives in Lemon is arbitrary.</p>
 <li><tt><a href='#pifdef'>%endif</a></tt>
 <li><tt><a href='#extraarg'>%extra_argument</a></tt>
 <li><tt><a href='#pfallback'>%fallback</a></tt>
-<li><tt><a href='#reallc'>%free</a></tt>
 <li><tt><a href='#pifdef'>%if</a></tt>
 <li><tt><a href='#pifdef'>%ifdef</a></tt>
 <li><tt><a href='#pifdef'>%ifndef</a></tt>
@@ -694,7 +693,6 @@ other than that, the order of directives in Lemon is arbitrary.</p>
 <li><tt><a href='#parse_accept'>%parse_accept</a></tt>
 <li><tt><a href='#parse_failure'>%parse_failure</a></tt>
 <li><tt><a href='#pright'>%right</a></tt>
-<li><tt><a href='#reallc'>%realloc</a></tt>
 <li><tt><a href='#stack_overflow'>%stack_overflow</a></tt>
 <li><tt><a href='#stack_size'>%stack_size</a></tt>
 <li><tt><a href='#start_symbol'>%start_symbol</a></tt>
@@ -1202,21 +1200,6 @@ match any input token.</p>
 the wildcard token and some other token, the other token is always used.
 The wildcard token is only matched if there are no alternatives.</p>

-<a id='reallc'></a>
-<h4>4.4.26 The <tt>%realloc</tt> and <tt>%free</tt> directives</h4>
-
-<p>The <tt>%realloc</tt> and <tt>%free</tt> directives defines function
-that allocate and free heap memory.  The signatures of these functions
-should be the same as the realloc() and free() functions from the standard
-C library.
-
-<p>If both of these functions are defined
-then these functions are used to allocate and free
-memory for supplemental parser stack space, if the initial
-parse stack space is exceeded.  The initial parser stack size
-is specified by either <tt>%stack_size</tt> or the
-DYYSTACKDEPTH compile-time flag.
-
 <a id='errors'></a>
 <h2>5.0 Error Processing</h2>

@@ -1241,7 +1224,6 @@ to begin parsing a new file.  This is what will happen at the very
 first syntax error, of course, if there are no instances of the
 "error" non-terminal in your grammar.</p>

-
 <a id='history'></a>
 <h2>6.0 History of Lemon</h2>

@@ -2,25 +2,6 @@

 # The testrunner.tcl Script

-<ul type=none>
-  <li> 1. <a href=#overview>Overview</a>
-  <li> 2. <a href=#binary_tests>Binary Tests</a>
-<ul type=none>
-  <li> 2.1. <a href=#organization_tests>Organization of Tcl Tests</a>
-  <li> 2.2. <a href=#run_tests>Commands to Run Tests</a>
-  <li> 2.3. <a href=#binary_test_failures>Investigating Binary Test Failures</a>
-</ul>
-  <li> 3. <a href=#source_code_tests>Source Tests</a>
-<ul type=none>
-  <li> 3.1. <a href=#commands_to_run_tests>Commands to Run SQLite Tests</a>
-  <li> 3.2. <a href=#zipvfs_tests>Running ZipVFS Tests</a>
-  <li> 3.3. <a href=#source_code_test_failures>Investigating Source Code Test Failures</a>
-</ul>
-  <li> 4. <a href=#testrunner_options>Extra testrunner.tcl Options</a>
-  <li> 5. <a href=#cpu_cores>Controlling CPU Core Utilization</a>
-</ul>
-
-<a name=overview></a>
 # 1. Overview

 testrunner.tcl is a Tcl script used to run multiple SQLite tests using 
@@ -28,18 +9,12 @@ multiple jobs. It supports the following types of tests:

  *  Tcl test scripts.

-  *  Tests run with `make` commands.  Examples:
-      -  `make mdevtest`
-      -  `make releasetest`
-      -  `make sdevtest`
-      -  `make testrunner`
+  *  Tests run with [make] commands. Specifically, at time of writing, 
+     [make fuzztest], [make mptest], [make sourcetest] and [make threadtest].

 testrunner.tcl pipes the output of all tests and builds run into log file
-**testrunner.log**, created in the current working directory. Search this
-file to find details of errors.  Suggested search commands:
-
-   *  `grep "^!" testrunner.log`
-   *  `grep failed testrunner.log`
+**testrunner.log**, created in the cwd directory. Searching this file for
+"failed" is a good way to find the output of a failed test.

 testrunner.tcl also populates SQLite database **testrunner.db**. This database
 contains details of all tests run, running and to be run. A useful query
@@ -65,17 +40,16 @@ Running:

 in another terminal is a good way to keep an eye on a long running test.

-Sometimes testrunner.tcl uses the `testfixture` binary that it is run with
+Sometimes testrunner.tcl uses the [testfixture] binary that it is run with
 to run tests (see "Binary Tests" below). Sometimes it builds testfixture and
 other binaries in specific configurations to test (see "Source Tests").

-<a name=binary_tests></a>
 # 2. Binary Tests

 The commands described in this section all run various combinations of the Tcl
-test scripts using the `testfixture` binary used to run the testrunner.tcl
+test scripts using the [testfixture] binary used to run the testrunner.tcl
 script (i.e. they do not invoke the compiler to build new binaries, or the
-`make` command to run tests that are not Tcl scripts). The procedure to run
+[make] command to run tests that are not Tcl scripts). The procedure to run
 these tests is therefore:

  1. Build the "testfixture" (or "testfixture.exe" for windows) binary using
@@ -87,7 +61,6 @@ these tests is therefore:
 The following sub-sections describe the various options that can be
 passed to testrunner.tcl to test binary testfixture builds.

-<a name=organization_tests></a>
 ## 2.1. Organization of Tcl Tests

 Tcl tests are stored in files that match the pattern *\*.test*. They are
@@ -118,7 +91,6 @@ Running **all** tests is to run all tests in the full test set, plus a dozen
 or so permutations. The specific permutations that are run as part of "all"
 are defined in file *testrunner_data.tcl*.

-<a name=run_tests></a>
 ## 2.2. Commands to Run Tests

 To run the "veryquick" test set, use either of the following:
@@ -142,12 +114,6 @@ a specified pattern (e.g. all tests that start with "fts5"), either of:
  ./testfixture $TESTDIR/testrunner.tcl 'fts5*'
 ```

-Strictly speaking, for a test to be run the pattern must match the script
-filename, not including the directory, using the rules of Tcl's 
-\[string match\] command. Except that before the matching is done, any "%"
-characters specified as part of the pattern are transformed to "\*".
-
-
 To run "all" tests (full + permutations):

 ```
@@ -175,7 +141,6 @@ Or, if the failure occured as part of a permutation:

 TODO: An example instead of "$PERMUTATION" and $PATH\_TO\_SCRIPT?

-<a name=source_code_tests></a>
 # 3. Source Code Tests

 The commands described in this section invoke the C compiler to build 
@@ -194,11 +159,10 @@ shell that supports SQLite 3.31.1 or newer via "package require sqlite3".

 TODO: ./configure + Makefile.msc build systems.

-<a name=commands_to_run_tests></a>
-## 3.1. Commands to Run SQLite Tests
+## Commands to Run SQLite Tests

 The **mdevtest** command is equivalent to running the veryquick tests and
-the `make fuzztest` target once for each of two --enable-all builds - one 
+the [make fuzztest] target once for each of two --enable-all builds - one 
 with debugging enabled and one without:

 ```
@@ -237,18 +201,7 @@ of the specific tests run.
  tclsh $TESTDIR/testrunner.tcl release
 ```

-As with <a href=#source code tests>source code tests</a>, one or more patterns
-may be appended to any of the above commands (mdevtest, sdevtest or release).
-In that case only Tcl tests (no fuzz or other tests) that match the specified
-pattern are run. For example, to run the just the Tcl rtree tests in all 
-builds and configurations supported by "release":
-
-```
-  tclsh $TESTDIR/testrunner.tcl release rtree%
-```
-
-<a name=zipvfs_tests></a>
-## 3.2. Running ZipVFS Tests
+## Running ZipVFS Tests

 testrunner.tcl can build a zipvfs-enabled testfixture and use it to run
 tests from the Zipvfs project with the following command:
@@ -264,8 +217,7 @@ test both SQLite and Zipvfs with a single command:
  tclsh $TESTDIR/testrunner.tcl --zipvfs $PATH_TO_ZIPVFS mdevtest
 ```

-<a name=source_code_test_failures></a>
-## 3.3. Investigating Source Code Test Failures
+## Investigating Source Code Test Failures

 Investigating a test failure that occurs during source code testing is a
 two step process:
@@ -288,45 +240,13 @@ a dos \*.bat file on windows. For example:
 ```

 The generated bash or \*.bat file script accepts a single argument - a makefile
-target to build. This may be used either to run a `make` command test directly,
+target to build. This may be used either to run a [make] command test directly,
 or else to build a testfixture (or testfixture.exe) binary with which to
 run a Tcl test script, as <a href=#binary_test_failures>described above</a>.

-<a name=testrunner_options></a>
-# 4. Extra testrunner.tcl Options

-The testrunner.tcl script options in this section may be used with both source
-code and binary tests.

-The **--buildonly** option instructs testrunner.tcl just to build the binaries
-required by a test, not to run any actual tests. For example:
-
-```
-  # Build binaries required by release test.
-  tclsh $TESTDIR/testrunner.tcl --buildonly release"
-```
-
-The **--dryrun** option prevents testrunner.tcl from building any binaries
-or running any tests. Instead, it just writes the shell commands that it
-would normally execute into the testrunner.log file. Example:
-
-```
-  # Log the shell commmands that make up the mdevtest test.
-  tclsh $TESTDIR/testrunner.tcl --dryrun mdevtest"
-```
-
-The **--explain** option is similar to --dryrun in that it prevents testrunner.tcl
-from building any binaries or running any tests.  The difference is that --explain
-prints on standard output a human-readable summary of all the builds and tests that
-would have been run.
-
-```
-  # Show what builds and tests would have been run
-  tclsh $TESTDIR/testrunner.tcl --explain mdevtest
-```
-
-<a name=cpu_cores></a>
-# 5. Controlling CPU Core Utilization
+# 4. Controlling CPU Core Utilization

 When running either binary or source code tests, testrunner.tcl reports the
 number of jobs it intends to use to stdout. e.g.
@@ -354,3 +274,11 @@ testrunner.log and testrunner.db files:
 ```
  $ ./testfixture $TESTDIR/testrunner.tcl njob $NEW_NUMBER_OF_JOBS
 ```
+
+
+
+
+
+
+
+
@@ -24,13 +24,8 @@
 # include <stdlib.h>
 # include <limits.h>
 # include <assert.h>
-# include "sqlite3.h"
-#endif
-#ifndef HAVE_CONSOLE_IO_H
 # include "console_io.h"
-#endif
-#if defined(_MSC_VER)
-# pragma warning(disable : 4204)
+# include "sqlite3.h"
 #endif

 #ifndef SQLITE_CIO_NO_TRANSLATE
@@ -53,6 +48,11 @@
 # define CIO_WIN_WC_XLATE 0 /* Not exposing translation routines at all */
 #endif

+#if CIO_WIN_WC_XLATE
+/* Character used to represent a known-incomplete UTF-8 char group (�) */
+static WCHAR cBadGroup = 0xfffd;
+#endif
+
 #if CIO_WIN_WC_XLATE
 static HANDLE handleOfFile(FILE *pf){
  int fileDesc = _fileno(pf);
@@ -125,10 +125,6 @@ static short streamOfConsole(FILE *pf, /* out */ PerStreamTags *ppst){
 # endif
 }

-# ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
-#  define ENABLE_VIRTUAL_TERMINAL_PROCESSING  (0x4)
-# endif
-
 # if CIO_WIN_WC_XLATE
 /* Define console modes for use with the Windows Console API. */
 #  define SHELL_CONI_MODE \
@@ -553,11 +549,12 @@ zSkipValidUtf8(const char *z, int nAccept, long ccm){
 #endif /*!(defined(SQLITE_CIO_NO_UTF8SCAN)&&defined(SQLITE_CIO_NO_TRANSLATE))*/

 #ifndef SQLITE_CIO_NO_TRANSLATE
-# ifdef CONSIO_SPUTB
+
+#ifdef CONSIO_SPUTB
 SQLITE_INTERNAL_LINKAGE int
 fPutbUtf8(FILE *pfO, const char *cBuf, int nAccept){
  assert(pfO!=0);
-#  if CIO_WIN_WC_XLATE
+# if CIO_WIN_WC_XLATE
  PerStreamTags pst = PST_INITIALIZER; /* for unknown streams */
  PerStreamTags *ppst = getEmitStreamInfo(0, &pst, &pfO);
  if( pstReachesConsole(ppst) ){
@@ -567,13 +564,13 @@ fPutbUtf8(FILE *pfO, const char *cBuf, int nAccept){
    if( 0 == isKnownWritable(ppst->pf) ) restoreConsoleArb(ppst);
    return rv;
  }else {
-#  endif
-    return (int)fwrite(cBuf, 1, nAccept, pfO);
-#  if CIO_WIN_WC_XLATE
-  }
-#  endif
-}
 # endif
+    return (int)fwrite(cBuf, 1, nAccept, pfO);
+# if CIO_WIN_WC_XLATE
+  }
+# endif
+}
+#endif /* defined(CONSIO_SPUTB) */

 SQLITE_INTERNAL_LINKAGE int
 oPutbUtf8(const char *cBuf, int nAccept){
@@ -595,93 +592,6 @@ oPutbUtf8(const char *cBuf, int nAccept){
 # endif
 }

-/*
-** Flush the given output stream. Return non-zero for success, else 0.
-*/
-#if !defined(SQLITE_CIO_NO_FLUSH) && !defined(SQLITE_CIO_NO_SETMODE)
-SQLITE_INTERNAL_LINKAGE int
-fFlushBuffer(FILE *pfOut){
-# if CIO_WIN_WC_XLATE && !defined(SHELL_OMIT_FIO_DUPE)
-  return FlushFileBuffers(handleOfFile(pfOut))? 1 : 0;
-# else
-  return fflush(pfOut);
-# endif
-}
-#endif
-
-#if CIO_WIN_WC_XLATE \
-   && !defined(SHELL_OMIT_FIO_DUPE) \
-   && defined(SQLITE_USE_ONLY_WIN32)
-static struct FileAltIds {
-  int fd;
-  HANDLE fh;
-} altIdsOfFile(FILE *pf){
-  struct FileAltIds rv = { _fileno(pf) };
-  union { intptr_t osfh; HANDLE fh; } fid = {
-    (rv.fd>=0)? _get_osfhandle(rv.fd) : (intptr_t)INVALID_HANDLE_VALUE
-  };
-  rv.fh = fid.fh;
-  return rv;
-}
-
-SQLITE_INTERNAL_LINKAGE size_t
-cfWrite(const void *buf, size_t osz, size_t ocnt, FILE *pf){
-  size_t rv = 0;
-  struct FileAltIds fai = altIdsOfFile(pf);
-  int fmode = _setmode(fai.fd, _O_BINARY);
-  _setmode(fai.fd, fmode);
-  while( rv < ocnt ){
-    size_t nbo = osz;
-    while( nbo > 0 ){
-      DWORD dwno = (nbo>(1L<<24))? 1L<<24 : (DWORD)nbo;
-      BOOL wrc = TRUE;
-      BOOL genCR = (fmode & _O_TEXT)!=0;
-      if( genCR ){
-        const char *pnl = (const char*)memchr(buf, '\n', nbo);
-        if( pnl ) nbo = pnl - (const char*)buf;
-        else genCR = 0;
-      }
-      if( dwno>0 ) wrc = WriteFile(fai.fh, buf, dwno, 0,0);
-      if( genCR && wrc ){
-        wrc = WriteFile(fai.fh, "\r\n", 2, 0,0);
-        ++dwno; /* Skip over the LF */
-      }
-      if( !wrc ) return rv;
-      buf = (const char*)buf + dwno;
-      nbo += dwno;
-    }
-    ++rv;
-  }
-  return rv;
-}
-
-/* An fgets() equivalent, using Win32 file API for actual input.
-** Input ends when given buffer is filled or a newline is read.
-** If the FILE object is in text mode, swallows 0x0D. (ASCII CR)
-*/
-SQLITE_INTERNAL_LINKAGE char *
-cfGets(char *cBuf, int n, FILE *pf){
-  int nci = 0;
-  struct FileAltIds fai = altIdsOfFile(pf);
-  int fmode = _setmode(fai.fd, _O_BINARY);
-  BOOL eatCR = (fmode & _O_TEXT)!=0;
-  _setmode(fai.fd, fmode);
-  while( nci < n-1 ){
-    DWORD nr;
-    if( !ReadFile(fai.fh, cBuf+nci, 1, &nr, 0) || nr==0 ) break;
-    if( nr>0 && (!eatCR || cBuf[nci]!='\r') ){
-      nci += nr;
-      if( cBuf[nci-nr]=='\n' ) break;
-    }
-  }
-  if( nci < n ) cBuf[nci] = 0;
-  return (nci>0)? cBuf : 0;
-}
-# else
-#  define cfWrite(b,os,no,f) fwrite(b,os,no,f)
-#  define cfGets(b,n,f) fgets(b,n,f)
-# endif
-
 # ifdef CONSIO_EPUTB
 SQLITE_INTERNAL_LINKAGE int
 ePutbUtf8(const char *cBuf, int nAccept){
@@ -693,7 +603,7 @@ ePutbUtf8(const char *cBuf, int nAccept){
    return conZstrEmit(ppst, cBuf, nAccept);
  }else {
 #  endif
-    return (int)cfWrite(cBuf, 1, nAccept, pfErr);
+    return (int)fwrite(cBuf, 1, nAccept, pfErr);
 #  if CIO_WIN_WC_XLATE
  }
 #  endif
@@ -759,15 +669,11 @@ SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn){
 #  endif
  }else{
 # endif
-    return cfGets(cBuf, ncMax, pfIn);
+    return fgets(cBuf, ncMax, pfIn);
 # if CIO_WIN_WC_XLATE
  }
 # endif
 }
 #endif /* !defined(SQLITE_CIO_NO_TRANSLATE) */

-#if defined(_MSC_VER)
-# pragma warning(default : 4204)
-#endif
-
 #undef SHELL_INVALID_FILE_PTR
@@ -28,7 +28,7 @@
 ** CIO_WIN_WC_XLATE is defined as 0 or 1, reflecting whether console I/O
 ** translation for Windows is effected for the build.
 */
-#define HAVE_CONSOLE_IO_H 1
+
 #ifndef SQLITE_INTERNAL_LINKAGE
 # define SQLITE_INTERNAL_LINKAGE extern /* external to translation unit */
 # include <stdio.h>
@@ -166,8 +166,8 @@ SQLITE_INTERNAL_LINKAGE int ePutsUtf8(const char *z);
 #ifdef CONSIO_SPUTB
 SQLITE_INTERNAL_LINKAGE int
 fPutbUtf8(FILE *pfOut, const char *cBuf, int nAccept);
-/* Like fPutbUtf8 except stream is always the designated output. */
 #endif
+/* Like fPutbUtf8 except stream is always the designated output. */
 SQLITE_INTERNAL_LINKAGE int
 oPutbUtf8(const char *cBuf, int nAccept);
 /* Like fPutbUtf8 except stream is always the designated error. */
@@ -176,19 +176,12 @@ SQLITE_INTERNAL_LINKAGE int
 ePutbUtf8(const char *cBuf, int nAccept);
 #endif

-/*
-** Flush the given output stream. Return non-zero for success, else 0.
-*/
-#if !defined(SQLITE_CIO_NO_FLUSH) && !defined(SQLITE_CIO_NO_SETMODE)
-SQLITE_INTERNAL_LINKAGE int
-fFlushBuffer(FILE *pfOut);
-#endif
-
 /*
 ** Collect input like fgets(...) with special provisions for input
-** from the console on such platforms as require same. Newline
-** translation may be done as set by set{Binary,Text}Mode().
-** As a convenience, pfIn==NULL is treated as stdin.
+** from the console on platforms that require same. Defers to the
+** C library fgets() when input is not from the console. Newline
+** translation may be done as set by set{Binary,Text}Mode(). As a
+** convenience, pfIn==NULL is treated as stdin.
 */
 SQLITE_INTERNAL_LINKAGE char* fGetsUtf8(char *cBuf, int ncMax, FILE *pfIn);
 /* Like fGetsUtf8 except stream is always the designated input. */
@@ -8,7 +8,6 @@
 #    May you share freely, never taking more than you give.
 #
 #***********************************************************************
-# TESTRUNNER: shell
 #
 # The focus of this file is testing the CLI shell tool. Specifically,
 # the ".recommend" command.
@@ -465,13 +464,6 @@ do_execsql_test 5.3 {
  t2 t2_idx_0001295b {100 20 5}
 }

-do_catchsql_test 5.4 {
-  SELECT sqlite_expert_rem(123, 123);
-} {1 {no such function: sqlite_expert_rem}}
-do_catchsql_test 5.5 {
-  SELECT sqlite_expert_sample();
-} {1 {no such function: sqlite_expert_sample}}
-
 if 0 {
 do_test expert1-6.0 {
  catchcmd :memory: {
@@ -626,7 +626,7 @@ static int expertFilter(
  pCsr->pData = 0;
  if( rc==SQLITE_OK ){
    rc = idxPrintfPrepareStmt(pExpert->db, &pCsr->pData, &pVtab->base.zErrMsg,
-        "SELECT * FROM main.%Q WHERE sqlite_expert_sample()", pVtab->pTab->zName
+        "SELECT * FROM main.%Q WHERE sample()", pVtab->pTab->zName
    );
  }

@@ -1500,7 +1500,7 @@ struct IdxRemCtx {
 };

 /*
-** Implementation of scalar function sqlite_expert_rem().
+** Implementation of scalar function rem().
 */
 static void idxRemFunc(
  sqlite3_context *pCtx,
@@ -1513,7 +1513,7 @@ static void idxRemFunc(
  assert( argc==2 );

  iSlot = sqlite3_value_int(argv[0]);
-  assert( iSlot<p->nSlot );
+  assert( iSlot<=p->nSlot );
  pSlot = &p->aSlot[iSlot];

  switch( pSlot->eType ){
@@ -1624,8 +1624,7 @@ static int idxPopulateOneStat1(
    const char *zName = (const char*)sqlite3_column_text(pIndexXInfo, 0);
    const char *zColl = (const char*)sqlite3_column_text(pIndexXInfo, 1);
    zCols = idxAppendText(&rc, zCols, 
-        "%sx.%Q IS sqlite_expert_rem(%d, x.%Q) COLLATE %s", 
-        zComma, zName, nCol, zName, zColl
+        "%sx.%Q IS rem(%d, x.%Q) COLLATE %s", zComma, zName, nCol, zName, zColl
    );
    zOrder = idxAppendText(&rc, zOrder, "%s%d", zComma, ++nCol);
  }
@@ -1758,13 +1757,13 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){

  if( rc==SQLITE_OK ){
    sqlite3 *dbrem = (p->iSample==100 ? p->db : p->dbv);
-    rc = sqlite3_create_function(dbrem, "sqlite_expert_rem", 
-        2, SQLITE_UTF8, (void*)pCtx, idxRemFunc, 0, 0
+    rc = sqlite3_create_function(
+        dbrem, "rem", 2, SQLITE_UTF8, (void*)pCtx, idxRemFunc, 0, 0
    );
  }
  if( rc==SQLITE_OK ){
-    rc = sqlite3_create_function(p->db, "sqlite_expert_sample", 
-        0, SQLITE_UTF8, (void*)&samplectx, idxSampleFunc, 0, 0
+    rc = sqlite3_create_function(
+        p->db, "sample", 0, SQLITE_UTF8, (void*)&samplectx, idxSampleFunc, 0, 0
    );
  }

@@ -1816,9 +1815,6 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){
    rc = sqlite3_exec(p->dbm, "ANALYZE sqlite_schema", 0, 0, 0);
  }

-  sqlite3_create_function(p->db, "sqlite_expert_rem", 2, SQLITE_UTF8, 0,0,0,0);
-  sqlite3_create_function(p->db, "sqlite_expert_sample", 0,SQLITE_UTF8,0,0,0,0);
-
  sqlite3_exec(p->db, "DROP TABLE IF EXISTS temp."UNIQUE_TABLE_NAME,0,0,0);
  return rc;
 }
@@ -1952,7 +1948,7 @@ sqlite3expert *sqlite3_expert_new(sqlite3 *db, char **pzErrmsg){
    sqlite3_stmt *pSql = 0;
    rc = idxPrintfPrepareStmt(pNew->db, &pSql, pzErrmsg, 
        "SELECT sql FROM sqlite_schema WHERE name NOT LIKE 'sqlite_%%'"
-        " AND sql NOT LIKE 'CREATE VIRTUAL %%' ORDER BY rowid"
+        " AND sql NOT LIKE 'CREATE VIRTUAL %%'"
    );
    while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pSql) ){
      const char *zSql = (const char*)sqlite3_column_text(pSql, 0);
@@ -16,7 +16,15 @@
 #include "sqlite3expert.h"
 #include <assert.h>
 #include <string.h>
-#include "tclsqlite.h"
+
+#if defined(INCLUDE_SQLITE_TCL_H)
+#  include "sqlite_tcl.h"
+#else
+#  include "tcl.h"
+#  ifndef SQLITE_TCLAPI
+#    define SQLITE_TCLAPI
+#  endif
+#endif

 #ifndef SQLITE_OMIT_VIRTUALTABLE

@@ -4006,7 +4006,7 @@ static int fts3ShadowName(const char *zName){
 ** Implementation of the xIntegrity() method on the FTS3/FTS4 virtual
 ** table.
 */
-static int fts3IntegrityMethod(
+static int fts3Integrity(
  sqlite3_vtab *pVtab,      /* The virtual table to be checked */
  const char *zSchema,      /* Name of schema in which pVtab lives */
  const char *zTabname,     /* Name of the pVTab table */
@@ -4014,24 +4014,31 @@ static int fts3IntegrityMethod(
  char **pzErr              /* Write error message here */
 ){
  Fts3Table *p = (Fts3Table*)pVtab;
-  int rc = SQLITE_OK;
-  int bOk = 0;
+  char *zSql;
+  int rc;
+  char *zErr = 0;

+  assert( pzErr!=0 );
+  assert( *pzErr==0 );
  UNUSED_PARAMETER(isQuick);
-  rc = sqlite3Fts3IntegrityCheck(p, &bOk);
-  assert( rc!=SQLITE_CORRUPT_VTAB );
-  if( rc==SQLITE_ERROR || (rc&0xFF)==SQLITE_CORRUPT ){
-    *pzErr = sqlite3_mprintf("unable to validate the inverted index for"
-                             " FTS%d table %s.%s: %s",
-                p->bFts4 ? 4 : 3, zSchema, zTabname, sqlite3_errstr(rc));
-    if( *pzErr ) rc = SQLITE_OK;
-  }else if( rc==SQLITE_OK && bOk==0 ){
+  zSql = sqlite3_mprintf(
+            "INSERT INTO \"%w\".\"%w\"(\"%w\") VALUES('integrity-check');",
+            zSchema, zTabname, zTabname);
+  if( zSql==0 ){
+    return SQLITE_NOMEM;
+  }
+  rc = sqlite3_exec(p->db, zSql, 0, 0, &zErr);
+  sqlite3_free(zSql);
+  if( (rc&0xff)==SQLITE_CORRUPT ){
    *pzErr = sqlite3_mprintf("malformed inverted index for FTS%d table %s.%s",
                p->bFts4 ? 4 : 3, zSchema, zTabname);
-    if( *pzErr==0 ) rc = SQLITE_NOMEM;
+  }else if( rc!=SQLITE_OK ){
+    *pzErr = sqlite3_mprintf("unable to validate the inverted index for"
+                             " FTS%d table %s.%s: %s",
+                p->bFts4 ? 4 : 3, zSchema, zTabname, zErr);
  }
-  sqlite3Fts3SegmentsClose(p);
-  return rc;
+  sqlite3_free(zErr);
+  return SQLITE_OK;
 }


@@ -4061,7 +4068,7 @@ static const sqlite3_module fts3Module = {
  /* xRelease      */ fts3ReleaseMethod,
  /* xRollbackTo   */ fts3RollbackToMethod,
  /* xShadowName   */ fts3ShadowName,
-  /* xIntegrity    */ fts3IntegrityMethod,
+  /* xIntegrity    */ fts3Integrity,
 };

 /*
@@ -653,7 +653,5 @@ int sqlite3FtsUnicodeIsdiacritic(int);

 int sqlite3Fts3ExprIterate(Fts3Expr*, int (*x)(Fts3Expr*,int,void*), void*);

-int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk);
-
 #endif /* !SQLITE_CORE || SQLITE_ENABLE_FTS3 */
 #endif /* _FTSINT_H */
@@ -398,7 +398,6 @@ static int fts3SnippetNextCandidate(SnippetIter *pIter){
      return 1;
    }

-    assert( pIter->nSnippet>=0 );
    pIter->iCurrent = iStart = iEnd - pIter->nSnippet + 1;
    for(i=0; i<pIter->nPhrase; i++){
      SnippetPhrase *pPhrase = &pIter->aPhrase[i];
@@ -447,7 +446,7 @@ static void fts3SnippetDetails(
        }
        mCover |= mPhrase;

-        for(j=0; j<pPhrase->nToken && j<pIter->nSnippet; j++){
+        for(j=0; j<pPhrase->nToken; j++){
          mHighlight |= (mPos>>j);
        }

@@ -78,8 +78,6 @@ static int fts3termConnectMethod(
    iIndex = atoi(argv[4]);
    argc--;
  }
-  
-  *ppVtab = 0;

  /* The user should specify a single argument - the name of an fts3 table. */
  if( argc!=4 ){
@@ -97,17 +95,12 @@ static int fts3termConnectMethod(
  rc = sqlite3_declare_vtab(db, FTS3_TERMS_SCHEMA);
  if( rc!=SQLITE_OK ) return rc;

-  nByte = sizeof(Fts3termTable);
-  p = (Fts3termTable *)sqlite3Fts3MallocZero(nByte);
+  nByte = sizeof(Fts3termTable) + sizeof(Fts3Table) + nDb + nFts3 + 2;
+  p = (Fts3termTable *)sqlite3_malloc64(nByte);
  if( !p ) return SQLITE_NOMEM;
+  memset(p, 0, (size_t)nByte);

-  p->pFts3Tab = (Fts3Table*)sqlite3Fts3MallocZero(
-      sizeof(Fts3Table) + nDb + nFts3 + 2
-  );
-  if( p->pFts3Tab==0 ){
-    sqlite3_free(p);
-    return SQLITE_NOMEM;
-  }
+  p->pFts3Tab = (Fts3Table *)&p[1];
  p->pFts3Tab->zDb = (char *)&p->pFts3Tab[1];
  p->pFts3Tab->zName = &p->pFts3Tab->zDb[nDb+1];
  p->pFts3Tab->db = db;
@@ -137,7 +130,6 @@ static int fts3termDisconnectMethod(sqlite3_vtab *pVtab){
    sqlite3_finalize(pFts3->aStmt[i]);
  }
  sqlite3_free(pFts3->zSegmentsTbl);
-  sqlite3_free(pFts3);
  sqlite3_free(p);
  return SQLITE_OK;
 }
@@ -18,7 +18,14 @@
 ** that the sqlite3_tokenizer_module.xLanguage() method is invoked correctly.
 */

-#include "tclsqlite.h"
+#if defined(INCLUDE_SQLITE_TCL_H)
+#  include "sqlite_tcl.h"
+#else
+#  include "tcl.h"
+#  ifndef SQLITE_TCLAPI
+#    define SQLITE_TCLAPI
+#  endif
+#endif
 #include <string.h>
 #include <assert.h>

@@ -160,8 +167,7 @@ static int SQLITE_TCLAPI fts3_near_match_cmd(
  Tcl_Obj *pPhrasecount = 0;
  
  Tcl_Obj **apExprToken;
-  Tcl_Size nExprToken;
-  Tcl_Size nn;
+  int nExprToken;

  UNUSED_PARAMETER(clientData);

@@ -195,25 +201,23 @@ static int SQLITE_TCLAPI fts3_near_match_cmd(
    }
  }

-  rc = Tcl_ListObjGetElements(interp, objv[1], &nn, &apDocToken);
-  doc.nToken = (int)nn;
+  rc = Tcl_ListObjGetElements(interp, objv[1], &doc.nToken, &apDocToken);
  if( rc!=TCL_OK ) goto near_match_out;
  doc.aToken = (NearToken *)ckalloc(doc.nToken*sizeof(NearToken));
  for(ii=0; ii<doc.nToken; ii++){
-    doc.aToken[ii].z = Tcl_GetStringFromObj(apDocToken[ii], &nn);
-    doc.aToken[ii].n = (int)nn;
+    doc.aToken[ii].z = Tcl_GetStringFromObj(apDocToken[ii], &doc.aToken[ii].n);
  }

  rc = Tcl_ListObjGetElements(interp, objv[2], &nExprToken, &apExprToken);
  if( rc!=TCL_OK ) goto near_match_out;

-  nPhrase = (int)(nExprToken + 1) / 2;
+  nPhrase = (nExprToken + 1) / 2;
  aPhrase = (NearPhrase *)ckalloc(nPhrase * sizeof(NearPhrase));
  memset(aPhrase, 0, nPhrase * sizeof(NearPhrase));
  for(ii=0; ii<nPhrase; ii++){
    Tcl_Obj *pPhrase = apExprToken[ii*2];
    Tcl_Obj **apToken;
-    Tcl_Size nToken;
+    int nToken;
    int jj;

    rc = Tcl_ListObjGetElements(interp, pPhrase, &nToken, &apToken);
@@ -223,12 +227,11 @@ static int SQLITE_TCLAPI fts3_near_match_cmd(
      rc = TCL_ERROR;
      goto near_match_out;
    }
-    for(jj=0; jj<(int)nToken; jj++){
+    for(jj=0; jj<nToken; jj++){
      NearToken *pT = &aPhrase[ii].aToken[jj];
-      pT->z = Tcl_GetStringFromObj(apToken[jj], &nn);
-      pT->n = (int)nn;
+      pT->z = Tcl_GetStringFromObj(apToken[jj], &pT->n);
    }
-    aPhrase[ii].nToken = (int)nToken;
+    aPhrase[ii].nToken = nToken;
  }
  for(ii=1; ii<nPhrase; ii++){
    Tcl_Obj *pNear = apExprToken[2*ii-1];
@@ -226,7 +226,11 @@ int sqlite3Fts3InitTokenizer(

 #ifdef SQLITE_TEST

-#include "tclsqlite.h"
+#if defined(INCLUDE_SQLITE_TCL_H)
+#  include "sqlite_tcl.h"
+#else
+#  include "tcl.h"
+#endif
 #include <string.h>

 /*
@@ -5294,7 +5294,7 @@ static u64 fts3ChecksumIndex(
 ** If an error occurs (e.g. an OOM or IO error), return an SQLite error 
 ** code. The final value of *pbOk is undefined in this case.
 */
-int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk){
+static int fts3IntegrityCheck(Fts3Table *p, int *pbOk){
  int rc = SQLITE_OK;             /* Return code */
  u64 cksum1 = 0;                 /* Checksum based on FTS index contents */
  u64 cksum2 = 0;                 /* Checksum based on %_content contents */
@@ -5372,12 +5372,7 @@ int sqlite3Fts3IntegrityCheck(Fts3Table *p, int *pbOk){
    sqlite3_finalize(pStmt);
  }

-  if( rc==SQLITE_CORRUPT_VTAB ){
-    rc = SQLITE_OK;
-    *pbOk = 0;
-  }else{
-    *pbOk = (rc==SQLITE_OK && cksum1==cksum2);
-  }
+  *pbOk = (cksum1==cksum2);
  return rc;
 }

@@ -5417,7 +5412,7 @@ static int fts3DoIntegrityCheck(
 ){
  int rc;
  int bOk = 0;
-  rc = sqlite3Fts3IntegrityCheck(p, &bOk);
+  rc = fts3IntegrityCheck(p, &bOk);
  if( rc==SQLITE_OK && bOk==0 ) rc = FTS_CORRUPT_VTAB;
  return rc;
 }
@@ -628,9 +628,6 @@ proc print_categories {lMap} {
        $caseP
        $caseS
        $caseZ
-
-        default:
-          return 1;
      }
      return 0;
    }
@@ -82,7 +82,7 @@ proc get_struct_docs {data names} {
        set current_doc ""
      }
      set subject n/a
-      regexp {^ *([[:alnum:]_]*)} $line -> subject
+      regexp {^ *([[:alpha:]]*)} $line -> subject
      if {[lsearch $names $subject]>=0} {
        set current_header $subject
      } else {
@@ -108,11 +108,8 @@ proc get_tokenizer_docs {data} {
      append res "<dt><b>$line</b></dt><dd><p style=margin-top:0>\n"
      continue
    }
-    if {[regexp {FTS5_TOKENIZER} $line]} {
-      set line </dl><p>
-    }
    if {[regexp {SYNONYM SUPPORT} $line]} {
-      set line "<h3>Synonym Support</h3>"
+      set line "</dl><h3>Synonym Support</h3>"
    }
    if {[string trim $line] == ""} {
      append res "<p>\n"
@@ -226,12 +223,10 @@ proc main {data} {
    Fts5ExtensionApi {
      set struct [get_fts5_struct $data "^struct Fts5ExtensionApi" "^.;"]
      set map [list]
-      set lKey [list]
      foreach {k v} [get_struct_members $data] {
        if {[string match x* $k]==0} continue
-        lappend lKey $k
+        lappend map $k "<a href=#$k>$k</a>"
      }
-      foreach k [lsort -decr $lKey] { lappend map $k "<a href=#$k>$k</a>" }
      output [string map $map $struct]
    }

@@ -55,8 +55,8 @@ struct Fts5PhraseIter {
 ** EXTENSION API FUNCTIONS
 **
 ** xUserData(pFts):
-**   Return a copy of the pUserData pointer passed to the xCreateFunction()
-**   API when the extension function was registered.
+**   Return a copy of the context pointer the extension function was 
+**   registered with.
 **
 ** xColumnTotalSize(pFts, iCol, pnToken):
 **   If parameter iCol is less than zero, set output variable *pnToken
@@ -88,11 +88,8 @@ struct Fts5PhraseIter {
 **   created with the "columnsize=0" option.
 **
 ** xColumnText:
-**   If parameter iCol is less than zero, or greater than or equal to the
-**   number of columns in the table, SQLITE_RANGE is returned. 
-**
-**   Otherwise, this function attempts to retrieve the text of column iCol of
-**   the current document. If successful, (*pz) is set to point to a buffer
+**   This function attempts to retrieve the text of column iCol of the
+**   current document. If successful, (*pz) is set to point to a buffer
 **   containing the text in utf-8 encoding, (*pn) is set to the size in bytes
 **   (not characters) of the buffer and SQLITE_OK is returned. Otherwise,
 **   if an error occurs, an SQLite error code is returned and the final values
@@ -102,10 +99,8 @@ struct Fts5PhraseIter {
 **   Returns the number of phrases in the current query expression.
 **
 ** xPhraseSize:
-**   If parameter iCol is less than zero, or greater than or equal to the
-**   number of phrases in the current query, as returned by xPhraseCount, 
-**   0 is returned. Otherwise, this function returns the number of tokens in
-**   phrase iPhrase of the query. Phrases are numbered starting from zero.
+**   Returns the number of tokens in phrase iPhrase of the query. Phrases
+**   are numbered starting from zero.
 **
 ** xInstCount:
 **   Set *pnInst to the total number of occurrences of all phrases within
@@ -121,13 +116,12 @@ struct Fts5PhraseIter {
 **   Query for the details of phrase match iIdx within the current row.
 **   Phrase matches are numbered starting from zero, so the iIdx argument
 **   should be greater than or equal to zero and smaller than the value
-**   output by xInstCount(). If iIdx is less than zero or greater than
-**   or equal to the value returned by xInstCount(), SQLITE_RANGE is returned.
+**   output by xInstCount().
 **
-**   Otherwise, output parameter *piPhrase is set to the phrase number, *piCol
+**   Usually, output parameter *piPhrase is set to the phrase number, *piCol
 **   to the column in which it occurs and *piOff the token offset of the
-**   first token of the phrase. SQLITE_OK is returned if successful, or an
-**   error code (i.e. SQLITE_NOMEM) if an error occurs.
+**   first token of the phrase. Returns SQLITE_OK if successful, or an error
+**   code (i.e. SQLITE_NOMEM) if an error occurs.
 **
 **   This API can be quite slow if used with an FTS5 table created with the
 **   "detail=none" or "detail=column" option. 
@@ -153,10 +147,6 @@ struct Fts5PhraseIter {
 **   Invoking Api.xUserData() returns a copy of the pointer passed as 
 **   the third argument to pUserData.
 **
-**   If parameter iPhrase is less than zero, or greater than or equal to
-**   the number of phrases in the query, as returned by xPhraseCount(),
-**   this function returns SQLITE_RANGE.
-**
 **   If the callback function returns any value other than SQLITE_OK, the
 **   query is abandoned and the xQueryPhrase function returns immediately.
 **   If the returned value is SQLITE_DONE, xQueryPhrase returns SQLITE_OK.
@@ -238,10 +228,6 @@ struct Fts5PhraseIter {
 **   (i.e. if it is a contentless table), then this API always iterates
 **   through an empty set (all calls to xPhraseFirst() set iCol to -1).
 **
-**   In all cases, matches are visited in (column ASC, offset ASC) order.
-**   i.e. all those in column 0, sorted by offset, followed by those in 
-**   column 1, etc.
-**
 ** xPhraseNext()
 **   See xPhraseFirst above.
 **
@@ -275,65 +261,9 @@ struct Fts5PhraseIter {
 **
 ** xPhraseNextColumn()
 **   See xPhraseFirstColumn above.
-**
-** xQueryToken(pFts5, iPhrase, iToken, ppToken, pnToken)
-**   This is used to access token iToken of phrase iPhrase of the current
-**   query. Before returning, output parameter *ppToken is set to point
-**   to a buffer containing the requested token, and *pnToken to the
-**   size of this buffer in bytes.
-**
-**   If iPhrase or iToken are less than zero, or if iPhrase is greater than
-**   or equal to the number of phrases in the query as reported by 
-**   xPhraseCount(), or if iToken is equal to or greater than the number of
-**   tokens in the phrase, SQLITE_RANGE is returned and *ppToken and *pnToken
-     are both zeroed.
-**
-**   The output text is not a copy of the query text that specified the
-**   token. It is the output of the tokenizer module. For tokendata=1
-**   tables, this includes any embedded 0x00 and trailing data.
-**
-** xInstToken(pFts5, iIdx, iToken, ppToken, pnToken)
-**   This is used to access token iToken of phrase hit iIdx within the
-**   current row. If iIdx is less than zero or greater than or equal to the
-**   value returned by xInstCount(), SQLITE_RANGE is returned.  Otherwise,
-**   output variable (*ppToken) is set to point to a buffer containing the
-**   matching document token, and (*pnToken) to the size of that buffer in 
-**   bytes. This API is not available if the specified token matches a 
-**   prefix query term. In that case both output variables are always set 
-**   to 0.
-**
-**   The output text is not a copy of the document text that was tokenized.
-**   It is the output of the tokenizer module. For tokendata=1 tables, this 
-**   includes any embedded 0x00 and trailing data.
-**
-**   This API can be quite slow if used with an FTS5 table created with the
-**   "detail=none" or "detail=column" option.
-**
-** xColumnLocale(pFts5, iIdx, pzLocale, pnLocale)
-**   If parameter iCol is less than zero, or greater than or equal to the
-**   number of columns in the table, SQLITE_RANGE is returned.
-**
-**   Otherwise, this function attempts to retrieve the locale associated
-**   with column iCol of the current row. Usually, there is no associated
-**   locale, and output parameters (*pzLocale) and (*pnLocale) are set
-**   to NULL and 0, respectively. However, if the fts5_locale() function
-**   was used to associate a locale with the value when it was inserted
-**   into the fts5 table, then (*pzLocale) is set to point to a nul-terminated
-**   buffer containing the name of the locale in utf-8 encoding. (*pnLocale) 
-**   is set to the size in bytes of the buffer, not including the 
-**   nul-terminator.
-**
-**   If successful, SQLITE_OK is returned. Or, if an error occurs, an
-**   SQLite error code is returned. The final value of the output parameters
-**   is undefined in this case.
-**
-** xTokenize_v2:
-**   Tokenize text using the tokenizer belonging to the FTS5 table. This
-**   API is the same as the xTokenize() API, except that it allows a tokenizer
-**   locale to be specified.
 */
 struct Fts5ExtensionApi {
-  int iVersion;                   /* Currently always set to 4 */
+  int iVersion;                   /* Currently always set to 2 */

  void *(*xUserData)(Fts5Context*);

@@ -368,22 +298,6 @@ struct Fts5ExtensionApi {

  int (*xPhraseFirstColumn)(Fts5Context*, int iPhrase, Fts5PhraseIter*, int*);
  void (*xPhraseNextColumn)(Fts5Context*, Fts5PhraseIter*, int *piCol);
-
-  /* Below this point are iVersion>=3 only */
-  int (*xQueryToken)(Fts5Context*, 
-      int iPhrase, int iToken, 
-      const char **ppToken, int *pnToken
-  );
-  int (*xInstToken)(Fts5Context*, int iIdx, int iToken, const char**, int*);
-
-  /* Below this point are iVersion>=4 only */
-  int (*xColumnLocale)(Fts5Context*, int iCol, const char **pz, int *pn);
-  int (*xTokenize_v2)(Fts5Context*,
-    const char *pText, int nText,      /* Text to tokenize */
-    const char *pLocale, int nLocale,  /* Locale to pass to tokenizer */
-    void *pCtx,                        /* Context passed to xToken() */
-    int (*xToken)(void*, int, const char*, int, int, int)       /* Callback */
-  );
 };

 /* 
@@ -396,7 +310,6 @@ struct Fts5ExtensionApi {
 ** Applications may also register custom tokenizer types. A tokenizer 
 ** is registered by providing fts5 with a populated instance of the 
 ** following structure. All structure methods must be defined, setting
-**
 ** any member of the fts5_tokenizer struct to NULL leads to undefined
 ** behaviour. The structure methods are expected to function as follows:
 **
@@ -405,7 +318,7 @@ struct Fts5ExtensionApi {
 **   A tokenizer instance is required to actually tokenize text.
 **
 **   The first argument passed to this function is a copy of the (void*)
-**   pointer provided by the application when the fts5_tokenizer_v2 object
+**   pointer provided by the application when the fts5_tokenizer object
 **   was registered with FTS5 (the third argument to xCreateTokenizer()). 
 **   The second and third arguments are an array of nul-terminated strings
 **   containing the tokenizer arguments, if any, specified following the
@@ -429,7 +342,7 @@ struct Fts5ExtensionApi {
 **   argument passed to this function is a pointer to an Fts5Tokenizer object
 **   returned by an earlier call to xCreate().
 **
-**   The third argument indicates the reason that FTS5 is requesting
+**   The second argument indicates the reason that FTS5 is requesting
 **   tokenization of the supplied text. This is always one of the following
 **   four values:
 **
@@ -453,13 +366,6 @@ struct Fts5ExtensionApi {
 **            on a columnsize=0 database.  
 **   </ul>
 **
-**   The sixth and seventh arguments passed to xTokenize() - pLocale and
-**   nLocale - are a pointer to a buffer containing the locale to use for
-**   tokenization (e.g. "en_US") and its size in bytes, respectively. The
-**   pLocale buffer is not nul-terminated. pLocale may be passed NULL (in
-**   which case nLocale is always 0) to indicate that the tokenizer should
-**   use its default locale.
-**
 **   For each token in the input string, the supplied callback xToken() must
 **   be invoked. The first argument to it should be a copy of the pointer
 **   passed as the second argument to xTokenize(). The third and fourth
@@ -483,30 +389,6 @@ struct Fts5ExtensionApi {
 **   may abandon the tokenization and return any error code other than
 **   SQLITE_OK or SQLITE_DONE.
 **
-**   If the tokenizer is registered using an fts5_tokenizer_v2 object,
-**   then the xTokenize() method has two additional arguments - pLocale
-**   and nLocale. These specify the locale that the tokenizer should use
-**   for the current request. If pLocale and nLocale are both 0, then the
-**   tokenizer should use its default locale. Otherwise, pLocale points to
-**   an nLocale byte buffer containing the name of the locale to use as utf-8 
-**   text. pLocale is not nul-terminated.
-**
-** FTS5_TOKENIZER
-**
-** There is also an fts5_tokenizer object. This is an older, deprecated,
-** version of fts5_tokenizer_v2. It is similar except that:
-**
-**  <ul>
-**    <li> There is no "iVersion" field, and
-**    <li> The xTokenize() method does not take a locale argument.
-**  </ul>
-**
-** Legacy fts5_tokenizer tokenizers must be registered using the
-** legacy xCreateTokenizer() function, instead of xCreateTokenizer_v2().
-**
-** Tokenizer implementations registered using either API may be retrieved
-** using both xFindTokenizer() and xFindTokenizer_v2().
-**
 ** SYNONYM SUPPORT
 **
 **   Custom tokenizers may also support synonyms. Consider a case in which a
@@ -615,33 +497,6 @@ struct Fts5ExtensionApi {
 **   inefficient.
 */
 typedef struct Fts5Tokenizer Fts5Tokenizer;
-typedef struct fts5_tokenizer_v2 fts5_tokenizer_v2;
-struct fts5_tokenizer_v2 {
-  int iVersion;             /* Currently always 2 */
-
-  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
-  void (*xDelete)(Fts5Tokenizer*);
-  int (*xTokenize)(Fts5Tokenizer*, 
-      void *pCtx,
-      int flags,            /* Mask of FTS5_TOKENIZE_* flags */
-      const char *pText, int nText, 
-      const char *pLocale, int nLocale,
-      int (*xToken)(
-        void *pCtx,         /* Copy of 2nd argument to xTokenize() */
-        int tflags,         /* Mask of FTS5_TOKEN_* flags */
-        const char *pToken, /* Pointer to buffer containing token */
-        int nToken,         /* Size of token in bytes */
-        int iStart,         /* Byte offset of token within input text */
-        int iEnd            /* Byte offset of end of token within input text */
-      )
-  );
-};
-
-/*
-** New code should use the fts5_tokenizer_v2 type to define tokenizer
-** implementations. The following type is included for legacy applications
-** that still use it.
-*/
 typedef struct fts5_tokenizer fts5_tokenizer;
 struct fts5_tokenizer {
  int (*xCreate)(void*, const char **azArg, int nArg, Fts5Tokenizer **ppOut);
@@ -661,7 +516,6 @@ struct fts5_tokenizer {
  );
 };

-
 /* Flags that may be passed as the third argument to xTokenize() */
 #define FTS5_TOKENIZE_QUERY     0x0001
 #define FTS5_TOKENIZE_PREFIX    0x0002
@@ -681,7 +535,7 @@ struct fts5_tokenizer {
 */
 typedef struct fts5_api fts5_api;
 struct fts5_api {
-  int iVersion;                   /* Currently always set to 3 */
+  int iVersion;                   /* Currently always set to 2 */

  /* Create a new tokenizer */
  int (*xCreateTokenizer)(
@@ -708,25 +562,6 @@ struct fts5_api {
    fts5_extension_function xFunction,
    void (*xDestroy)(void*)
  );
-
-  /* APIs below this point are only available if iVersion>=3 */
-
-  /* Create a new tokenizer */
-  int (*xCreateTokenizer_v2)(
-    fts5_api *pApi,
-    const char *zName,
-    void *pUserData,
-    fts5_tokenizer_v2 *pTokenizer,
-    void (*xDestroy)(void*)
-  );
-
-  /* Find an existing tokenizer */
-  int (*xFindTokenizer_v2)(
-    fts5_api *pApi,
-    const char *zName,
-    void **ppUserData,
-    fts5_tokenizer_v2 **ppTokenizer
-  );
 };

 /*
@@ -59,22 +59,6 @@ typedef sqlite3_uint64 u64;
 # define LARGEST_INT64  (0xffffffff|(((i64)0x7fffffff)<<32))
 # define SMALLEST_INT64 (((i64)-1) - LARGEST_INT64)

-/* The uptr type is an unsigned integer large enough to hold a pointer
-*/
-#if defined(HAVE_STDINT_H)
-  typedef uintptr_t uptr;
-#elif SQLITE_PTRSIZE==4
-  typedef u32 uptr;
-#else
-  typedef u64 uptr;
-#endif
-
-#ifdef SQLITE_4_BYTE_ALIGNED_MALLOC
-# define EIGHT_BYTE_ALIGNMENT(X)   ((((uptr)(X) - (uptr)0)&3)==0)
-#else
-# define EIGHT_BYTE_ALIGNMENT(X)   ((((uptr)(X) - (uptr)0)&7)==0)
-#endif
-
 #endif

 /* Truncate very long tokens to this many bytes. Hard limit is 
@@ -158,18 +142,6 @@ struct Fts5Colset {
 */

 typedef struct Fts5Config Fts5Config;
-typedef struct Fts5TokenizerConfig Fts5TokenizerConfig;
-
-struct Fts5TokenizerConfig {
-  Fts5Tokenizer *pTok;
-  fts5_tokenizer_v2 *pApi2;
-  fts5_tokenizer *pApi1;
-  const char **azArg;
-  int nArg;
-  int ePattern;                   /* FTS_PATTERN_XXX constant */
-  const char *pLocale;            /* Current locale to use */
-  int nLocale;                    /* Size of pLocale in bytes */
-};

 /*
 ** An instance of the following structure encodes all information that can
@@ -209,12 +181,9 @@ struct Fts5TokenizerConfig {
 **
 **       INSERT INTO tbl(tbl, rank) VALUES('prefix-index', $bPrefixIndex);
 **
-** bLocale:
-**   Set to true if locale=1 was specified when the table was created.
 */
 struct Fts5Config {
  sqlite3 *db;                    /* Database handle */
-  Fts5Global *pGlobal;            /* Global fts5 object for handle db */
  char *zDb;                      /* Database holding FTS index (e.g. "main") */
  char *zName;                    /* Name of FTS index */
  int nCol;                       /* Number of columns */
@@ -227,13 +196,12 @@ struct Fts5Config {
  char *zContent;                 /* content table */ 
  char *zContentRowid;            /* "content_rowid=" option value */ 
  int bColumnsize;                /* "columnsize=" option value (dflt==1) */
-  int bTokendata;                 /* "tokendata=" option value (dflt==0) */
-  int bLocale;                    /* "locale=" option value (dflt==0) */
  int eDetail;                    /* FTS5_DETAIL_XXX value */
  char *zContentExprlist;
-  Fts5TokenizerConfig t;
+  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 iVersion;                   /* fts5 file format 'version' */
@@ -299,8 +267,6 @@ int sqlite3Fts5ConfigSetValue(Fts5Config*, const char*, sqlite3_value*, int*);

 int sqlite3Fts5ConfigParseRank(const char*, char**, char**);

-void sqlite3Fts5ConfigErrmsg(Fts5Config *pConfig, const char *zFmt, ...);
-
 /*
 ** End of interface to code in fts5_config.c.
 **************************************************************************/
@@ -345,7 +311,7 @@ char *sqlite3Fts5Mprintf(int *pRc, const char *zFmt, ...);
 void sqlite3Fts5Put32(u8*, int);
 int sqlite3Fts5Get32(const u8*);

-#define FTS5_POS2COLUMN(iPos) (int)((iPos >> 32) & 0x7FFFFFFF)
+#define FTS5_POS2COLUMN(iPos) (int)(iPos >> 32)
 #define FTS5_POS2OFFSET(iPos) (int)(iPos & 0x7FFFFFFF)

 typedef struct Fts5PoslistReader Fts5PoslistReader;
@@ -418,19 +384,17 @@ struct Fts5IndexIter {
 /*
 ** Values used as part of the flags argument passed to IndexQuery().
 */
-#define FTS5INDEX_QUERY_PREFIX      0x0001  /* Prefix query */
-#define FTS5INDEX_QUERY_DESC        0x0002  /* Docs in descending rowid order */
-#define FTS5INDEX_QUERY_TEST_NOIDX  0x0004  /* Do not use prefix index */
-#define FTS5INDEX_QUERY_SCAN        0x0008  /* Scan query (fts5vocab) */
+#define FTS5INDEX_QUERY_PREFIX     0x0001   /* Prefix query */
+#define FTS5INDEX_QUERY_DESC       0x0002   /* Docs in descending rowid order */
+#define FTS5INDEX_QUERY_TEST_NOIDX 0x0004   /* Do not use prefix index */
+#define FTS5INDEX_QUERY_SCAN       0x0008   /* Scan query (fts5vocab) */

 /* The following are used internally by the fts5_index.c module. They are
 ** defined here only to make it easier to avoid clashes with the flags
 ** above. */
-#define FTS5INDEX_QUERY_SKIPEMPTY   0x0010
-#define FTS5INDEX_QUERY_NOOUTPUT    0x0020
-#define FTS5INDEX_QUERY_SKIPHASH    0x0040
-#define FTS5INDEX_QUERY_NOTOKENDATA 0x0080
-#define FTS5INDEX_QUERY_SCANONETERM 0x0100
+#define FTS5INDEX_QUERY_SKIPEMPTY  0x0010
+#define FTS5INDEX_QUERY_NOOUTPUT   0x0020
+#define FTS5INDEX_QUERY_SKIPHASH   0x0040

 /*
 ** Create/destroy an Fts5Index object.
@@ -499,10 +463,6 @@ void *sqlite3Fts5StructureRef(Fts5Index*);
 void sqlite3Fts5StructureRelease(void*);
 int sqlite3Fts5StructureTest(Fts5Index*, void*);

-/*
-** Used by xInstToken():
-*/
-int sqlite3Fts5IterToken(Fts5IndexIter*, i64, int, int, const char**, int*);

 /*
 ** Insert or remove data to or from the index. Each time a document is 
@@ -580,13 +540,6 @@ int sqlite3Fts5IndexLoadConfig(Fts5Index *p);
 int sqlite3Fts5IndexGetOrigin(Fts5Index *p, i64 *piOrigin);
 int sqlite3Fts5IndexContentlessDelete(Fts5Index *p, i64 iOrigin, i64 iRowid);

-void sqlite3Fts5IndexIterClearTokendata(Fts5IndexIter*);
-
-/* Used to populate hash tables for xInstToken in detail=none/column mode. */
-int sqlite3Fts5IndexIterWriteTokendata(
-    Fts5IndexIter*, const char*, int, i64 iRowid, int iCol, int iOff
-);
-
 /*
 ** End of interface to code in fts5_index.c.
 **************************************************************************/
@@ -630,20 +583,18 @@ struct Fts5Table {
  Fts5Index *pIndex;              /* Full-text index */
 };

-int sqlite3Fts5LoadTokenizer(Fts5Config *pConfig);
+int sqlite3Fts5GetTokenizer(
+  Fts5Global*, 
+  const char **azArg,
+  int nArg,
+  Fts5Config*,
+  char **pzErr
+);

 Fts5Table *sqlite3Fts5TableFromCsrid(Fts5Global*, i64);

 int sqlite3Fts5FlushToDisk(Fts5Table*);

-void sqlite3Fts5ClearLocale(Fts5Config *pConfig);
-void sqlite3Fts5SetLocale(Fts5Config *pConfig, const char *pLoc, int nLoc);
-
-int sqlite3Fts5IsLocaleValue(Fts5Config *pConfig, sqlite3_value *pVal);
-int sqlite3Fts5DecodeLocaleValue(sqlite3_value *pVal, 
-    const char **ppText, int *pnText, const char **ppLoc, int *pnLoc
-);
-
 /*
 ** End of interface to code in fts5.c.
 **************************************************************************/
@@ -694,7 +645,6 @@ void sqlite3Fts5HashScanNext(Fts5Hash*);
 int sqlite3Fts5HashScanEof(Fts5Hash*);
 void sqlite3Fts5HashScanEntry(Fts5Hash *,
  const char **pzTerm,            /* OUT: term (nul-terminated) */
-  int *pnTerm,                    /* OUT: Size of term in bytes */
  const u8 **ppDoclist,           /* OUT: pointer to doclist */
  int *pnDoclist                  /* OUT: size of doclist in bytes */
 );
@@ -723,7 +673,7 @@ int sqlite3Fts5StorageRename(Fts5Storage*, const char *zName);
 int sqlite3Fts5DropAll(Fts5Config*);
 int sqlite3Fts5CreateTable(Fts5Config*, const char*, const char*, int, char **);

-int sqlite3Fts5StorageDelete(Fts5Storage *p, i64, sqlite3_value**, int);
+int sqlite3Fts5StorageDelete(Fts5Storage *p, i64, sqlite3_value**);
 int sqlite3Fts5StorageContentInsert(Fts5Storage *p, sqlite3_value**, i64*);
 int sqlite3Fts5StorageIndexInsert(Fts5Storage *p, sqlite3_value**, i64);

@@ -749,9 +699,6 @@ int sqlite3Fts5StorageOptimize(Fts5Storage *p);
 int sqlite3Fts5StorageMerge(Fts5Storage *p, int nMerge);
 int sqlite3Fts5StorageReset(Fts5Storage *p);

-void sqlite3Fts5StorageReleaseDeleteRow(Fts5Storage*);
-int sqlite3Fts5StorageFindDeleteRow(Fts5Storage *p, i64 iDel);
-
 /*
 ** End of interface to code in fts5_storage.c.
 **************************************************************************/
@@ -824,10 +771,6 @@ int sqlite3Fts5ExprClonePhrase(Fts5Expr*, int, Fts5Expr**);

 int sqlite3Fts5ExprPhraseCollist(Fts5Expr *, int, const u8 **, int *);

-int sqlite3Fts5ExprQueryToken(Fts5Expr*, int, int, const char**, int*);
-int sqlite3Fts5ExprInstToken(Fts5Expr*, i64, int, int, int, int, const char**, int*);
-void sqlite3Fts5ExprClearTokens(Fts5Expr*);
-
 /*******************************************
 ** The fts5_expr.c API above this point is used by the other hand-written
 ** C code in this module. The interfaces below this point are called by
@@ -904,7 +847,6 @@ int sqlite3Fts5TokenizerPattern(
    int (*xCreate)(void*, const char**, int, Fts5Tokenizer**),
    Fts5Tokenizer *pTok
 );
-int sqlite3Fts5TokenizerPreload(Fts5TokenizerConfig*);
 /*
 ** End of interface to code in fts5_tokenizer.c.
 **************************************************************************/
@@ -211,14 +211,6 @@ static int fts5HighlightCb(
  }

  if( iPos==p->iRangeEnd ){
-    if( p->bOpen ){
-      if( p->iter.iStart>=0 && iPos>=p->iter.iStart ){
-        fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
-        p->iOff = iEndOff;
-      }
-      fts5HighlightAppend(&rc, p, p->zClose, -1);
-      p->bOpen = 0;
-    }
    fts5HighlightAppend(&rc, p, &p->zIn[p->iOff], iEndOff - p->iOff);
    p->iOff = iEndOff;
  }
@@ -226,7 +218,6 @@ static int fts5HighlightCb(
  return rc;
 }

-
 /*
 ** Implementation of highlight() function.
 */
@@ -253,23 +244,14 @@ static void fts5HighlightFunction(
  ctx.zClose = (const char*)sqlite3_value_text(apVal[2]);
  ctx.iRangeEnd = -1;
  rc = pApi->xColumnText(pFts, iCol, &ctx.zIn, &ctx.nIn);
-  if( rc==SQLITE_RANGE ){
-    sqlite3_result_text(pCtx, "", -1, SQLITE_STATIC);
-    rc = SQLITE_OK;
-  }else if( ctx.zIn ){
-    const char *pLoc = 0;         /* Locale of column iCol */
-    int nLoc = 0;                 /* Size of pLoc in bytes */
+
+  if( ctx.zIn ){
    if( rc==SQLITE_OK ){
      rc = fts5CInstIterInit(pApi, pFts, iCol, &ctx.iter);
    }

    if( rc==SQLITE_OK ){
-      rc = pApi->xColumnLocale(pFts, iCol, &pLoc, &nLoc);
-    }
-    if( rc==SQLITE_OK ){
-      rc = pApi->xTokenize_v2(
-          pFts, ctx.zIn, ctx.nIn, pLoc, nLoc, (void*)&ctx, fts5HighlightCb
-      );
+      rc = pApi->xTokenize(pFts, ctx.zIn, ctx.nIn, (void*)&ctx,fts5HighlightCb);
    }
    if( ctx.bOpen ){
      fts5HighlightAppend(&rc, &ctx, ctx.zClose, -1);
@@ -466,8 +448,6 @@ static void fts5SnippetFunction(
  memset(&sFinder, 0, sizeof(Fts5SFinder));
  for(i=0; i<nCol; i++){
    if( iCol<0 || iCol==i ){
-      const char *pLoc = 0;       /* Locale of column iCol */
-      int nLoc = 0;               /* Size of pLoc in bytes */
      int nDoc;
      int nDocsize;
      int ii;
@@ -475,10 +455,8 @@ static void fts5SnippetFunction(
      sFinder.nFirst = 0;
      rc = pApi->xColumnText(pFts, i, &sFinder.zDoc, &nDoc);
      if( rc!=SQLITE_OK ) break;
-      rc = pApi->xColumnLocale(pFts, i, &pLoc, &nLoc);
-      if( rc!=SQLITE_OK ) break;
-      rc = pApi->xTokenize_v2(pFts, 
-          sFinder.zDoc, nDoc, pLoc, nLoc, (void*)&sFinder, fts5SentenceFinderCb
+      rc = pApi->xTokenize(pFts, 
+          sFinder.zDoc, nDoc, (void*)&sFinder,fts5SentenceFinderCb
      );
      if( rc!=SQLITE_OK ) break;
      rc = pApi->xColumnSize(pFts, i, &nDocsize);
@@ -536,9 +514,6 @@ static void fts5SnippetFunction(
    rc = pApi->xColumnSize(pFts, iBestCol, &nColSize);
  }
  if( ctx.zIn ){
-    const char *pLoc = 0;         /* Locale of column iBestCol */
-    int nLoc = 0;                 /* Bytes in pLoc */
-
    if( rc==SQLITE_OK ){
      rc = fts5CInstIterInit(pApi, pFts, iBestCol, &ctx.iter);
    }
@@ -557,12 +532,7 @@ static void fts5SnippetFunction(
    }

    if( rc==SQLITE_OK ){
-      rc = pApi->xColumnLocale(pFts, iBestCol, &pLoc, &nLoc);
-    }
-    if( rc==SQLITE_OK ){
-      rc = pApi->xTokenize_v2(
-          pFts, ctx.zIn, ctx.nIn, pLoc, nLoc, (void*)&ctx,fts5HighlightCb
-      );
+      rc = pApi->xTokenize(pFts, ctx.zIn, ctx.nIn, (void*)&ctx,fts5HighlightCb);
    }
    if( ctx.bOpen ){
      fts5HighlightAppend(&rc, &ctx, ctx.zClose, -1);
@@ -746,53 +716,6 @@ static void fts5Bm25Function(
  }
 }

-/*
-** Implementation of fts5_get_locale() function.
-*/
-static void fts5GetLocaleFunction(
-  const Fts5ExtensionApi *pApi,   /* API offered by current FTS version */
-  Fts5Context *pFts,              /* First arg to pass to pApi functions */
-  sqlite3_context *pCtx,          /* Context for returning result/error */
-  int nVal,                       /* Number of values in apVal[] array */
-  sqlite3_value **apVal           /* Array of trailing arguments */
-){
-  int iCol = 0;
-  int eType = 0;
-  int rc = SQLITE_OK;
-  const char *zLocale = 0;
-  int nLocale = 0;
-
-  /* xColumnLocale() must be available */
-  assert( pApi->iVersion>=4 );
-
-  if( nVal!=1 ){
-    const char *z = "wrong number of arguments to function fts5_get_locale()";
-    sqlite3_result_error(pCtx, z, -1);
-    return;
-  }
-
-  eType = sqlite3_value_numeric_type(apVal[0]);
-  if( eType!=SQLITE_INTEGER ){
-    const char *z = "non-integer argument passed to function fts5_get_locale()";
-    sqlite3_result_error(pCtx, z, -1);
-    return;
-  }
-
-  iCol = sqlite3_value_int(apVal[0]);
-  if( iCol<0 || iCol>=pApi->xColumnCount(pFts) ){
-    sqlite3_result_error_code(pCtx, SQLITE_RANGE);
-    return;
-  }
-
-  rc = pApi->xColumnLocale(pFts, iCol, &zLocale, &nLocale);
-  if( rc!=SQLITE_OK ){
-    sqlite3_result_error_code(pCtx, rc);
-    return;
-  }
-
-  sqlite3_result_text(pCtx, zLocale, nLocale, SQLITE_TRANSIENT);
-}
-
 int sqlite3Fts5AuxInit(fts5_api *pApi){
  struct Builtin {
    const char *zFunc;            /* Function name (nul-terminated) */
@@ -800,10 +723,9 @@ int sqlite3Fts5AuxInit(fts5_api *pApi){
    fts5_extension_function xFunc;/* Callback function */
    void (*xDestroy)(void*);      /* Destructor function */
  } aBuiltin [] = {
-    { "snippet",         0, fts5SnippetFunction,   0 },
-    { "highlight",       0, fts5HighlightFunction, 0 },
-    { "bm25",            0, fts5Bm25Function,      0 },
-    { "fts5_get_locale", 0, fts5GetLocaleFunction, 0 },
+    { "snippet",   0, fts5SnippetFunction, 0 },
+    { "highlight", 0, fts5HighlightFunction, 0 },
+    { "bm25",      0, fts5Bm25Function,    0 },
  };
  int rc = SQLITE_OK;             /* Return code */
  int i;                          /* To iterate through builtin functions */
@@ -68,7 +68,6 @@ void sqlite3Fts5BufferAppendBlob(
 ){
  if( nData ){
    if( fts5BufferGrow(pRc, pBuf, nData) ) return;
-    assert( pBuf->p!=0 );
    memcpy(&pBuf->p[pBuf->n], pData, nData);
    pBuf->n += nData;
  }
@@ -170,7 +169,6 @@ int sqlite3Fts5PoslistNext64(
  i64 *piOff                      /* IN/OUT: Current offset */
 ){
  int i = *pi;
-  assert( a!=0 || i==0 );
  if( i>=n ){
    /* EOF */
    *piOff = -1;
@@ -178,7 +176,6 @@ int sqlite3Fts5PoslistNext64(
  }else{
    i64 iOff = *piOff;
    u32 iVal;
-    assert( a!=0 );
    fts5FastGetVarint32(a, i, iVal);
    if( iVal<=1 ){
      if( iVal==0 ){
@@ -234,6 +234,7 @@ static int fts5ConfigSetEnum(
 ** eventually free any such error message using sqlite3_free().
 */
 static int fts5ConfigParseSpecial(
+  Fts5Global *pGlobal,
  Fts5Config *pConfig,            /* Configuration object to update */
  const char *zCmd,               /* Special command to parse */
  const char *zArg,               /* Argument to parse */
@@ -297,11 +298,12 @@ static int fts5ConfigParseSpecial(
  if( sqlite3_strnicmp("tokenize", zCmd, nCmd)==0 ){
    const char *p = (const char*)zArg;
    sqlite3_int64 nArg = strlen(zArg) + 1;
-    char **azArg = sqlite3Fts5MallocZero(&rc, (sizeof(char*) + 2) * nArg);
+    char **azArg = sqlite3Fts5MallocZero(&rc, sizeof(char*) * nArg);
+    char *pDel = sqlite3Fts5MallocZero(&rc, nArg * 2);
+    char *pSpace = pDel;

-    if( azArg ){
-      char *pSpace = (char*)&azArg[nArg];
-      if( pConfig->t.azArg ){
+    if( azArg && pSpace ){
+      if( pConfig->pTok ){
        *pzErr = sqlite3_mprintf("multiple tokenize=... directives");
        rc = SQLITE_ERROR;
      }else{
@@ -324,14 +326,16 @@ static int fts5ConfigParseSpecial(
          *pzErr = sqlite3_mprintf("parse error in tokenize directive");
          rc = SQLITE_ERROR;
        }else{
-          pConfig->t.azArg = (const char**)azArg;
-          pConfig->t.nArg = nArg;
-          azArg = 0;
+          rc = sqlite3Fts5GetTokenizer(pGlobal, 
+              (const char**)azArg, (int)nArg, pConfig,
+              pzErr
+          );
        }
      }
    }
-    sqlite3_free(azArg);

+    sqlite3_free(azArg);
+    sqlite3_free(pDel);
    return rc;
  }

@@ -380,16 +384,6 @@ static int fts5ConfigParseSpecial(
    return rc;
  }

-  if( sqlite3_strnicmp("locale", zCmd, nCmd)==0 ){
-    if( (zArg[0]!='0' && zArg[0]!='1') || zArg[1]!='\0' ){
-      *pzErr = sqlite3_mprintf("malformed locale=... directive");
-      rc = SQLITE_ERROR;
-    }else{
-      pConfig->bLocale = (zArg[0]=='1');
-    }
-    return rc;
-  }
-
  if( sqlite3_strnicmp("detail", zCmd, nCmd)==0 ){
    const Fts5Enum aDetail[] = {
      { "none", FTS5_DETAIL_NONE },
@@ -404,20 +398,20 @@ static int fts5ConfigParseSpecial(
    return rc;
  }

-  if( sqlite3_strnicmp("tokendata", zCmd, nCmd)==0 ){
-    if( (zArg[0]!='0' && zArg[0]!='1') || zArg[1]!='\0' ){
-      *pzErr = sqlite3_mprintf("malformed tokendata=... directive");
-      rc = SQLITE_ERROR;
-    }else{
-      pConfig->bTokendata = (zArg[0]=='1');
-    }
-    return rc;
-  }
-
  *pzErr = sqlite3_mprintf("unrecognized option: \"%.*s\"", nCmd, zCmd);
  return SQLITE_ERROR;
 }

+/*
+** Allocate an instance of the default tokenizer ("simple") at 
+** Fts5Config.pTokenizer. Return SQLITE_OK if successful, or an SQLite error
+** code if an error occurs.
+*/
+static int fts5ConfigDefaultTokenizer(Fts5Global *pGlobal, Fts5Config *pConfig){
+  assert( pConfig->pTok==0 && pConfig->pTokApi==0 );
+  return sqlite3Fts5GetTokenizer(pGlobal, 0, 0, pConfig, 0);
+}
+
 /*
 ** Gobble up the first bareword or quoted word from the input buffer zIn.
 ** Return a pointer to the character immediately following the last in
@@ -516,15 +510,6 @@ static int fts5ConfigMakeExprlist(Fts5Config *p){
      }
    }
  }
-  if( p->eContent==FTS5_CONTENT_NORMAL && p->bLocale ){
-    for(i=0; i<p->nCol; i++){
-      if( p->abUnindexed[i]==0 ){
-        sqlite3Fts5BufferAppendPrintf(&rc, &buf, ", T.l%d", i);
-      }else{
-        sqlite3Fts5BufferAppendPrintf(&rc, &buf, ", NULL");
-      }
-    }
-  }

  assert( p->zContentExprlist==0 );
  p->zContentExprlist = (char*)buf.p;
@@ -559,7 +544,6 @@ int sqlite3Fts5ConfigParse(
  *ppOut = pRet = (Fts5Config*)sqlite3_malloc(sizeof(Fts5Config));
  if( pRet==0 ) return SQLITE_NOMEM;
  memset(pRet, 0, sizeof(Fts5Config));
-  pRet->pGlobal = pGlobal;
  pRet->db = db;
  pRet->iCookie = -1;

@@ -608,7 +592,7 @@ int sqlite3Fts5ConfigParse(
        rc = SQLITE_ERROR;
      }else{
        if( bOption ){
-          rc = fts5ConfigParseSpecial(pRet, 
+          rc = fts5ConfigParseSpecial(pGlobal, pRet, 
            ALWAYS(zOne)?zOne:"",
            zTwo?zTwo:"",
            pzErr
@@ -646,6 +630,13 @@ int sqlite3Fts5ConfigParse(
    rc = SQLITE_ERROR;
  }

+  /* If a tokenizer= option was successfully parsed, the tokenizer has
+  ** already been allocated. Otherwise, allocate an instance of the default
+  ** tokenizer (unicode61) now.  */
+  if( rc==SQLITE_OK && pRet->pTok==0 ){
+    rc = fts5ConfigDefaultTokenizer(pGlobal, pRet);
+  }
+
  /* If no zContent option was specified, fill in the default values. */
  if( rc==SQLITE_OK && pRet->zContent==0 ){
    const char *zTail = 0;
@@ -687,14 +678,9 @@ int sqlite3Fts5ConfigParse(
 void sqlite3Fts5ConfigFree(Fts5Config *pConfig){
  if( pConfig ){
    int i;
-    if( pConfig->t.pTok ){
-      if( pConfig->t.pApi1 ){
-        pConfig->t.pApi1->xDelete(pConfig->t.pTok);
-      }else{
-        pConfig->t.pApi2->xDelete(pConfig->t.pTok);
-      }
+    if( pConfig->pTok ){
+      pConfig->pTokApi->xDelete(pConfig->pTok);
    }
-    sqlite3_free((char*)pConfig->t.azArg);
    sqlite3_free(pConfig->zDb);
    sqlite3_free(pConfig->zName);
    for(i=0; i<pConfig->nCol; i++){
@@ -769,24 +755,10 @@ int sqlite3Fts5Tokenize(
  void *pCtx,                     /* Context passed to xToken() */
  int (*xToken)(void*, int, const char*, int, int, int)    /* Callback */
 ){
-  int rc = SQLITE_OK;
-  if( pText ){
-    if( pConfig->t.pTok==0 ){
-      rc = sqlite3Fts5LoadTokenizer(pConfig);
-    }
-    if( rc==SQLITE_OK ){
-      if( pConfig->t.pApi1 ){
-        rc = pConfig->t.pApi1->xTokenize(
-            pConfig->t.pTok, pCtx, flags, pText, nText, xToken
-        );
-      }else{
-        rc = pConfig->t.pApi2->xTokenize(pConfig->t.pTok, pCtx, flags, 
-            pText, nText, pConfig->t.pLocale, pConfig->t.nLocale, xToken
-        );
-      }
-    }
-  }
-  return rc;
+  if( pText==0 ) return SQLITE_OK;
+  return pConfig->pTokApi->xTokenize(
+      pConfig->pTok, pCtx, flags, pText, nText, xToken
+  );
 }

 /*
@@ -1040,10 +1012,13 @@ int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){
   && iVersion!=FTS5_CURRENT_VERSION_SECUREDELETE
  ){
    rc = SQLITE_ERROR;
-    sqlite3Fts5ConfigErrmsg(pConfig, "invalid fts5 file format "
-        "(found %d, expected %d or %d) - run 'rebuild'",
-        iVersion, FTS5_CURRENT_VERSION, FTS5_CURRENT_VERSION_SECUREDELETE
-    );
+    if( pConfig->pzErrmsg ){
+      assert( 0==*pConfig->pzErrmsg );
+      *pConfig->pzErrmsg = sqlite3_mprintf("invalid fts5 file format "
+          "(found %d, expected %d or %d) - run 'rebuild'",
+          iVersion, FTS5_CURRENT_VERSION, FTS5_CURRENT_VERSION_SECUREDELETE
+      );
+    }
  }else{
    pConfig->iVersion = iVersion;
  }
@@ -1053,26 +1028,3 @@ int sqlite3Fts5ConfigLoad(Fts5Config *pConfig, int iCookie){
  }
  return rc;
 }
-
-/*
-** Set (*pConfig->pzErrmsg) to point to an sqlite3_malloc()ed buffer 
-** containing the error message created using printf() style formatting
-** string zFmt and its trailing arguments.
-*/
-void sqlite3Fts5ConfigErrmsg(Fts5Config *pConfig, const char *zFmt, ...){
-  va_list ap;                     /* ... printf arguments */
-  char *zMsg = 0;
-
-  va_start(ap, zFmt);
-  zMsg = sqlite3_vmprintf(zFmt, ap);
-  if( pConfig->pzErrmsg ){
-    assert( *pConfig->pzErrmsg==0 );
-    *pConfig->pzErrmsg = zMsg;
-  }else{
-    sqlite3_free(zMsg);
-  }
-
-  va_end(ap);
-}
-
-
@@ -54,7 +54,7 @@ struct Fts5Expr {

 /*
 ** eType:
-**   Expression node type. Usually one of:
+**   Expression node type. Always one of:
 **
 **       FTS5_AND                 (nChild, apChild valid)
 **       FTS5_OR                  (nChild, apChild valid)
@@ -62,10 +62,6 @@ struct Fts5Expr {
 **       FTS5_STRING              (pNear valid)
 **       FTS5_TERM                (pNear valid)
 **
-**   An expression node with eType==0 may also exist. It always matches zero
-**   rows. This is created when a phrase containing no tokens is parsed.
-**   e.g. "".
-**
 ** iHeight:
 **   Distance from this node to furthest leaf. This is always 0 for nodes
 **   of type FTS5_STRING and FTS5_TERM. For all other nodes it is one 
@@ -104,9 +100,7 @@ struct Fts5ExprNode {
 struct Fts5ExprTerm {
  u8 bPrefix;                     /* True for a prefix term */
  u8 bFirst;                      /* True if token must be first in column */
-  char *pTerm;                    /* Term data */
-  int nQueryTerm;                 /* Effective size of term in bytes */
-  int nFullTerm;                  /* Size of term in bytes incl. tokendata */
+  char *zTerm;                    /* nul-terminated term */
  Fts5IndexIter *pIter;           /* Iterator for this term */
  Fts5ExprTerm *pSynonym;         /* Pointer to first in list of synonyms */
 };
@@ -286,12 +280,11 @@ int sqlite3Fts5ExprNew(
  }while( sParse.rc==SQLITE_OK && t!=FTS5_EOF );
  sqlite3Fts5ParserFree(pEngine, fts5ParseFree);

-  assert( sParse.pExpr || sParse.rc!=SQLITE_OK );
  assert_expr_depth_ok(sParse.rc, sParse.pExpr);

  /* If the LHS of the MATCH expression was a user column, apply the
  ** implicit column-filter.  */
-  if( sParse.rc==SQLITE_OK && iCol<pConfig->nCol ){
+  if( iCol<pConfig->nCol && sParse.pExpr && sParse.rc==SQLITE_OK ){
    int n = sizeof(Fts5Colset);
    Fts5Colset *pColset = (Fts5Colset*)sqlite3Fts5MallocZero(&sParse.rc, n);
    if( pColset ){
@@ -308,7 +301,15 @@ int sqlite3Fts5ExprNew(
      sParse.rc = SQLITE_NOMEM;
      sqlite3Fts5ParseNodeFree(sParse.pExpr);
    }else{
-      pNew->pRoot = sParse.pExpr;
+      if( !sParse.pExpr ){
+        const int nByte = sizeof(Fts5ExprNode);
+        pNew->pRoot = (Fts5ExprNode*)sqlite3Fts5MallocZero(&sParse.rc, nByte);
+        if( pNew->pRoot ){
+          pNew->pRoot->bEof = 1;
+        }
+      }else{
+        pNew->pRoot = sParse.pExpr;
+      }
      pNew->pIndex = 0;
      pNew->pConfig = pConfig;
      pNew->apExprPhrase = sParse.apPhrase;
@@ -321,11 +322,7 @@ int sqlite3Fts5ExprNew(
  }

  sqlite3_free(sParse.apPhrase);
-  if( 0==*pzErr ){
-    *pzErr = sParse.zErr;
-  }else{
-    sqlite3_free(sParse.zErr);
-  }
+  *pzErr = sParse.zErr;
  return sParse.rc;
 }

@@ -970,7 +967,7 @@ static int fts5ExprNearInitAll(
            p->pIter = 0;
          }
          rc = sqlite3Fts5IndexQuery(
-              pExpr->pIndex, p->pTerm, p->nQueryTerm,
+              pExpr->pIndex, p->zTerm, (int)strlen(p->zTerm),
              (pTerm->bPrefix ? FTS5INDEX_QUERY_PREFIX : 0) |
              (pExpr->bDesc ? FTS5INDEX_QUERY_DESC : 0),
              pNear->pColset,
@@ -1126,7 +1123,7 @@ static int fts5ExprNodeTest_STRING(
          }
        }else{
          Fts5IndexIter *pIter = pPhrase->aTerm[j].pIter;
-          if( pIter->iRowid==iLast ) continue;
+          if( pIter->iRowid==iLast || pIter->bEof ) continue;
          bMatch = 0;
          if( fts5ExprAdvanceto(pIter, bDesc, &iLast, &rc, &pNode->bEof) ){
            return rc;
@@ -1607,7 +1604,7 @@ static void fts5ExprPhraseFree(Fts5ExprPhrase *pPhrase){
      Fts5ExprTerm *pSyn;
      Fts5ExprTerm *pNext;
      Fts5ExprTerm *pTerm = &pPhrase->aTerm[i];
-      sqlite3_free(pTerm->pTerm);
+      sqlite3_free(pTerm->zTerm);
      sqlite3Fts5IterClose(pTerm->pIter);
      for(pSyn=pTerm->pSynonym; pSyn; pSyn=pNext){
        pNext = pSyn->pSynonym;
@@ -1648,6 +1645,9 @@ Fts5ExprNearset *sqlite3Fts5ParseNearset(
  Fts5ExprNearset *pRet = 0;

  if( pParse->rc==SQLITE_OK ){
+    if( pPhrase==0 ){
+      return pNear;
+    }
    if( pNear==0 ){
      sqlite3_int64 nByte;
      nByte = sizeof(Fts5ExprNearset) + SZALLOC * sizeof(Fts5ExprPhrase*);
@@ -1702,7 +1702,6 @@ Fts5ExprNearset *sqlite3Fts5ParseNearset(
 typedef struct TokenCtx TokenCtx;
 struct TokenCtx {
  Fts5ExprPhrase *pPhrase;
-  Fts5Config *pConfig;
  int rc;
 };

@@ -1736,12 +1735,8 @@ static int fts5ParseTokenize(
      rc = SQLITE_NOMEM;
    }else{
      memset(pSyn, 0, (size_t)nByte);
-      pSyn->pTerm = ((char*)pSyn) + sizeof(Fts5ExprTerm) + sizeof(Fts5Buffer);
-      pSyn->nFullTerm = pSyn->nQueryTerm = nToken;
-      if( pCtx->pConfig->bTokendata ){
-        pSyn->nQueryTerm = (int)strlen(pSyn->pTerm);
-      }
-      memcpy(pSyn->pTerm, pToken, nToken);
+      pSyn->zTerm = ((char*)pSyn) + sizeof(Fts5ExprTerm) + sizeof(Fts5Buffer);
+      memcpy(pSyn->zTerm, pToken, nToken);
      pSyn->pSynonym = pPhrase->aTerm[pPhrase->nTerm-1].pSynonym;
      pPhrase->aTerm[pPhrase->nTerm-1].pSynonym = pSyn;
    }
@@ -1766,11 +1761,7 @@ static int fts5ParseTokenize(
    if( rc==SQLITE_OK ){
      pTerm = &pPhrase->aTerm[pPhrase->nTerm++];
      memset(pTerm, 0, sizeof(Fts5ExprTerm));
-      pTerm->pTerm = sqlite3Fts5Strndup(&rc, pToken, nToken);
-      pTerm->nFullTerm = pTerm->nQueryTerm = nToken;
-      if( pCtx->pConfig->bTokendata && rc==SQLITE_OK ){ 
-        pTerm->nQueryTerm = (int)strlen(pTerm->pTerm);
-      }
+      pTerm->zTerm = sqlite3Fts5Strndup(&rc, pToken, nToken);
    }
  }

@@ -1837,7 +1828,6 @@ Fts5ExprPhrase *sqlite3Fts5ParseTerm(

  memset(&sCtx, 0, sizeof(TokenCtx));
  sCtx.pPhrase = pAppend;
-  sCtx.pConfig = pConfig;

  rc = fts5ParseStringFromToken(pToken, &z);
  if( rc==SQLITE_OK ){
@@ -1869,7 +1859,6 @@ Fts5ExprPhrase *sqlite3Fts5ParseTerm(
    }else if( sCtx.pPhrase->nTerm ){
      sCtx.pPhrase->aTerm[sCtx.pPhrase->nTerm-1].bPrefix = (u8)bPrefix;
    }
-    assert( pParse->apPhrase!=0 );
    pParse->apPhrase[pParse->nPhrase-1] = sCtx.pPhrase;
  }

@@ -1886,15 +1875,12 @@ int sqlite3Fts5ExprClonePhrase(
  Fts5Expr **ppNew
 ){
  int rc = SQLITE_OK;             /* Return code */
-  Fts5ExprPhrase *pOrig = 0;      /* The phrase extracted from pExpr */
+  Fts5ExprPhrase *pOrig;          /* The phrase extracted from pExpr */
  Fts5Expr *pNew = 0;             /* Expression to return via *ppNew */
-  TokenCtx sCtx = {0,0,0};        /* Context object for fts5ParseTokenize */
-  if( !pExpr || iPhrase<0 || iPhrase>=pExpr->nPhrase ){
-    rc = SQLITE_RANGE;
-  }else{
-    pOrig = pExpr->apExprPhrase[iPhrase];
-    pNew = (Fts5Expr*)sqlite3Fts5MallocZero(&rc, sizeof(Fts5Expr));
-  }
+  TokenCtx sCtx = {0,0};          /* Context object for fts5ParseTokenize */
+
+  pOrig = pExpr->apExprPhrase[iPhrase];
+  pNew = (Fts5Expr*)sqlite3Fts5MallocZero(&rc, sizeof(Fts5Expr));
  if( rc==SQLITE_OK ){
    pNew->apExprPhrase = (Fts5ExprPhrase**)sqlite3Fts5MallocZero(&rc, 
        sizeof(Fts5ExprPhrase*));
@@ -1907,7 +1893,7 @@ int sqlite3Fts5ExprClonePhrase(
    pNew->pRoot->pNear = (Fts5ExprNearset*)sqlite3Fts5MallocZero(&rc, 
        sizeof(Fts5ExprNearset) + sizeof(Fts5ExprPhrase*));
  }
-  if( rc==SQLITE_OK && ALWAYS(pOrig!=0) ){
+  if( rc==SQLITE_OK ){
    Fts5Colset *pColsetOrig = pOrig->pNode->pNear->pColset;
    if( pColsetOrig ){
      sqlite3_int64 nByte;
@@ -1921,27 +1907,26 @@ int sqlite3Fts5ExprClonePhrase(
    }
  }

-  if( rc==SQLITE_OK ){
-    if( pOrig->nTerm ){
-      int i;                          /* Used to iterate through phrase terms */
-      sCtx.pConfig = pExpr->pConfig;
-      for(i=0; rc==SQLITE_OK && i<pOrig->nTerm; i++){
-        int tflags = 0;
-        Fts5ExprTerm *p;
-        for(p=&pOrig->aTerm[i]; p && rc==SQLITE_OK; p=p->pSynonym){
-          rc = fts5ParseTokenize((void*)&sCtx,tflags,p->pTerm,p->nFullTerm,0,0);
-          tflags = FTS5_TOKEN_COLOCATED;
-        }
-        if( rc==SQLITE_OK ){
-          sCtx.pPhrase->aTerm[i].bPrefix = pOrig->aTerm[i].bPrefix;
-          sCtx.pPhrase->aTerm[i].bFirst = pOrig->aTerm[i].bFirst;
-        }
+  if( pOrig->nTerm ){
+    int i;                          /* Used to iterate through phrase terms */
+    for(i=0; rc==SQLITE_OK && i<pOrig->nTerm; i++){
+      int tflags = 0;
+      Fts5ExprTerm *p;
+      for(p=&pOrig->aTerm[i]; p && rc==SQLITE_OK; p=p->pSynonym){
+        const char *zTerm = p->zTerm;
+        rc = fts5ParseTokenize((void*)&sCtx, tflags, zTerm, (int)strlen(zTerm),
+            0, 0);
+        tflags = FTS5_TOKEN_COLOCATED;
+      }
+      if( rc==SQLITE_OK ){
+        sCtx.pPhrase->aTerm[i].bPrefix = pOrig->aTerm[i].bPrefix;
+        sCtx.pPhrase->aTerm[i].bFirst = pOrig->aTerm[i].bFirst;
      }
-    }else{
-      /* This happens when parsing a token or quoted phrase that contains
-      ** no token characters at all. (e.g ... MATCH '""'). */
-      sCtx.pPhrase = sqlite3Fts5MallocZero(&rc, sizeof(Fts5ExprPhrase));
    }
+  }else{
+    /* This happens when parsing a token or quoted phrase that contains
+    ** no token characters at all. (e.g ... MATCH '""'). */
+    sCtx.pPhrase = sqlite3Fts5MallocZero(&rc, sizeof(Fts5ExprPhrase));
  }

  if( rc==SQLITE_OK && ALWAYS(sCtx.pPhrase) ){
@@ -2257,9 +2242,6 @@ static void fts5ExprAssignXNext(Fts5ExprNode *pNode){
  }
 }

-/*
-** Add pSub as a child of p.
-*/
 static void fts5ExprAddChildren(Fts5ExprNode *p, Fts5ExprNode *pSub){
  int ii = p->nChild;
  if( p->eType!=FTS5_NOT && pSub->eType==p->eType ){
@@ -2314,13 +2296,11 @@ static Fts5ExprNode *fts5ParsePhraseToAnd(
        if( parseGrowPhraseArray(pParse) ){
          fts5ExprPhraseFree(pPhrase);
        }else{
-          Fts5ExprTerm *p = &pNear->apPhrase[0]->aTerm[ii];
-          Fts5ExprTerm *pTo = &pPhrase->aTerm[0];
          pParse->apPhrase[pParse->nPhrase++] = pPhrase;
          pPhrase->nTerm = 1;
-          pTo->pTerm = sqlite3Fts5Strndup(&pParse->rc, p->pTerm, p->nFullTerm);
-          pTo->nQueryTerm = p->nQueryTerm;
-          pTo->nFullTerm = p->nFullTerm;
+          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)
          );
@@ -2404,23 +2384,19 @@ Fts5ExprNode *sqlite3Fts5ParseNode(
                  "fts5: %s queries are not supported (detail!=full)", 
                  pNear->nPhrase==1 ? "phrase": "NEAR"
              );
-              sqlite3Fts5ParseNodeFree(pRet);
+              sqlite3_free(pRet);
              pRet = 0;
-              pNear = 0;
-              assert( pLeft==0 && pRight==0 );
            }
          }
        }else{
-          assert( pNear==0 );
          fts5ExprAddChildren(pRet, pLeft);
          fts5ExprAddChildren(pRet, pRight);
-          pLeft = pRight = 0;
          if( pRet->iHeight>SQLITE_FTS5_MAX_EXPR_DEPTH ){
            sqlite3Fts5ParseError(pParse, 
                "fts5 expression tree is too large (maximum depth %d)", 
                SQLITE_FTS5_MAX_EXPR_DEPTH
            );
-            sqlite3Fts5ParseNodeFree(pRet);
+            sqlite3_free(pRet);
            pRet = 0;
          }
        }
@@ -2458,7 +2434,6 @@ Fts5ExprNode *sqlite3Fts5ParseImplicitAnd(
    assert( pRight->eType==FTS5_STRING 
        || pRight->eType==FTS5_TERM 
        || pRight->eType==FTS5_EOF 
-        || (pRight->eType==FTS5_AND && pParse->bPhraseToAnd) 
    );

    if( pLeft->eType==FTS5_AND ){
@@ -2472,8 +2447,6 @@ Fts5ExprNode *sqlite3Fts5ParseImplicitAnd(
        );

    if( pRight->eType==FTS5_EOF ){
-      assert( pParse->apPhrase!=0 );
-      assert( pParse->nPhrase>0 );
      assert( pParse->apPhrase[pParse->nPhrase-1]==pRight->pNear->apPhrase[0] );
      sqlite3Fts5ParseNodeFree(pRight);
      pRet = pLeft;
@@ -2512,17 +2485,16 @@ static char *fts5ExprTermPrint(Fts5ExprTerm *pTerm){

  /* Determine the maximum amount of space required. */
  for(p=pTerm; p; p=p->pSynonym){
-    nByte += pTerm->nQueryTerm * 2 + 3 + 2;
+    nByte += (int)strlen(pTerm->zTerm) * 2 + 3 + 2;
  }
  zQuoted = sqlite3_malloc64(nByte);

  if( zQuoted ){
    int i = 0;
    for(p=pTerm; p; p=p->pSynonym){
-      char *zIn = p->pTerm;
-      char *zEnd = &zIn[p->nQueryTerm];
+      char *zIn = p->zTerm;
      zQuoted[i++] = '"';
-      while( zIn<zEnd ){
+      while( *zIn ){
        if( *zIn=='"' ) zQuoted[i++] = '"';
        zQuoted[i++] = *zIn++;
      }
@@ -2600,10 +2572,8 @@ static char *fts5ExprPrintTcl(

      zRet = fts5PrintfAppend(zRet, " {");
      for(iTerm=0; zRet && iTerm<pPhrase->nTerm; iTerm++){
-        Fts5ExprTerm *p = &pPhrase->aTerm[iTerm];
-        zRet = fts5PrintfAppend(zRet, "%s%.*s", iTerm==0?"":" ", 
-            p->nQueryTerm, p->pTerm
-        );
+        char *zTerm = pPhrase->aTerm[iTerm].zTerm;
+        zRet = fts5PrintfAppend(zRet, "%s%s", iTerm==0?"":" ", zTerm);
        if( pPhrase->aTerm[iTerm].bPrefix ){
          zRet = fts5PrintfAppend(zRet, "*");
        }
@@ -3004,17 +2974,6 @@ static int fts5ExprColsetTest(Fts5Colset *pColset, int iCol){
  return 0;
 }

-/*
-** pToken is a buffer nToken bytes in size that may or may not contain
-** an embedded 0x00 byte. If it does, return the number of bytes in
-** the buffer before the 0x00. If it does not, return nToken.
-*/
-static int fts5QueryTerm(const char *pToken, int nToken){
-  int ii;
-  for(ii=0; ii<nToken && pToken[ii]; ii++){}
-  return ii;
-}
-
 static int fts5ExprPopulatePoslistsCb(
  void *pCtx,                /* Copy of 2nd argument to xTokenize() */
  int tflags,                /* Mask of FTS5_TOKEN_* flags */
@@ -3026,33 +2985,22 @@ static int fts5ExprPopulatePoslistsCb(
  Fts5ExprCtx *p = (Fts5ExprCtx*)pCtx;
  Fts5Expr *pExpr = p->pExpr;
  int i;
-  int nQuery = nToken;
-  i64 iRowid = pExpr->pRoot->iRowid;

  UNUSED_PARAM2(iUnused1, iUnused2);

-  if( nQuery>FTS5_MAX_TOKEN_SIZE ) nQuery = FTS5_MAX_TOKEN_SIZE;
-  if( pExpr->pConfig->bTokendata ){
-    nQuery = fts5QueryTerm(pToken, nQuery);
-  }
+  if( nToken>FTS5_MAX_TOKEN_SIZE ) nToken = FTS5_MAX_TOKEN_SIZE;
  if( (tflags & FTS5_TOKEN_COLOCATED)==0 ) p->iOff++;
  for(i=0; i<pExpr->nPhrase; i++){
-    Fts5ExprTerm *pT;
+    Fts5ExprTerm *pTerm;
    if( p->aPopulator[i].bOk==0 ) continue;
-    for(pT=&pExpr->apExprPhrase[i]->aTerm[0]; pT; pT=pT->pSynonym){
-      if( (pT->nQueryTerm==nQuery || (pT->nQueryTerm<nQuery && pT->bPrefix))
-       && memcmp(pT->pTerm, pToken, pT->nQueryTerm)==0
+    for(pTerm=&pExpr->apExprPhrase[i]->aTerm[0]; pTerm; pTerm=pTerm->pSynonym){
+      int nTerm = (int)strlen(pTerm->zTerm);
+      if( (nTerm==nToken || (nTerm<nToken && pTerm->bPrefix))
+       && memcmp(pTerm->zTerm, pToken, nTerm)==0
      ){
        int rc = sqlite3Fts5PoslistWriterAppend(
            &pExpr->apExprPhrase[i]->poslist, &p->aPopulator[i].writer, p->iOff
        );
-        if( rc==SQLITE_OK && pExpr->pConfig->bTokendata && !pT->bPrefix ){
-          int iCol = p->iOff>>32;
-          int iTokOff = p->iOff & 0x7FFFFFFF;
-          rc = sqlite3Fts5IndexIterWriteTokendata(
-              pT->pIter, pToken, nToken, iRowid, iCol, iTokOff
-          );
-        }
        if( rc ) return rc;
        break;
      }
@@ -3106,7 +3054,6 @@ static int fts5ExprCheckPoslists(Fts5ExprNode *pNode, i64 iRowid){
  pNode->iRowid = iRowid;
  pNode->bEof = 0;
  switch( pNode->eType ){
-    case 0:
    case FTS5_TERM:
    case FTS5_STRING:
      return (pNode->pNear->apPhrase[0]->poslist.n>0);
@@ -3188,80 +3135,3 @@ int sqlite3Fts5ExprPhraseCollist(

  return rc;
 }
-
-/*
-** Does the work of the fts5_api.xQueryToken() API method.
-*/
-int sqlite3Fts5ExprQueryToken(
-  Fts5Expr *pExpr, 
-  int iPhrase, 
-  int iToken, 
-  const char **ppOut, 
-  int *pnOut
-){
-  Fts5ExprPhrase *pPhrase = 0;
-
-  if( iPhrase<0 || iPhrase>=pExpr->nPhrase ){
-    return SQLITE_RANGE;
-  }
-  pPhrase = pExpr->apExprPhrase[iPhrase];
-  if( iToken<0 || iToken>=pPhrase->nTerm ){
-    return SQLITE_RANGE;
-  }
-
-  *ppOut = pPhrase->aTerm[iToken].pTerm;
-  *pnOut = pPhrase->aTerm[iToken].nFullTerm;
-  return SQLITE_OK;
-}
-
-/*
-** Does the work of the fts5_api.xInstToken() API method.
-*/
-int sqlite3Fts5ExprInstToken(
-  Fts5Expr *pExpr, 
-  i64 iRowid,
-  int iPhrase, 
-  int iCol, 
-  int iOff, 
-  int iToken, 
-  const char **ppOut, 
-  int *pnOut
-){
-  Fts5ExprPhrase *pPhrase = 0;
-  Fts5ExprTerm *pTerm = 0;
-  int rc = SQLITE_OK;
-
-  if( iPhrase<0 || iPhrase>=pExpr->nPhrase ){
-    return SQLITE_RANGE;
-  }
-  pPhrase = pExpr->apExprPhrase[iPhrase];
-  if( iToken<0 || iToken>=pPhrase->nTerm ){
-    return SQLITE_RANGE;
-  }
-  pTerm = &pPhrase->aTerm[iToken];
-  if( pTerm->bPrefix==0 ){
-    if( pExpr->pConfig->bTokendata ){
-      rc = sqlite3Fts5IterToken(
-          pTerm->pIter, iRowid, iCol, iOff+iToken, ppOut, pnOut
-      );
-    }else{
-      *ppOut = pTerm->pTerm;
-      *pnOut = pTerm->nFullTerm;
-    }
-  }
-  return rc;
-}
-
-/*
-** Clear the token mappings for all Fts5IndexIter objects mannaged by 
-** the expression passed as the only argument.
-*/
-void sqlite3Fts5ExprClearTokens(Fts5Expr *pExpr){
-  int ii;
-  for(ii=0; ii<pExpr->nPhrase; ii++){
-    Fts5ExprTerm *pT;
-    for(pT=&pExpr->apExprPhrase[ii]->aTerm[0]; pT; pT=pT->pSynonym){
-      sqlite3Fts5IndexIterClearTokendata(pT->pIter);
-    }
-  }
-}
@@ -36,15 +36,10 @@ struct Fts5Hash {

 /*
 ** Each entry in the hash table is represented by an object of the 
-** following type. Each object, its key, and its current data are stored 
-** in a single memory allocation. The key immediately follows the object 
-** in memory. The position list data immediately follows the key data 
-** in memory.
-**
-** The key is Fts5HashEntry.nKey bytes in size. It consists of a single
-** byte identifying the index (either the main term index or a prefix-index),
-** followed by the term data. For example: "0token". There is no 
-** nul-terminator - in this case nKey=6.
+** following type. Each object, its key (a nul-terminated string) and 
+** its current data are stored in a single memory allocation. The 
+** key immediately follows the object in memory. The position list
+** data immediately follows the key data in memory.
 **
 ** The data that follows the key is in a similar, but not identical format
 ** to the doclist data stored in the database. It is:
@@ -179,7 +174,8 @@ static int fts5HashResize(Fts5Hash *pHash){
      unsigned int iHash;
      Fts5HashEntry *p = apOld[i];
      apOld[i] = p->pHashNext;
-      iHash = fts5HashKey(nNew, (u8*)fts5EntryKey(p), p->nKey);
+      iHash = fts5HashKey(nNew, (u8*)fts5EntryKey(p),
+                          (int)strlen(fts5EntryKey(p)));
      p->pHashNext = apNew[iHash];
      apNew[iHash] = p;
    }
@@ -263,7 +259,7 @@ int sqlite3Fts5HashWrite(
  for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){
    char *zKey = fts5EntryKey(p);
    if( zKey[0]==bByte 
-     && p->nKey==nToken+1
+     && p->nKey==nToken
     && memcmp(&zKey[1], pToken, nToken)==0 
    ){
      break;
@@ -293,9 +289,9 @@ int sqlite3Fts5HashWrite(
    zKey[0] = bByte;
    memcpy(&zKey[1], pToken, nToken);
    assert( iHash==fts5HashKey(pHash->nSlot, (u8*)zKey, nToken+1) );
-    p->nKey = nToken+1;
+    p->nKey = nToken;
    zKey[nToken+1] = '\0';
-    p->nData = nToken+1 + sizeof(Fts5HashEntry);
+    p->nData = nToken+1 + 1 + sizeof(Fts5HashEntry);
    p->pHashNext = pHash->aSlot[iHash];
    pHash->aSlot[iHash] = p;
    pHash->nEntry++;
@@ -412,17 +408,12 @@ static Fts5HashEntry *fts5HashEntryMerge(
      *ppOut = p1;
      p1 = 0;
    }else{
+      int i = 0;
      char *zKey1 = fts5EntryKey(p1);
      char *zKey2 = fts5EntryKey(p2);
-      int nMin = MIN(p1->nKey, p2->nKey);
+      while( zKey1[i]==zKey2[i] ) i++;

-      int cmp = memcmp(zKey1, zKey2, nMin);
-      if( cmp==0 ){
-        cmp = p1->nKey - p2->nKey;
-      }
-      assert( cmp!=0 );
-
-      if( cmp>0 ){
+      if( ((u8)zKey1[i])>((u8)zKey2[i]) ){
        /* p2 is smaller */
        *ppOut = p2;
        ppOut = &p2->pScanNext;
@@ -464,7 +455,7 @@ static int fts5HashEntrySort(
    Fts5HashEntry *pIter;
    for(pIter=pHash->aSlot[iSlot]; pIter; pIter=pIter->pHashNext){
      if( pTerm==0 
-       || (pIter->nKey>=nTerm && 0==memcmp(fts5EntryKey(pIter), pTerm, nTerm))
+       || (pIter->nKey+1>=nTerm && 0==memcmp(fts5EntryKey(pIter), pTerm, nTerm))
      ){
        Fts5HashEntry *pEntry = pIter;
        pEntry->pScanNext = 0;
@@ -503,11 +494,12 @@ int sqlite3Fts5HashQuery(

  for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){
    zKey = fts5EntryKey(p);
-    if( nTerm==p->nKey && memcmp(zKey, pTerm, nTerm)==0 ) break;
+    assert( p->nKey+1==(int)strlen(zKey) );
+    if( nTerm==p->nKey+1 && memcmp(zKey, pTerm, nTerm)==0 ) break;
  }

  if( p ){
-    int nHashPre = sizeof(Fts5HashEntry) + nTerm;
+    int nHashPre = sizeof(Fts5HashEntry) + nTerm + 1;
    int nList = p->nData - nHashPre;
    u8 *pRet = (u8*)(*ppOut = sqlite3_malloc64(nPre + nList + 10));
    if( pRet ){
@@ -568,22 +560,19 @@ int sqlite3Fts5HashScanEof(Fts5Hash *p){
 void sqlite3Fts5HashScanEntry(
  Fts5Hash *pHash,
  const char **pzTerm,            /* OUT: term (nul-terminated) */
-  int *pnTerm,                    /* OUT: Size of term in bytes */
  const u8 **ppDoclist,           /* OUT: pointer to doclist */
  int *pnDoclist                  /* OUT: size of doclist in bytes */
 ){
  Fts5HashEntry *p;
  if( (p = pHash->pScan) ){
    char *zKey = fts5EntryKey(p);
-    int nTerm = p->nKey;
+    int nTerm = (int)strlen(zKey);
    fts5HashAddPoslistSize(pHash, p, 0);
    *pzTerm = zKey;
-    *pnTerm = nTerm;
-    *ppDoclist = (const u8*)&zKey[nTerm];
-    *pnDoclist = p->nData - (sizeof(Fts5HashEntry) + nTerm);
+    *ppDoclist = (const u8*)&zKey[nTerm+1];
+    *pnDoclist = p->nData - (sizeof(Fts5HashEntry) + nTerm + 1);
  }else{
    *pzTerm = 0;
-    *pnTerm = 0;
    *ppDoclist = 0;
    *pnDoclist = 0;
  }
@@ -16,40 +16,13 @@

 #include "fts5Int.h"

-/*
-** pSavedRow:
-**   SQL statement FTS5_STMT_LOOKUP2 is a copy of FTS5_STMT_LOOKUP, it 
-**   does a by-rowid lookup to retrieve a single row from the %_content 
-**   table or equivalent external-content table/view.
-**
-**   However, FTS5_STMT_LOOKUP2 is only used when retrieving the original
-**   values for a row being UPDATEd. In that case, the SQL statement is
-**   not reset and pSavedRow is set to point at it. This is so that the
-**   insert operation that follows the delete may access the original 
-**   row values for any new values for which sqlite3_value_nochange() returns
-**   true. i.e. if the user executes:
-**
-**        CREATE VIRTUAL TABLE ft USING fts5(a, b, c, locale=1);
-**        ...
-**        UPDATE fts SET a=?, b=? WHERE rowid=?;
-**
-**   then the value passed to the xUpdate() method of this table as the 
-**   new.c value is an sqlite3_value_nochange() value. So in this case it
-**   must be read from the saved row stored in Fts5Storage.pSavedRow.
-**
-**   This is necessary - using sqlite3_value_nochange() instead of just having
-**   SQLite pass the original value back via xUpdate() - so as not to discard
-**   any locale information associated with such values.
-**
-*/
 struct Fts5Storage {
  Fts5Config *pConfig;
  Fts5Index *pIndex;
  int bTotalsValid;               /* True if nTotalRow/aTotalSize[] are valid */
  i64 nTotalRow;                  /* Total number of rows in FTS table */
  i64 *aTotalSize;                /* Total sizes of each column */ 
-  sqlite3_stmt *pSavedRow;
-  sqlite3_stmt *aStmt[12];
+  sqlite3_stmt *aStmt[11];
 };


@@ -63,39 +36,14 @@ struct Fts5Storage {
 # error "FTS5_STMT_LOOKUP mismatch" 
 #endif

-#define FTS5_STMT_LOOKUP2         3
-#define FTS5_STMT_INSERT_CONTENT  4
-#define FTS5_STMT_REPLACE_CONTENT 5
-#define FTS5_STMT_DELETE_CONTENT  6
-#define FTS5_STMT_REPLACE_DOCSIZE 7
-#define FTS5_STMT_DELETE_DOCSIZE  8
-#define FTS5_STMT_LOOKUP_DOCSIZE  9
-#define FTS5_STMT_REPLACE_CONFIG 10
-#define FTS5_STMT_SCAN           11
-
-/*
-** Return a pointer to a buffer obtained from sqlite3_malloc() that contains
-** nBind comma-separated question marks. e.g. if nBind is passed 5, this 
-** function returns "?,?,?,?,?".
-**
-** If *pRc is not SQLITE_OK when this function is called, it is a no-op and
-** NULL is returned immediately. Or, if the attempt to malloc a buffer
-** fails, then *pRc is set to SQLITE_NOMEM and NULL is returned. Otherwise,
-** if it is SQLITE_OK when this function is called and the malloc() succeeds,
-** *pRc is left unchanged.
-*/
-static char *fts5BindingsList(int *pRc, int nBind){
-  char *zBind = sqlite3Fts5MallocZero(pRc, 1 + nBind*2);
-  if( zBind ){
-    int ii;
-    for(ii=0; ii<nBind; ii++){
-      zBind[ii*2] = '?';
-      zBind[ii*2 + 1] = ',';
-    }
-    zBind[ii*2-1] = '\0';
-  }
-  return zBind;
-}
+#define FTS5_STMT_INSERT_CONTENT  3
+#define FTS5_STMT_REPLACE_CONTENT 4
+#define FTS5_STMT_DELETE_CONTENT  5
+#define FTS5_STMT_REPLACE_DOCSIZE  6
+#define FTS5_STMT_DELETE_DOCSIZE  7
+#define FTS5_STMT_LOOKUP_DOCSIZE  8
+#define FTS5_STMT_REPLACE_CONFIG 9
+#define FTS5_STMT_SCAN 10

 /*
 ** Prepare the two insert statements - Fts5Storage.pInsertContent and
@@ -125,7 +73,6 @@ static int fts5StorageGetStmt(
      "SELECT %s FROM %s T WHERE T.%Q >= ? AND T.%Q <= ? ORDER BY T.%Q ASC",
      "SELECT %s FROM %s T WHERE T.%Q <= ? AND T.%Q >= ? ORDER BY T.%Q DESC",
      "SELECT %s FROM %s T WHERE T.%Q=?",               /* LOOKUP  */
-      "SELECT %s FROM %s T WHERE T.%Q=?",               /* LOOKUP2  */

      "INSERT INTO %Q.'%q_content' VALUES(%s)",         /* INSERT_CONTENT  */
      "REPLACE INTO %Q.'%q_content' VALUES(%s)",        /* REPLACE_CONTENT */
@@ -141,8 +88,6 @@ static int fts5StorageGetStmt(
    Fts5Config *pC = p->pConfig;
    char *zSql = 0;

-    assert( ArraySize(azStmt)==ArraySize(p->aStmt) );
-
    switch( eStmt ){
      case FTS5_STMT_SCAN:
        zSql = sqlite3_mprintf(azStmt[eStmt], 
@@ -159,26 +104,24 @@ static int fts5StorageGetStmt(
        break;

      case FTS5_STMT_LOOKUP:
-      case FTS5_STMT_LOOKUP2:
        zSql = sqlite3_mprintf(azStmt[eStmt], 
            pC->zContentExprlist, pC->zContent, pC->zContentRowid
        );
        break;

-      case FTS5_STMT_INSERT_CONTENT: {
-        int nCol = 0;
+      case FTS5_STMT_INSERT_CONTENT: 
+      case FTS5_STMT_REPLACE_CONTENT: {
+        int nCol = pC->nCol + 1;
        char *zBind;
        int i;

-        nCol = 1 + pC->nCol;
-        if( pC->bLocale ){
-          for(i=0; i<pC->nCol; i++){
-            if( pC->abUnindexed[i]==0 ) nCol++;
-          }
-        }
-
-        zBind = fts5BindingsList(&rc, nCol);
+        zBind = sqlite3_malloc64(1 + nCol*2);
        if( zBind ){
+          for(i=0; i<nCol; i++){
+            zBind[i*2] = '?';
+            zBind[i*2 + 1] = ',';
+          }
+          zBind[i*2-1] = '\0';
          zSql = sqlite3_mprintf(azStmt[eStmt], pC->zDb, pC->zName, zBind);
          sqlite3_free(zBind);
        }
@@ -207,7 +150,7 @@ static int fts5StorageGetStmt(
      rc = SQLITE_NOMEM;
    }else{
      int f = SQLITE_PREPARE_PERSISTENT;
-      if( eStmt>FTS5_STMT_LOOKUP2 ) f |= SQLITE_PREPARE_NO_VTAB;
+      if( eStmt>FTS5_STMT_LOOKUP ) f |= SQLITE_PREPARE_NO_VTAB;
      p->pConfig->bLock++;
      rc = sqlite3_prepare_v3(pC->db, zSql, -1, f, &p->aStmt[eStmt], 0);
      p->pConfig->bLock--;
@@ -369,7 +312,7 @@ int sqlite3Fts5StorageOpen(
  if( bCreate ){
    if( pConfig->eContent==FTS5_CONTENT_NORMAL ){
      int nDefn = 32 + pConfig->nCol*10;
-      char *zDefn = sqlite3_malloc64(32 + (sqlite3_int64)pConfig->nCol * 20);
+      char *zDefn = sqlite3_malloc64(32 + (sqlite3_int64)pConfig->nCol * 10);
      if( zDefn==0 ){
        rc = SQLITE_NOMEM;
      }else{
@@ -381,14 +324,6 @@ int sqlite3Fts5StorageOpen(
          sqlite3_snprintf(nDefn-iOff, &zDefn[iOff], ", c%d", i);
          iOff += (int)strlen(&zDefn[iOff]);
        }
-        if( pConfig->bLocale ){
-          for(i=0; i<pConfig->nCol; i++){
-            if( pConfig->abUnindexed[i]==0 ){
-              sqlite3_snprintf(nDefn-iOff, &zDefn[iOff], ", l%d", i);
-              iOff += (int)strlen(&zDefn[iOff]);
-            }
-          }
-        }
        rc = sqlite3Fts5CreateTable(pConfig, "content", zDefn, 0, pzErr);
      }
      sqlite3_free(zDefn);
@@ -464,49 +399,15 @@ static int fts5StorageInsertCallback(
  return sqlite3Fts5IndexWrite(pIdx, pCtx->iCol, pCtx->szCol-1, pToken, nToken);
 }

-/*
-** This function is used as part of an UPDATE statement that modifies the
-** rowid of a row. In that case, this function is called first to set
-** Fts5Storage.pSavedRow to point to a statement that may be used to 
-** access the original values of the row being deleted - iDel.
-**
-** SQLITE_OK is returned if successful, or an SQLite error code otherwise.
-** It is not considered an error if row iDel does not exist. In this case
-** pSavedRow is not set and SQLITE_OK returned.
-*/
-int sqlite3Fts5StorageFindDeleteRow(Fts5Storage *p, i64 iDel){
-  int rc = SQLITE_OK;
-  sqlite3_stmt *pSeek = 0;
-
-  assert( p->pSavedRow==0 );
-  rc = fts5StorageGetStmt(p, FTS5_STMT_LOOKUP+1, &pSeek, 0);
-  if( rc==SQLITE_OK ){
-    sqlite3_bind_int64(pSeek, 1, iDel);
-    if( sqlite3_step(pSeek)!=SQLITE_ROW ){
-      rc = sqlite3_reset(pSeek);
-    }else{
-      p->pSavedRow = pSeek;
-    }
-  }
-
-  return rc;
-}
-
 /*
 ** If a row with rowid iDel is present in the %_content table, add the
 ** delete-markers to the FTS index necessary to delete it. Do not actually
 ** remove the %_content row at this time though.
-**
-** If parameter bSaveRow is true, then Fts5Storage.pSavedRow is left
-** pointing to a statement (FTS5_STMT_LOOKUP2) that may be used to access
-** the original values of the row being deleted. This is used by UPDATE
-** statements.
 */
 static int fts5StorageDeleteFromIndex(
  Fts5Storage *p, 
  i64 iDel, 
-  sqlite3_value **apVal,
-  int bSaveRow                    /* True to set pSavedRow */
+  sqlite3_value **apVal
 ){
  Fts5Config *pConfig = p->pConfig;
  sqlite3_stmt *pSeek = 0;        /* SELECT to read row iDel from %_data */
@@ -515,21 +416,12 @@ static int fts5StorageDeleteFromIndex(
  int iCol;
  Fts5InsertCtx ctx;

-  assert( bSaveRow==0 || apVal==0 );
-  assert( bSaveRow==0 || bSaveRow==1 );
-  assert( FTS5_STMT_LOOKUP2==FTS5_STMT_LOOKUP+1 );
-
  if( apVal==0 ){
-    if( p->pSavedRow && bSaveRow ){
-      pSeek = p->pSavedRow;
-      p->pSavedRow = 0;
-    }else{
-      rc = fts5StorageGetStmt(p, FTS5_STMT_LOOKUP+bSaveRow, &pSeek, 0);
-      if( rc!=SQLITE_OK ) return rc;
-      sqlite3_bind_int64(pSeek, 1, iDel);
-      if( sqlite3_step(pSeek)!=SQLITE_ROW ){
-        return sqlite3_reset(pSeek);
-      }
+    rc = fts5StorageGetStmt(p, FTS5_STMT_LOOKUP, &pSeek, 0);
+    if( rc!=SQLITE_OK ) return rc;
+    sqlite3_bind_int64(pSeek, 1, iDel);
+    if( sqlite3_step(pSeek)!=SQLITE_ROW ){
+      return sqlite3_reset(pSeek);
    }
  }

@@ -537,42 +429,26 @@ static int fts5StorageDeleteFromIndex(
  ctx.iCol = -1;
  for(iCol=1; rc==SQLITE_OK && iCol<=pConfig->nCol; iCol++){
    if( pConfig->abUnindexed[iCol-1]==0 ){
-      sqlite3_value *pVal = 0;
-      const char *pText = 0;
-      int nText = 0;
-      const char *pLoc = 0;
-      int nLoc = 0;
-
+      const char *zText;
+      int nText;
      assert( pSeek==0 || apVal==0 );
      assert( pSeek!=0 || apVal!=0 );
      if( pSeek ){
-        pVal = sqlite3_column_value(pSeek, iCol);
+        zText = (const char*)sqlite3_column_text(pSeek, iCol);
+        nText = sqlite3_column_bytes(pSeek, iCol);
+      }else if( ALWAYS(apVal) ){
+        zText = (const char*)sqlite3_value_text(apVal[iCol-1]);
+        nText = sqlite3_value_bytes(apVal[iCol-1]);
      }else{
-        pVal = apVal[iCol-1];
+        continue;
      }
-
-      if( pConfig->bLocale && sqlite3Fts5IsLocaleValue(pConfig, pVal) ){
-        rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
-      }else{
-        pText = (const char*)sqlite3_value_text(pVal);
-        nText = sqlite3_value_bytes(pVal);
-        if( pConfig->bLocale && pSeek ){
-          pLoc = (const char*)sqlite3_column_text(pSeek, iCol + pConfig->nCol);
-          nLoc = sqlite3_column_bytes(pSeek, iCol + pConfig->nCol);
-        }
-      }
-
-      if( rc==SQLITE_OK ){
-        sqlite3Fts5SetLocale(pConfig, pLoc, nLoc);
-        ctx.szCol = 0;
-        rc = sqlite3Fts5Tokenize(pConfig, FTS5_TOKENIZE_DOCUMENT, 
-            pText, nText, (void*)&ctx, fts5StorageInsertCallback
-        );
-        p->aTotalSize[iCol-1] -= (i64)ctx.szCol;
-        if( rc==SQLITE_OK && p->aTotalSize[iCol-1]<0 ){
-          rc = FTS5_CORRUPT;
-        }
-        sqlite3Fts5ClearLocale(pConfig);
+      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;
      }
    }
  }
@@ -582,29 +458,11 @@ static int fts5StorageDeleteFromIndex(
    p->nTotalRow--;
  }

-  if( rc==SQLITE_OK && bSaveRow ){
-    assert( p->pSavedRow==0 );
-    p->pSavedRow = pSeek;
-  }else{
-    rc2 = sqlite3_reset(pSeek);
-    if( rc==SQLITE_OK ) rc = rc2;
-  }
+  rc2 = sqlite3_reset(pSeek);
+  if( rc==SQLITE_OK ) rc = rc2;
  return rc;
 }

-/*
-** Reset any saved statement pSavedRow. Zero pSavedRow as well. This
-** should be called by the xUpdate() method of the fts5 table before 
-** returning from any operation that may have set Fts5Storage.pSavedRow.
-*/
-void sqlite3Fts5StorageReleaseDeleteRow(Fts5Storage *pStorage){
-  assert( pStorage->pSavedRow==0 
-       || pStorage->pSavedRow==pStorage->aStmt[FTS5_STMT_LOOKUP2] 
-  );
-  sqlite3_reset(pStorage->pSavedRow);
-  pStorage->pSavedRow = 0;
-}
-
 /*
 ** This function is called to process a DELETE on a contentless_delete=1
 ** table. It adds the tombstone required to delete the entry with rowid 
@@ -661,12 +519,12 @@ static int fts5StorageInsertDocsize(
        rc = sqlite3Fts5IndexGetOrigin(p->pIndex, &iOrigin);
        sqlite3_bind_int64(pReplace, 3, iOrigin);
      }
-    }
-    if( rc==SQLITE_OK ){
-      sqlite3_bind_blob(pReplace, 2, pBuf->p, pBuf->n, SQLITE_STATIC);
-      sqlite3_step(pReplace);
-      rc = sqlite3_reset(pReplace);
-      sqlite3_bind_null(pReplace, 2);
+      if( rc==SQLITE_OK ){
+        sqlite3_bind_blob(pReplace, 2, pBuf->p, pBuf->n, SQLITE_STATIC);
+        sqlite3_step(pReplace);
+        rc = sqlite3_reset(pReplace);
+        sqlite3_bind_null(pReplace, 2);
+      }
    }
  }
  return rc;
@@ -720,12 +578,7 @@ static int fts5StorageSaveTotals(Fts5Storage *p){
 /*
 ** Remove a row from the FTS table.
 */
-int sqlite3Fts5StorageDelete(
-  Fts5Storage *p,                 /* Storage object */
-  i64 iDel,                       /* Rowid to delete from table */
-  sqlite3_value **apVal,          /* Optional - values to remove from index */
-  int bSaveRow                    /* If true, set pSavedRow for deleted row */
-){
+int sqlite3Fts5StorageDelete(Fts5Storage *p, i64 iDel, sqlite3_value **apVal){
  Fts5Config *pConfig = p->pConfig;
  int rc;
  sqlite3_stmt *pDel = 0;
@@ -742,7 +595,7 @@ int sqlite3Fts5StorageDelete(
    if( p->pConfig->bContentlessDelete ){
      rc = fts5StorageContentlessDelete(p, iDel);
    }else{
-      rc = fts5StorageDeleteFromIndex(p, iDel, apVal, bSaveRow);
+      rc = fts5StorageDeleteFromIndex(p, iDel, apVal);
    }
  }

@@ -820,7 +673,7 @@ int sqlite3Fts5StorageRebuild(Fts5Storage *p){
  }

  if( rc==SQLITE_OK ){
-    rc = fts5StorageGetStmt(p, FTS5_STMT_SCAN, &pScan, pConfig->pzErrmsg);
+    rc = fts5StorageGetStmt(p, FTS5_STMT_SCAN, &pScan, 0);
  }

  while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(pScan) ){
@@ -831,36 +684,14 @@ int sqlite3Fts5StorageRebuild(Fts5Storage *p){
    for(ctx.iCol=0; rc==SQLITE_OK && ctx.iCol<pConfig->nCol; ctx.iCol++){
      ctx.szCol = 0;
      if( pConfig->abUnindexed[ctx.iCol]==0 ){
-        int nText = 0;            /* Size of pText in bytes */
-        const char *pText = 0;    /* Pointer to buffer containing text value */
-        int nLoc = 0;             /* Size of pLoc in bytes */
-        const char *pLoc = 0;     /* Pointer to buffer containing text value */
-
-        sqlite3_value *pVal = sqlite3_column_value(pScan, ctx.iCol+1);
-        if( pConfig->eContent==FTS5_CONTENT_EXTERNAL
-         && sqlite3Fts5IsLocaleValue(pConfig, pVal)
-        ){
-          rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
-        }else{
-          pText = (const char*)sqlite3_value_text(pVal);
-          nText = sqlite3_value_bytes(pVal);
-          if( pConfig->bLocale ){
-            int iCol = ctx.iCol + 1 + pConfig->nCol;
-            pLoc = (const char*)sqlite3_column_text(pScan, iCol);
-            nLoc = sqlite3_column_bytes(pScan, iCol);
-          }
-        }
-
-        if( rc==SQLITE_OK ){
-          sqlite3Fts5SetLocale(pConfig, pLoc, nLoc);
-          rc = sqlite3Fts5Tokenize(pConfig, 
-              FTS5_TOKENIZE_DOCUMENT,
-              pText, nText,
-              (void*)&ctx,
-              fts5StorageInsertCallback
-          );
-          sqlite3Fts5ClearLocale(pConfig);
-        }
+        const char *zText = (const char*)sqlite3_column_text(pScan, ctx.iCol+1);
+        int nText = sqlite3_column_bytes(pScan, ctx.iCol+1);
+        rc = sqlite3Fts5Tokenize(pConfig, 
+            FTS5_TOKENIZE_DOCUMENT,
+            zText, nText,
+            (void*)&ctx,
+            fts5StorageInsertCallback
+        );
      }
      sqlite3Fts5BufferAppendVarint(&rc, &buf, ctx.szCol);
      p->aTotalSize[ctx.iCol] += (i64)ctx.szCol;
@@ -942,49 +773,9 @@ int sqlite3Fts5StorageContentInsert(
  }else{
    sqlite3_stmt *pInsert = 0;    /* Statement to write %_content table */
    int i;                        /* Counter variable */
-    int nIndexed = 0;             /* Number indexed columns seen */
    rc = fts5StorageGetStmt(p, FTS5_STMT_INSERT_CONTENT, &pInsert, 0);
-    if( pInsert ) sqlite3_clear_bindings(pInsert);
-
-    /* Bind the rowid value */
-    sqlite3_bind_value(pInsert, 1, apVal[1]);
-
-    /* Loop through values for user-defined columns. i=2 is the leftmost
-    ** user-defined column. As is column 1 of pSavedRow.  */
-    for(i=2; rc==SQLITE_OK && i<=pConfig->nCol+1; i++){
-      int bUnindexed = pConfig->abUnindexed[i-2];
-      sqlite3_value *pVal = apVal[i];
-
-      nIndexed += !bUnindexed;
-      if( sqlite3_value_nochange(pVal) && p->pSavedRow ){
-        /* This is an UPDATE statement, and column (i-2) was not modified.
-        ** Retrieve the value from Fts5Storage.pSavedRow instead. */
-        pVal = sqlite3_column_value(p->pSavedRow, i-1);
-        if( pConfig->bLocale && bUnindexed==0 ){
-          sqlite3_bind_value(pInsert, pConfig->nCol + 1 + nIndexed,
-              sqlite3_column_value(p->pSavedRow, pConfig->nCol + i - 1)
-          );
-        }
-      }else if( sqlite3Fts5IsLocaleValue(pConfig, pVal) ){
-        const char *pText = 0;
-        const char *pLoc = 0;
-        int nText = 0;
-        int nLoc = 0;
-        assert( pConfig->bLocale );
-
-        rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
-        if( rc==SQLITE_OK ){
-          sqlite3_bind_text(pInsert, i, pText, nText, SQLITE_TRANSIENT);
-          if( bUnindexed==0 ){
-            int iLoc = pConfig->nCol + 1 + nIndexed;
-            sqlite3_bind_text(pInsert, iLoc, pLoc, nLoc, SQLITE_TRANSIENT);
-          }
-        }
-
-        continue;
-      }
-
-      rc = sqlite3_bind_value(pInsert, i, pVal);
+    for(i=1; rc==SQLITE_OK && i<=pConfig->nCol+1; i++){
+      rc = sqlite3_bind_value(pInsert, i, apVal[i]);
    }
    if( rc==SQLITE_OK ){
      sqlite3_step(pInsert);
@@ -1019,38 +810,14 @@ int sqlite3Fts5StorageIndexInsert(
  for(ctx.iCol=0; rc==SQLITE_OK && ctx.iCol<pConfig->nCol; ctx.iCol++){
    ctx.szCol = 0;
    if( pConfig->abUnindexed[ctx.iCol]==0 ){
-      int nText = 0;              /* Size of pText in bytes */
-      const char *pText = 0;      /* Pointer to buffer containing text value */
-      int nLoc = 0;               /* Size of pText in bytes */
-      const char *pLoc = 0;       /* Pointer to buffer containing text value */
-
-      sqlite3_value *pVal = apVal[ctx.iCol+2];
-      if( p->pSavedRow && sqlite3_value_nochange(pVal) ){
-        pVal = sqlite3_column_value(p->pSavedRow, ctx.iCol+1);
-        if( pConfig->eContent==FTS5_CONTENT_NORMAL && pConfig->bLocale ){
-          int iCol = ctx.iCol + 1 + pConfig->nCol;
-          pLoc = (const char*)sqlite3_column_text(p->pSavedRow, iCol);
-          nLoc = sqlite3_column_bytes(p->pSavedRow, iCol);
-        }
-      }else{
-        pVal = apVal[ctx.iCol+2];
-      }
-
-      if( pConfig->bLocale && sqlite3Fts5IsLocaleValue(pConfig, pVal) ){
-        rc = sqlite3Fts5DecodeLocaleValue(pVal, &pText, &nText, &pLoc, &nLoc);
-      }else{
-        pText = (const char*)sqlite3_value_text(pVal);
-        nText = sqlite3_value_bytes(pVal);
-      }
-
-      if( rc==SQLITE_OK ){
-        sqlite3Fts5SetLocale(pConfig, pLoc, nLoc);
-        rc = sqlite3Fts5Tokenize(pConfig, 
-            FTS5_TOKENIZE_DOCUMENT, pText, nText, (void*)&ctx,
-            fts5StorageInsertCallback
-        );
-        sqlite3Fts5ClearLocale(pConfig);
-      }
+      const char *zText = (const char*)sqlite3_value_text(apVal[ctx.iCol+2]);
+      int nText = sqlite3_value_bytes(apVal[ctx.iCol+2]);
+      rc = sqlite3Fts5Tokenize(pConfig, 
+          FTS5_TOKENIZE_DOCUMENT,
+          zText, nText,
+          (void*)&ctx,
+          fts5StorageInsertCallback
+      );
    }
    sqlite3Fts5BufferAppendVarint(&rc, &buf, ctx.szCol);
    p->aTotalSize[ctx.iCol] += (i64)ctx.szCol;
@@ -1214,61 +981,29 @@ int sqlite3Fts5StorageIntegrity(Fts5Storage *p, int iArg){
          rc = sqlite3Fts5TermsetNew(&ctx.pTermset);
        }
        for(i=0; rc==SQLITE_OK && i<pConfig->nCol; i++){
-          if( pConfig->abUnindexed[i]==0 ){
-            const char *pText = 0;
-            int nText = 0;
-            const char *pLoc = 0;
-            int nLoc = 0;
-            sqlite3_value *pVal = sqlite3_column_value(pScan, i+1);
-
-            if( pConfig->eContent==FTS5_CONTENT_EXTERNAL 
-             && sqlite3Fts5IsLocaleValue(pConfig, pVal)
-            ){
-              rc = sqlite3Fts5DecodeLocaleValue(
-                  pVal, &pText, &nText, &pLoc, &nLoc
-              );
-            }else{
-              if( pConfig->eContent==FTS5_CONTENT_NORMAL && pConfig->bLocale ){
-                int iCol = i + 1 + pConfig->nCol;
-                pLoc = (const char*)sqlite3_column_text(pScan, iCol);
-                nLoc = sqlite3_column_bytes(pScan, iCol);
-              }
-              pText = (const char*)sqlite3_value_text(pVal);
-              nText = sqlite3_value_bytes(pVal);
-            }
-
-            ctx.iCol = i;
-            ctx.szCol = 0;
-
-            if( rc==SQLITE_OK && pConfig->eDetail==FTS5_DETAIL_COLUMNS ){
-              rc = sqlite3Fts5TermsetNew(&ctx.pTermset);
-            }
-
-            if( rc==SQLITE_OK ){
-              sqlite3Fts5SetLocale(pConfig, pLoc, nLoc);
-              rc = sqlite3Fts5Tokenize(pConfig, 
-                  FTS5_TOKENIZE_DOCUMENT,
-                  pText, nText,
-                  (void*)&ctx,
-                  fts5StorageIntegrityCallback
-              );
-              sqlite3Fts5ClearLocale(pConfig);
-            }
-
-            /* If this is not a columnsize=0 database, check that the number
-            ** of tokens in the value matches the aColSize[] value read from
-            ** the %_docsize table.  */
-            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( 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;
          }
        }
        sqlite3Fts5TermsetFree(ctx.pTermset);
@@ -14,7 +14,14 @@


 #ifdef SQLITE_TEST
-#include "tclsqlite.h"
+#if defined(INCLUDE_SQLITE_TCL_H)
+#  include "sqlite_tcl.h"
+#else
+#  include "tcl.h"
+#  ifndef SQLITE_TCLAPI
+#    define SQLITE_TCLAPI
+#  endif
+#endif

 #ifdef SQLITE_ENABLE_FTS5

@@ -96,14 +103,14 @@ static int SQLITE_TCLAPI f5tDbAndApi(

    rc = sqlite3_prepare_v2(db, "SELECT fts5(?1)", -1, &pStmt, 0);
    if( rc!=SQLITE_OK ){
-      Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), (char*)0);
+      Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), 0);
      return TCL_ERROR;
    }
    sqlite3_bind_pointer(pStmt, 1, (void*)&pApi, "fts5_api_ptr", 0);
    sqlite3_step(pStmt);

    if( sqlite3_finalize(pStmt)!=SQLITE_OK ){
-      Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), (char*)0);
+      Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), 0);
      return TCL_ERROR;
    }

@@ -237,10 +244,6 @@ static int SQLITE_TCLAPI xF5tApi(
    { "xGetAuxdataInt",    1, "CLEAR" },              /* 15 */
    { "xPhraseForeach",    4, "IPHRASE COLVAR OFFVAR SCRIPT" }, /* 16 */
    { "xPhraseColumnForeach", 3, "IPHRASE COLVAR SCRIPT" }, /* 17 */
-
-    { "xQueryToken",       2, "IPHRASE ITERM" },      /* 18 */
-    { "xInstToken",        2, "IDX ITERM" },          /* 19 */
-    { "xColumnLocale",     1, "COL" },                /* 20 */
    { 0, 0, 0}
  };

@@ -291,12 +294,12 @@ static int SQLITE_TCLAPI xF5tApi(
      break;
    }
    CASE(3, "xTokenize") {
-      Tcl_Size nText;
+      int nText;
      char *zText = Tcl_GetStringFromObj(objv[2], &nText);
      F5tFunction ctx;
      ctx.interp = interp;
      ctx.pScript = objv[3];
-      rc = p->pApi->xTokenize(p->pFts, zText, (int)nText, &ctx, xTokenizeCb);
+      rc = p->pApi->xTokenize(p->pFts, zText, nText, &ctx, xTokenizeCb);
      if( rc==SQLITE_OK ){
        Tcl_ResetResult(interp);
      }
@@ -392,7 +395,7 @@ static int SQLITE_TCLAPI xF5tApi(
    CASE(12, "xSetAuxdata") {
      F5tAuxData *pData = (F5tAuxData*)sqlite3_malloc(sizeof(F5tAuxData));
      if( pData==0 ){
-        Tcl_AppendResult(interp, "out of memory", (char*)0);
+        Tcl_AppendResult(interp, "out of memory", 0);
        return TCL_ERROR;
      }
      pData->pObj = objv[2];
@@ -452,7 +455,7 @@ static int SQLITE_TCLAPI xF5tApi(

      rc = p->pApi->xPhraseFirst(p->pFts, iPhrase, &iter, &iCol, &iOff);
      if( rc!=SQLITE_OK ){
-        Tcl_AppendResult(interp, sqlite3ErrName(rc), (char*)0);
+        Tcl_AppendResult(interp, sqlite3ErrName(rc), 0);
        return TCL_ERROR;
      }
      for( ;iCol>=0; p->pApi->xPhraseNext(p->pFts, &iter, &iCol, &iOff) ){
@@ -497,52 +500,6 @@ static int SQLITE_TCLAPI xF5tApi(
      break;
    }

-    CASE(18, "xQueryToken") {
-      const char *pTerm = 0;
-      int nTerm = 0;
-      int iPhrase = 0;
-      int iTerm = 0;
-
-      if( Tcl_GetIntFromObj(interp, objv[2], &iPhrase) ) return TCL_ERROR;
-      if( Tcl_GetIntFromObj(interp, objv[3], &iTerm) ) return TCL_ERROR;
-      rc = p->pApi->xQueryToken(p->pFts, iPhrase, iTerm, &pTerm, &nTerm);
-      if( rc==SQLITE_OK ){
-        Tcl_SetObjResult(interp, Tcl_NewStringObj(pTerm, nTerm));
-      }
-
-      break;
-    }
-
-    CASE(19, "xInstToken") {
-      const char *pTerm = 0;
-      int nTerm = 0;
-      int iIdx = 0;
-      int iTerm = 0;
-
-      if( Tcl_GetIntFromObj(interp, objv[2], &iIdx) ) return TCL_ERROR;
-      if( Tcl_GetIntFromObj(interp, objv[3], &iTerm) ) return TCL_ERROR;
-      rc = p->pApi->xInstToken(p->pFts, iIdx, iTerm, &pTerm, &nTerm);
-      if( rc==SQLITE_OK ){
-        Tcl_SetObjResult(interp, Tcl_NewStringObj(pTerm, nTerm));
-      }
-
-      break;
-    }
-
-    CASE(20, "xColumnLocale") {
-      const char *z = 0;
-      int n = 0;
-      int iCol;
-      if( Tcl_GetIntFromObj(interp, objv[2], &iCol) ){
-        return TCL_ERROR;
-      }
-      rc = p->pApi->xColumnLocale(p->pFts, iCol, &z, &n);
-      if( rc==SQLITE_OK && z ){
-        Tcl_SetObjResult(interp, Tcl_NewStringObj(z, n));
-      }
-      break;
-    }
-
    default: 
      assert( 0 );
      break;
@@ -613,16 +570,15 @@ static void xF5tFunction(
    sqlite3_result_error(pCtx, Tcl_GetStringResult(p->interp), -1);
  }else{
    Tcl_Obj *pVar = Tcl_GetObjResult(p->interp);
+    int n;
    const char *zType = (pVar->typePtr ? pVar->typePtr->name : "");
    char c = zType[0];
    if( c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0 ){
      /* Only return a BLOB type if the Tcl variable is a bytearray and
      ** has no string representation. */
-      Tcl_Size nn;
-      unsigned char *data = Tcl_GetByteArrayFromObj(pVar, &nn);
-      sqlite3_result_blob(pCtx, data, (int)nn, SQLITE_TRANSIENT);
+      unsigned char *data = Tcl_GetByteArrayFromObj(pVar, &n);
+      sqlite3_result_blob(pCtx, data, n, SQLITE_TRANSIENT);
    }else if( c=='b' && strcmp(zType,"boolean")==0 ){
-      int n;
      Tcl_GetIntFromObj(0, pVar, &n);
      sqlite3_result_int(pCtx, n);
    }else if( c=='d' && strcmp(zType,"double")==0 ){
@@ -635,9 +591,8 @@ static void xF5tFunction(
      Tcl_GetWideIntFromObj(0, pVar, &v);
      sqlite3_result_int64(pCtx, v);
    }else{
-      Tcl_Size nn;
-      unsigned char *data = (unsigned char *)Tcl_GetStringFromObj(pVar, &nn);
-      sqlite3_result_text(pCtx, (char*)data, (int)nn, SQLITE_TRANSIENT);
+      unsigned char *data = (unsigned char *)Tcl_GetStringFromObj(pVar, &n);
+      sqlite3_result_text(pCtx, (char *)data, n, SQLITE_TRANSIENT);
    }
  }
 }
@@ -683,7 +638,7 @@ static int SQLITE_TCLAPI f5tCreateFunction(
      pApi, zName, (void*)pCtx, xF5tFunction, xF5tDestroy
  );
  if( rc!=SQLITE_OK ){
-    Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), (char*)0);
+    Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), 0);
    return TCL_ERROR;
  }

@@ -730,7 +685,7 @@ static int SQLITE_TCLAPI f5tTokenize(
  Tcl_Obj *CONST objv[]
 ){
  char *zText;
-  Tcl_Size nText;
+  int nText;
  sqlite3 *db = 0;
  fts5_api *pApi = 0;
  Fts5Tokenizer *pTok = 0;
@@ -739,7 +694,7 @@ static int SQLITE_TCLAPI f5tTokenize(
  void *pUserdata;
  int rc;

-  Tcl_Size nArg;
+  int nArg;
  const char **azArg;
  F5tTokenizeCtx ctx;

@@ -750,7 +705,7 @@ static int SQLITE_TCLAPI f5tTokenize(
  if( objc==5 ){
    char *zOpt = Tcl_GetString(objv[1]);
    if( strcmp("-subst", zOpt) ){
-      Tcl_AppendResult(interp, "unrecognized option: ", zOpt, (char*)0);
+      Tcl_AppendResult(interp, "unrecognized option: ", zOpt, 0);
      return TCL_ERROR;
    }
  }
@@ -759,7 +714,7 @@ static int SQLITE_TCLAPI f5tTokenize(
    return TCL_ERROR;
  }
  if( nArg==0 ){
-    Tcl_AppendResult(interp, "no such tokenizer: ", (char*)0);
+    Tcl_AppendResult(interp, "no such tokenizer: ", 0);
    Tcl_Free((void*)azArg);
    return TCL_ERROR;
  }
@@ -767,13 +722,13 @@ static int SQLITE_TCLAPI f5tTokenize(

  rc = pApi->xFindTokenizer(pApi, azArg[0], &pUserdata, &tokenizer);
  if( rc!=SQLITE_OK ){
-    Tcl_AppendResult(interp, "no such tokenizer: ", azArg[0], (char*)0);
+    Tcl_AppendResult(interp, "no such tokenizer: ", azArg[0], 0);
    return TCL_ERROR;
  }

-  rc = tokenizer.xCreate(pUserdata, &azArg[1], (int)(nArg-1), &pTok);
+  rc = tokenizer.xCreate(pUserdata, &azArg[1], nArg-1, &pTok);
  if( rc!=SQLITE_OK ){
-    Tcl_AppendResult(interp, "error in tokenizer.xCreate()", (char*)0);
+    Tcl_AppendResult(interp, "error in tokenizer.xCreate()", 0);
    return TCL_ERROR;
  }

@@ -783,11 +738,11 @@ static int SQLITE_TCLAPI f5tTokenize(
  ctx.pRet = pRet;
  ctx.zInput = zText;
  rc = tokenizer.xTokenize(
-      pTok, (void*)&ctx, FTS5_TOKENIZE_DOCUMENT, zText,(int)nText, xTokenizeCb2
+      pTok, (void*)&ctx, FTS5_TOKENIZE_DOCUMENT, zText, nText, xTokenizeCb2
  );
  tokenizer.xDelete(pTok);
  if( rc!=SQLITE_OK ){
-    Tcl_AppendResult(interp, "error in tokenizer.xTokenize()", (char*)0);
+    Tcl_AppendResult(interp, "error in tokenizer.xTokenize()", 0);
    Tcl_DecrRefCount(pRet);
    return TCL_ERROR;
  }
@@ -811,32 +766,18 @@ typedef struct F5tTokenizerInstance F5tTokenizerInstance;
 struct F5tTokenizerContext {
  void *pCtx;
  int (*xToken)(void*, int, const char*, int, int, int);
-  F5tTokenizerInstance *pInst;
 };

 struct F5tTokenizerModule {
  Tcl_Interp *interp;
  Tcl_Obj *pScript;
-  void *pParentCtx;
-  fts5_tokenizer_v2 parent_v2;
-  fts5_tokenizer parent;
  F5tTokenizerContext *pContext;
 };

-/*
-** zLocale:
-**   Within a call to xTokenize_v2(), pLocale/nLocale store the locale
-**   passed to the call by fts5. This can be retrieved by a Tcl tokenize 
-**   script using [sqlite3_fts5_locale].
-*/
 struct F5tTokenizerInstance {
  Tcl_Interp *interp;
  Tcl_Obj *pScript;
-  F5tTokenizerModule *pModule;
-  Fts5Tokenizer *pParent;
  F5tTokenizerContext *pContext;
-  const char *pLocale;
-  int nLocale;
 };

 static int f5tTokenizerCreate(
@@ -845,20 +786,11 @@ static int f5tTokenizerCreate(
  int nArg, 
  Fts5Tokenizer **ppOut
 ){
-  Fts5Tokenizer *pParent = 0;
  F5tTokenizerModule *pMod = (F5tTokenizerModule*)pCtx;
  Tcl_Obj *pEval;
  int rc = TCL_OK;
  int i;

-  assert( pMod->parent_v2.xCreate==0 || pMod->parent.xCreate==0 );
-  if( pMod->parent_v2.xCreate ){
-    rc = pMod->parent_v2.xCreate(pMod->pParentCtx, 0, 0, &pParent);
-  }
-  if( pMod->parent.xCreate ){
-    rc = pMod->parent.xCreate(pMod->pParentCtx, 0, 0, &pParent);
-  }
-
  pEval = Tcl_DuplicateObj(pMod->pScript);
  Tcl_IncrRefCount(pEval);
  for(i=0; rc==TCL_OK && i<nArg; i++){
@@ -878,8 +810,6 @@ static int f5tTokenizerCreate(
    pInst->interp = pMod->interp;
    pInst->pScript = Tcl_GetObjResult(pMod->interp);
    pInst->pContext = pMod->pContext;
-    pInst->pParent = pParent;
-    pInst->pModule = pMod;
    Tcl_IncrRefCount(pInst->pScript);
    *ppOut = (Fts5Tokenizer*)pInst;
  }
@@ -890,21 +820,11 @@ static int f5tTokenizerCreate(

 static void f5tTokenizerDelete(Fts5Tokenizer *p){
  F5tTokenizerInstance *pInst = (F5tTokenizerInstance*)p;
-  if( pInst ){
-    if( pInst->pParent ){
-      if( pInst->pModule->parent_v2.xDelete ){
-        pInst->pModule->parent_v2.xDelete(pInst->pParent);
-      }else{
-        pInst->pModule->parent.xDelete(pInst->pParent);
-      }
-    }
-    Tcl_DecrRefCount(pInst->pScript);
-    ckfree((char *)pInst);
-  }
+  Tcl_DecrRefCount(pInst->pScript);
+  ckfree((char *)pInst);
 }

-
-static int f5tTokenizerReallyTokenize(
+static int f5tTokenizerTokenize(
  Fts5Tokenizer *p, 
  void *pCtx,
  int flags,
@@ -912,7 +832,6 @@ static int f5tTokenizerReallyTokenize(
  int (*xToken)(void*, int, const char*, int, int, int)
 ){
  F5tTokenizerInstance *pInst = (F5tTokenizerInstance*)p;
-  F5tTokenizerInstance *pOldInst = 0;
  void *pOldCtx;
  int (*xOldToken)(void*, int, const char*, int, int, int);
  Tcl_Obj *pEval;
@@ -921,11 +840,9 @@ static int f5tTokenizerReallyTokenize(

  pOldCtx = pInst->pContext->pCtx;
  xOldToken = pInst->pContext->xToken;
-  pOldInst = pInst->pContext->pInst;

  pInst->pContext->pCtx = pCtx;
  pInst->pContext->xToken = xToken;
-  pInst->pContext->pInst = pInst;

  assert( 
      flags==FTS5_TOKENIZE_DOCUMENT
@@ -961,105 +878,9 @@ static int f5tTokenizerReallyTokenize(

  pInst->pContext->pCtx = pOldCtx;
  pInst->pContext->xToken = xOldToken;
-  pInst->pContext->pInst = pOldInst;
  return rc;
 }

-typedef struct CallbackCtx CallbackCtx;
-struct CallbackCtx {
-  Fts5Tokenizer *p;
-  void *pCtx;
-  int flags;
-  int (*xToken)(void*, int, const char*, int, int, int);
-};
-
-static int f5tTokenizeCallback(
-  void *pCtx, 
-  int tflags, 
-  const char *z, int n, 
-  int iStart, int iEnd
-){
-  CallbackCtx *p = (CallbackCtx*)pCtx;
-  return f5tTokenizerReallyTokenize(p->p, p->pCtx, p->flags, z, n, p->xToken);
-}
-
-static int f5tTokenizerTokenize_v2(
-  Fts5Tokenizer *p, 
-  void *pCtx,
-  int flags,
-  const char *pText, int nText, 
-  const char *pLoc, int nLoc, 
-  int (*xToken)(void*, int, const char*, int, int, int)
-){
-  int rc = SQLITE_OK;
-  F5tTokenizerInstance *pInst = (F5tTokenizerInstance*)p;
-
-  pInst->pLocale = pLoc;
-  pInst->nLocale = nLoc;
-
-  if( pInst->pParent ){
-    CallbackCtx ctx;
-    ctx.p = p;
-    ctx.pCtx = pCtx;
-    ctx.flags = flags;
-    ctx.xToken = xToken;
-    if( pInst->pModule->parent_v2.xTokenize ){
-      rc = pInst->pModule->parent_v2.xTokenize(
-          pInst->pParent, (void*)&ctx, flags, pText, nText, 
-          pLoc, nLoc, f5tTokenizeCallback
-      );
-    }else{
-      rc = pInst->pModule->parent.xTokenize(
-          pInst->pParent, (void*)&ctx, flags, pText, nText, f5tTokenizeCallback
-      );
-    }
-  }else{
-    rc = f5tTokenizerReallyTokenize(p, pCtx, flags, pText, nText, xToken);
-  }
-
-  pInst->pLocale = 0;
-  pInst->nLocale = 0;
-  return rc;
-}
-static int f5tTokenizerTokenize(
-  Fts5Tokenizer *p, 
-  void *pCtx,
-  int flags,
-  const char *pText, int nText, 
-  int (*xToken)(void*, int, const char*, int, int, int)
-){
-  return f5tTokenizerTokenize_v2(p, pCtx, flags, pText, nText, 0, 0, xToken);
-}
-
-/*
-** sqlite3_fts5_locale 
-*/
-static int SQLITE_TCLAPI f5tTokenizerLocale(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  F5tTokenizerContext *p = (F5tTokenizerContext*)clientData;
-
-  if( objc!=1 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "");
-    return TCL_ERROR;
-  }
-
-  if( p->xToken==0 ){
-    Tcl_AppendResult(interp, 
-        "sqlite3_fts5_locale may only be used by tokenizer callback", (char*)0
-    );
-    return TCL_ERROR;
-  }
-
-  Tcl_SetObjResult(interp, 
-      Tcl_NewStringObj(p->pInst->pLocale, p->pInst->nLocale)
-  );
-  return TCL_OK;
-}
-
 /*
 ** sqlite3_fts5_token ?-colocated? TEXT START END
 */
@@ -1072,13 +893,13 @@ static int SQLITE_TCLAPI f5tTokenizerReturn(
  F5tTokenizerContext *p = (F5tTokenizerContext*)clientData;
  int iStart;
  int iEnd;
-  Tcl_Size nToken;
+  int nToken;
  int tflags = 0;
  char *zToken;
  int rc;

  if( objc==5 ){
-    Tcl_Size nArg;
+    int nArg;
    char *zArg = Tcl_GetStringFromObj(objv[1], &nArg);
    if( nArg<=10 && nArg>=2 && memcmp("-colocated", zArg, nArg)==0 ){
      tflags |= FTS5_TOKEN_COLOCATED;
@@ -1098,12 +919,12 @@ static int SQLITE_TCLAPI f5tTokenizerReturn(

  if( p->xToken==0 ){
    Tcl_AppendResult(interp, 
-        "sqlite3_fts5_token may only be used by tokenizer callback", (char*)0
+        "sqlite3_fts5_token may only be used by tokenizer callback", 0
    );
    return TCL_ERROR;
  }

-  rc = p->xToken(p->pCtx, tflags, zToken, (int)nToken, iStart, iEnd);
+  rc = p->xToken(p->pCtx, tflags, zToken, nToken, iStart, iEnd);
  Tcl_SetResult(interp, (char*)sqlite3ErrName(rc), TCL_VOLATILE);
  return rc==SQLITE_OK ? TCL_OK : TCL_ERROR;

@@ -1145,112 +966,32 @@ static int SQLITE_TCLAPI f5tCreateTokenizer(
  fts5_api *pApi;
  char *zName;
  Tcl_Obj *pScript;
+  fts5_tokenizer t;
  F5tTokenizerModule *pMod;
-  int rc = SQLITE_OK;
-  int bV2 = 0;                    /* True to use _v2 API */
-  int iVersion = 2;               /* Value for _v2.iVersion */
-  const char *zParent = 0;        /* Name of parent tokenizer, if any */
-  int ii = 0;
+  int rc;

-  if( objc<4 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "?OPTIONS? DB NAME SCRIPT");
+  if( objc!=4 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "DB NAME SCRIPT");
    return TCL_ERROR;
  }
-
-  /* Parse any options. Set stack variables bV2 and zParent. */
-  for(ii=1; ii<objc-3; ii++){
-    int iOpt = 0;
-    const char *azOpt[] = { "-v2", "-parent", "-version", 0 };
-    if( Tcl_GetIndexFromObj(interp, objv[ii], azOpt, "OPTION", 0, &iOpt) ){
-      return TCL_ERROR;
-    }
-    switch( iOpt ){
-      case 0: /* -v2 */ {
-        bV2 = 1;
-        break;
-      }
-      case 1: /* -parent */ {
-        ii++;
-        if( ii==objc-3 ){
-          Tcl_AppendResult(
-              interp, "option requires an argument: -parent", (char*)0
-          );
-          return TCL_ERROR;
-        }
-        zParent = Tcl_GetString(objv[ii]);
-        break;
-      }
-      case 2: /* -version */ {
-        ii++;
-        if( ii==objc-3 ){
-          Tcl_AppendResult(
-              interp, "option requires an argument: -version", (char*)0
-          );
-          return TCL_ERROR;
-        }
-        if( Tcl_GetIntFromObj(interp, objv[ii], &iVersion) ){
-          return TCL_ERROR;
-        }
-        break;
-      }
-      default:
-        assert( 0 );
-        break;
-    }
-  }
-
-  if( f5tDbAndApi(interp, objv[objc-3], &db, &pApi) ){
+  if( f5tDbAndApi(interp, objv[1], &db, &pApi) ){
    return TCL_ERROR;
  }
-  zName = Tcl_GetString(objv[objc-2]);
-  pScript = objv[objc-1];
+  zName = Tcl_GetString(objv[2]);
+  pScript = objv[3];
+
+  t.xCreate = f5tTokenizerCreate;
+  t.xTokenize = f5tTokenizerTokenize;
+  t.xDelete = f5tTokenizerDelete;

  pMod = (F5tTokenizerModule*)ckalloc(sizeof(F5tTokenizerModule));
-  memset(pMod, 0, sizeof(F5tTokenizerModule));
  pMod->interp = interp;
  pMod->pScript = pScript;
-  Tcl_IncrRefCount(pScript);
  pMod->pContext = pContext;
-  if( zParent ){
-    if( bV2 ){
-      fts5_tokenizer_v2 *pParent = 0;
-      rc = pApi->xFindTokenizer_v2(pApi, zParent, &pMod->pParentCtx, &pParent);
-      if( rc==SQLITE_OK ){
-        memcpy(&pMod->parent_v2, pParent, sizeof(fts5_tokenizer_v2));
-        pMod->parent_v2.xDelete(0);
-      }
-    }else{
-      rc = pApi->xFindTokenizer(pApi, zParent, &pMod->pParentCtx,&pMod->parent);
-      if( rc==SQLITE_OK ){
-        pMod->parent.xDelete(0);
-      }
-    }
-  }
-
-  if( rc==SQLITE_OK ){
-    void *pModCtx = (void*)pMod;
-    if( bV2==0 ){
-      fts5_tokenizer t;
-      t.xCreate = f5tTokenizerCreate;
-      t.xTokenize = f5tTokenizerTokenize;
-      t.xDelete = f5tTokenizerDelete;
-      rc = pApi->xCreateTokenizer(pApi, zName, pModCtx, &t, f5tDelTokenizer);
-    }else{
-      fts5_tokenizer_v2 t2;
-      memset(&t2, 0, sizeof(t2));
-      t2.iVersion = iVersion;
-      t2.xCreate = f5tTokenizerCreate;
-      t2.xTokenize = f5tTokenizerTokenize_v2;
-      t2.xDelete = f5tTokenizerDelete;
-      rc = pApi->xCreateTokenizer_v2(pApi, zName, pModCtx, &t2,f5tDelTokenizer);
-    }
-  }
-
+  Tcl_IncrRefCount(pScript);
+  rc = pApi->xCreateTokenizer(pApi, zName, (void*)pMod, &t, f5tDelTokenizer);
  if( rc!=SQLITE_OK ){
-    Tcl_AppendResult(interp, (
-          bV2 ? "error in fts5_api.xCreateTokenizer_v2()"
-          : "error in fts5_api.xCreateTokenizer()"
-    ), (char*)0);
+    Tcl_AppendResult(interp, "error in fts5_api.xCreateTokenizer()", 0);
    return TCL_ERROR;
  }

@@ -1307,7 +1048,7 @@ static int SQLITE_TCLAPI f5tTokenHash(
  Tcl_Obj *CONST objv[]
 ){
  char *z;
-  Tcl_Size n;
+  int n;
  unsigned int iVal;
  int nSlot;

@@ -1320,7 +1061,7 @@ static int SQLITE_TCLAPI f5tTokenHash(
  }
  z = Tcl_GetStringFromObj(objv[2], &n);

-  iVal = f5t_fts5HashKey(nSlot, z, (int)n);
+  iVal = f5t_fts5HashKey(nSlot, z, n);
  Tcl_SetObjResult(interp, Tcl_NewIntObj(iVal));
  return TCL_OK;
 }
@@ -1376,256 +1117,6 @@ static int SQLITE_TCLAPI f5tRegisterTok(
  return TCL_OK;
 }

-typedef struct OriginTextCtx OriginTextCtx;
-struct OriginTextCtx {
-  sqlite3 *db;
-  fts5_api *pApi;
-};
-
-typedef struct OriginTextTokenizer OriginTextTokenizer;
-struct OriginTextTokenizer {
-  Fts5Tokenizer *pTok;            /* Underlying tokenizer object */
-  fts5_tokenizer tokapi;          /* API implementation for pTok */
-};
-
-/*
-** Delete the OriginTextCtx object indicated by the only argument.
-*/
-static void f5tOrigintextTokenizerDelete(void *pCtx){
-  OriginTextCtx *p = (OriginTextCtx*)pCtx;
-  ckfree((char*)p);
-}
-
-static int f5tOrigintextCreate(
-  void *pCtx, 
-  const char **azArg, 
-  int nArg, 
-  Fts5Tokenizer **ppOut
-){
-  OriginTextCtx *p = (OriginTextCtx*)pCtx;
-  OriginTextTokenizer *pTok = 0;
-  void *pTokCtx = 0;
-  int rc = SQLITE_OK;
-
-  pTok = (OriginTextTokenizer*)sqlite3_malloc(sizeof(OriginTextTokenizer));
-  if( pTok==0 ){
-    rc = SQLITE_NOMEM;
-  }else if( nArg<1 ){
-    rc = SQLITE_ERROR;
-  }else{
-    /* Locate the underlying tokenizer */
-    rc = p->pApi->xFindTokenizer(p->pApi, azArg[0], &pTokCtx, &pTok->tokapi);
-  }
-
-  /* Create the new tokenizer instance */
-  if( rc==SQLITE_OK ){
-    rc = pTok->tokapi.xCreate(pTokCtx, &azArg[1], nArg-1, &pTok->pTok);
-  }
-
-  if( rc!=SQLITE_OK ){
-    sqlite3_free(pTok);
-    pTok = 0;
-  }
-  *ppOut = (Fts5Tokenizer*)pTok;
-  return rc;
-}
-
-static void f5tOrigintextDelete(Fts5Tokenizer *pTokenizer){
-  OriginTextTokenizer *p = (OriginTextTokenizer*)pTokenizer;
-  if( p->pTok ){
-    p->tokapi.xDelete(p->pTok);
-  }
-  sqlite3_free(p);
-}
-
-typedef struct OriginTextCb OriginTextCb;
-struct OriginTextCb {
-  void *pCtx;
-  const char *pText; 
-  int nText;
-  int (*xToken)(void *, int, const char *, int, int, int);
-
-  char *aBuf;                     /* Buffer to use */
-  int nBuf;                       /* Allocated size of aBuf[] */
-};
-
-static int xOriginToken(
-  void *pCtx,                     /* Copy of 2nd argument to xTokenize() */
-  int tflags,                     /* Mask of FTS5_TOKEN_* flags */
-  const char *pToken,             /* Pointer to buffer containing token */
-  int nToken,                     /* Size of token in bytes */
-  int iStart,                     /* Byte offset of token within input text */
-  int iEnd                        /* Byte offset of end of token within input */
-){
-  OriginTextCb *p = (OriginTextCb*)pCtx;
-  int ret = 0;
-
-  if( nToken==(iEnd-iStart) && 0==memcmp(pToken, &p->pText[iStart], nToken) ){
-    /* Token exactly matches document text. Pass it through as is. */
-    ret = p->xToken(p->pCtx, tflags, pToken, nToken, iStart, iEnd);
-  }else{
-    int nReq = nToken + 1 + (iEnd-iStart);
-    if( nReq>p->nBuf ){
-      sqlite3_free(p->aBuf);
-      p->aBuf = sqlite3_malloc(nReq*2);
-      if( p->aBuf==0 ) return SQLITE_NOMEM;
-      p->nBuf = nReq*2;
-    }
-
-    memcpy(p->aBuf, pToken, nToken);
-    p->aBuf[nToken] = '\0';
-    memcpy(&p->aBuf[nToken+1], &p->pText[iStart], iEnd-iStart);
-    ret = p->xToken(p->pCtx, tflags, p->aBuf, nReq, iStart, iEnd);
-  }
-
-  return ret;
-}
-
-
-static int f5tOrigintextTokenize(
-  Fts5Tokenizer *pTokenizer, 
-  void *pCtx,
-  int flags,                      /* Mask of FTS5_TOKENIZE_* flags */
-  const char *pText, int nText, 
-  int (*xToken)(void *, int, const char *, int, int, int)
-){
-  OriginTextTokenizer *p = (OriginTextTokenizer*)pTokenizer;
-  OriginTextCb cb;
-  int ret;
-
-  memset(&cb, 0, sizeof(cb));
-  cb.pCtx = pCtx;
-  cb.pText = pText;
-  cb.nText = nText;
-  cb.xToken = xToken;
-
-  ret = p->tokapi.xTokenize(p->pTok,(void*)&cb,flags,pText,nText,xOriginToken);
-  sqlite3_free(cb.aBuf);
-  return ret;
-}
-
-/*
-**      sqlite3_fts5_register_origintext DB
-**
-** Description...
-*/
-static int SQLITE_TCLAPI f5tRegisterOriginText(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  sqlite3 *db = 0;
-  fts5_api *pApi = 0;
-  int rc;
-  fts5_tokenizer tok = {0, 0, 0};
-  OriginTextCtx *pCtx = 0;
-
-  if( objc!=2 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "DB");
-    return TCL_ERROR;
-  }
-  if( f5tDbAndApi(interp, objv[1], &db, &pApi) ) return TCL_ERROR;
-
-  pCtx = (OriginTextCtx*)ckalloc(sizeof(OriginTextCtx));
-  pCtx->db = db;
-  pCtx->pApi = pApi;
-
-  tok.xCreate = f5tOrigintextCreate;
-  tok.xDelete = f5tOrigintextDelete;
-  tok.xTokenize = f5tOrigintextTokenize;
-  rc = pApi->xCreateTokenizer(
-      pApi, "origintext", (void*)pCtx, &tok, f5tOrigintextTokenizerDelete
-  );
-
-  Tcl_ResetResult(interp);
-  if( rc!=SQLITE_OK ){
-    Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), (void*)0);
-    return TCL_ERROR;
-  }
-  return TCL_OK;
-}
-
-/*
-** This function is used to DROP an fts5 table. It works even if the data
-** structures fts5 stores within the database are corrupt, which sometimes
-** prevents a straight "DROP TABLE" command from succeeding.
-**
-** The first parameter is the database handle to use for the DROP TABLE
-** operation. The second is the name of the database to drop the fts5 table
-** from (i.e. "main", "temp" or the name of an attached database). The
-** third parameter is the name of the fts5 table to drop.
-**
-** SQLITE_OK is returned if the table is successfully dropped. Or, if an
-** error occurs, an SQLite error code.
-*/
-static int sqlite3_fts5_drop_corrupt_table(
-  sqlite3 *db,                    /* Database handle */
-  const char *zDb,                /* Database name ("main", "temp" etc.) */
-  const char *zTab                /* Name of fts5 table to drop */
-){
-  int rc = SQLITE_OK;
-  int bDef = 0;
-
-  rc = sqlite3_db_config(db, SQLITE_DBCONFIG_DEFENSIVE, -1, &bDef);
-  if( rc==SQLITE_OK ){
-    char *zScript = sqlite3_mprintf(
-        "DELETE FROM %Q.'%q_data';"
-        "DELETE FROM %Q.'%q_config';"
-        "INSERT INTO %Q.'%q_data' VALUES(10, X'0000000000');"
-        "INSERT INTO %Q.'%q_config' VALUES('version', 4);"
-        "DROP TABLE %Q.'%q';",
-        zDb, zTab, zDb, zTab, zDb, zTab, zDb, zTab, zDb, zTab
-    );
-
-    if( zScript==0 ){
-      rc = SQLITE_NOMEM;
-    }else{
-      if( bDef ) sqlite3_db_config(db, SQLITE_DBCONFIG_DEFENSIVE, 0, 0);
-      rc = sqlite3_exec(db, zScript, 0, 0, 0);
-      if( bDef ) sqlite3_db_config(db, SQLITE_DBCONFIG_DEFENSIVE, 1, 0);
-      sqlite3_free(zScript);
-    }
-  }
-
-  return rc;
-}
-
-/*
-**      sqlite3_fts5_drop_corrupt_table DB DATABASE TABLE
-**
-** Description...
-*/
-static int SQLITE_TCLAPI f5tDropCorruptTable(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  sqlite3 *db = 0;
-  const char *zDb = 0;
-  const char *zTab = 0;
-  int rc = SQLITE_OK;
-
-  if( objc!=4 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "DB DATABASE TABLE");
-    return TCL_ERROR;
-  }
-  if( f5tDbPointer(interp, objv[1], &db) ){
-    return TCL_ERROR;
-  }
-  zDb = Tcl_GetString(objv[2]);
-  zTab = Tcl_GetString(objv[3]);
-
-  rc = sqlite3_fts5_drop_corrupt_table(db, zDb, zTab);
-  if( rc!=SQLITE_OK ){
-    Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), (void*)0);
-    return TCL_ERROR;
-  }
-
-  return TCL_OK;
-}
-
 /*
 ** Entry point.
 */
@@ -1637,15 +1128,12 @@ int Fts5tcl_Init(Tcl_Interp *interp){
  } aCmd[] = {
    { "sqlite3_fts5_create_tokenizer",   f5tCreateTokenizer, 1 },
    { "sqlite3_fts5_token",              f5tTokenizerReturn, 1 },
-    { "sqlite3_fts5_locale",             f5tTokenizerLocale, 1 },
    { "sqlite3_fts5_tokenize",           f5tTokenize, 0 },
    { "sqlite3_fts5_create_function",    f5tCreateFunction, 0 },
    { "sqlite3_fts5_may_be_corrupt",     f5tMayBeCorrupt, 0 },
    { "sqlite3_fts5_token_hash",         f5tTokenHash, 0 },
    { "sqlite3_fts5_register_matchinfo", f5tRegisterMatchinfo, 0 },
-    { "sqlite3_fts5_register_fts5tokenize", f5tRegisterTok, 0 },
-    { "sqlite3_fts5_register_origintext",f5tRegisterOriginText, 0 },
-    { "sqlite3_fts5_drop_corrupt_table", f5tDropCorruptTable, 0 }
+    { "sqlite3_fts5_register_fts5tokenize", f5tRegisterTok, 0 }
  };
  int i;
  F5tTokenizerContext *pContext;
@@ -229,12 +229,6 @@ static const unsigned char sqlite3Utf8Trans1[] = {

 #endif /* ifndef SQLITE_AMALGAMATION */

-#define FTS5_SKIP_UTF8(zIn) {                               \
-  if( ((unsigned char)(*(zIn++)))>=0xc0 ){                              \
-    while( (((unsigned char)*zIn) & 0xc0)==0x80 ){ zIn++; }             \
-  }                                                    \
-}
-
 typedef struct Unicode61Tokenizer Unicode61Tokenizer;
 struct Unicode61Tokenizer {
  unsigned char aTokenChar[128];  /* ASCII range token characters */
@@ -386,6 +380,7 @@ static int fts5UnicodeCreate(
          zCat = azArg[i+1];
        }
      }
+
      if( rc==SQLITE_OK ){
        rc = unicodeSetCategories(p, zCat);
      }
@@ -415,6 +410,7 @@ static int fts5UnicodeCreate(
          rc = SQLITE_ERROR;
        }
      }
+
    }else{
      rc = SQLITE_NOMEM;
    }
@@ -553,7 +549,7 @@ static int fts5UnicodeTokenize(

 typedef struct PorterTokenizer PorterTokenizer;
 struct PorterTokenizer {
-  fts5_tokenizer_v2 tokenizer_v2; /* Parent tokenizer module */
+  fts5_tokenizer tokenizer;       /* Parent tokenizer module */
  Fts5Tokenizer *pTokenizer;      /* Parent tokenizer instance */
  char aBuf[FTS5_PORTER_MAX_TOKEN + 64];
 };
@@ -565,7 +561,7 @@ static void fts5PorterDelete(Fts5Tokenizer *pTok){
  if( pTok ){
    PorterTokenizer *p = (PorterTokenizer*)pTok;
    if( p->pTokenizer ){
-      p->tokenizer_v2.xDelete(p->pTokenizer);
+      p->tokenizer.xDelete(p->pTokenizer);
    }
    sqlite3_free(p);
  }
@@ -584,7 +580,6 @@ static int fts5PorterCreate(
  PorterTokenizer *pRet;
  void *pUserdata = 0;
  const char *zBase = "unicode61";
-  fts5_tokenizer_v2 *pV2 = 0;

  if( nArg>0 ){
    zBase = azArg[0];
@@ -593,15 +588,14 @@ static int fts5PorterCreate(
  pRet = (PorterTokenizer*)sqlite3_malloc(sizeof(PorterTokenizer));
  if( pRet ){
    memset(pRet, 0, sizeof(PorterTokenizer));
-    rc = pApi->xFindTokenizer_v2(pApi, zBase, &pUserdata, &pV2);
+    rc = pApi->xFindTokenizer(pApi, zBase, &pUserdata, &pRet->tokenizer);
  }else{
    rc = SQLITE_NOMEM;
  }
  if( rc==SQLITE_OK ){
    int nArg2 = (nArg>0 ? nArg-1 : 0);
-    const char **az2 = (nArg2 ? &azArg[1] : 0);
-    memcpy(&pRet->tokenizer_v2, pV2, sizeof(fts5_tokenizer_v2));
-    rc = pRet->tokenizer_v2.xCreate(pUserdata, az2, nArg2, &pRet->pTokenizer);
+    const char **azArg2 = (nArg2 ? &azArg[1] : 0);
+    rc = pRet->tokenizer.xCreate(pUserdata, azArg2, nArg2, &pRet->pTokenizer);
  }

  if( rc!=SQLITE_OK ){
@@ -1252,7 +1246,6 @@ static int fts5PorterTokenize(
  void *pCtx,
  int flags,
  const char *pText, int nText,
-  const char *pLoc, int nLoc,
  int (*xToken)(void*, int, const char*, int nToken, int iStart, int iEnd)
 ){
  PorterTokenizer *p = (PorterTokenizer*)pTokenizer;
@@ -1260,8 +1253,8 @@ static int fts5PorterTokenize(
  sCtx.xToken = xToken;
  sCtx.pCtx = pCtx;
  sCtx.aBuf = p->aBuf;
-  return p->tokenizer_v2.xTokenize(
-      p->pTokenizer, (void*)&sCtx, flags, pText, nText, pLoc, nLoc, fts5PorterCb
+  return p->tokenizer.xTokenize(
+      p->pTokenizer, (void*)&sCtx, flags, pText, nText, fts5PorterCb
  );
 }

@@ -1271,7 +1264,6 @@ static int fts5PorterTokenize(
 typedef struct TrigramTokenizer TrigramTokenizer;
 struct TrigramTokenizer {
  int bFold;                      /* True to fold to lower-case */
-  int iFoldParam;                 /* Parameter to pass to Fts5UnicodeFold() */
 };

 /*
@@ -1291,46 +1283,28 @@ static int fts5TriCreate(
  Fts5Tokenizer **ppOut
 ){
  int rc = SQLITE_OK;
-  TrigramTokenizer *pNew = 0;
+  TrigramTokenizer *pNew = (TrigramTokenizer*)sqlite3_malloc(sizeof(*pNew));
  UNUSED_PARAM(pUnused);
-  if( nArg%2 ){
-    rc = SQLITE_ERROR;
+  if( pNew==0 ){
+    rc = SQLITE_NOMEM;
  }else{
    int i;
-    pNew = (TrigramTokenizer*)sqlite3_malloc(sizeof(*pNew));
-    if( pNew==0 ){
-      rc = SQLITE_NOMEM;
-    }else{
-      pNew->bFold = 1;
-      pNew->iFoldParam = 0;
-  
-      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 if( 0==sqlite3_stricmp(azArg[i], "remove_diacritics") ){
-          if( (zArg[0]!='0' && zArg[0]!='1' && zArg[0]!='2') || zArg[1] ){
-            rc = SQLITE_ERROR;
-          }else{
-            pNew->iFoldParam = (zArg[0]!='0') ? 2 : 0;
-          }
-        }else{
+    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');
        }
-      }
-  
-      if( pNew->iFoldParam!=0 && pNew->bFold==0 ){
+      }else{
        rc = SQLITE_ERROR;
      }
-  
-      if( rc!=SQLITE_OK ){
-        fts5TriDelete((Fts5Tokenizer*)pNew);
-        pNew = 0;
-      }
+    }
+    if( rc!=SQLITE_OK ){
+      fts5TriDelete((Fts5Tokenizer*)pNew);
+      pNew = 0;
    }
  }
  *ppOut = (Fts5Tokenizer*)pNew;
@@ -1350,62 +1324,40 @@ static int fts5TriTokenize(
  TrigramTokenizer *p = (TrigramTokenizer*)pTok;
  int rc = SQLITE_OK;
  char aBuf[32];
-  char *zOut = aBuf;
-  int ii;
  const unsigned char *zIn = (const unsigned char*)pText;
  const unsigned char *zEof = &zIn[nText];
  u32 iCode;
-  int aStart[3];                  /* Input offset of each character in aBuf[] */

  UNUSED_PARAM(unusedFlags);
-
-  /* Populate aBuf[] with the characters for the first trigram. */
-  for(ii=0; ii<3; ii++){
-    do {
-      aStart[ii] = zIn - (const unsigned char*)pText;
-      READ_UTF8(zIn, zEof, iCode);
-      if( iCode==0 ) return SQLITE_OK;
-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, p->iFoldParam);
-    }while( iCode==0 );
-    WRITE_UTF8(zOut, iCode);
-  }
-
-  /* At the start of each iteration of this loop:
-  **
-  **  aBuf:      Contains 3 characters. The 3 characters of the next trigram.
-  **  zOut:      Points to the byte following the last character in aBuf.
-  **  aStart[3]: Contains the byte offset in the input text corresponding
-  **             to the start of each of the three characters in the buffer.
-  */
-  assert( zIn<=zEof );
  while( 1 ){
-    int iNext;                    /* Start of character following current tri */
-    const char *z1;
+    char *zOut = aBuf;
+    int iStart = zIn - (const unsigned char*)pText;
+    const unsigned char *zNext; 

-    /* Read characters from the input up until the first non-diacritic */
-    do {
-      iNext = zIn - (const unsigned char*)pText;
+    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;
-      if( p->bFold ) iCode = sqlite3Fts5UnicodeFold(iCode, p->iFoldParam);
-    }while( iCode==0 );
-
-    /* Pass the current trigram back to fts5 */
-    rc = xToken(pCtx, 0, aBuf, zOut-aBuf, aStart[0], iNext);
-    if( iCode==0 || rc!=SQLITE_OK ) break;
-
-    /* Remove the first character from buffer aBuf[]. Append the character
-    ** with codepoint iCode.  */
-    z1 = aBuf;
-    FTS5_SKIP_UTF8(z1);
-    memmove(aBuf, z1, zOut - z1);
-    zOut -= (z1 - aBuf);
-    WRITE_UTF8(zOut, iCode);
-
-    /* Update the aStart[] array */
-    aStart[0] = aStart[1];
-    aStart[1] = aStart[2];
-    aStart[2] = iNext;
+    }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;
@@ -1428,23 +1380,11 @@ int sqlite3Fts5TokenizerPattern(
 ){
  if( xCreate==fts5TriCreate ){
    TrigramTokenizer *p = (TrigramTokenizer*)pTok;
-    if( p->iFoldParam==0 ){
-      return p->bFold ? FTS5_PATTERN_LIKE : FTS5_PATTERN_GLOB;
-    }
+    return p->bFold ? FTS5_PATTERN_LIKE : FTS5_PATTERN_GLOB;
  }
  return FTS5_PATTERN_NONE;
 }

-/*
-** Return true if the tokenizer described by p->azArg[] is the trigram
-** tokenizer. This tokenizer needs to be loaded before xBestIndex is
-** called for the first time in order to correctly handle LIKE/GLOB.
-*/
-int sqlite3Fts5TokenizerPreload(Fts5TokenizerConfig *p){
-  return (p->nArg>=1 && 0==sqlite3_stricmp(p->azArg[0], "trigram"));
-}
-
-
 /*
 ** Register all built-in tokenizers with FTS5.
 */
@@ -1455,6 +1395,7 @@ int sqlite3Fts5TokenizerInit(fts5_api *pApi){
  } aBuiltin[] = {
    { "unicode61", {fts5UnicodeCreate, fts5UnicodeDelete, fts5UnicodeTokenize}},
    { "ascii",     {fts5AsciiCreate, fts5AsciiDelete, fts5AsciiTokenize }},
+    { "porter",    {fts5PorterCreate, fts5PorterDelete, fts5PorterTokenize }},
    { "trigram",   {fts5TriCreate, fts5TriDelete, fts5TriTokenize}},
  };
  
@@ -1469,19 +1410,6 @@ int sqlite3Fts5TokenizerInit(fts5_api *pApi){
        0
    );
  }
-  if( rc==SQLITE_OK ){
-    fts5_tokenizer_v2 sPorter = {
-      2,
-      fts5PorterCreate,
-      fts5PorterDelete,
-      fts5PorterTokenize
-    };
-    rc = pApi->xCreateTokenizer_v2(pApi,
-        "porter",
-        (void*)pApi,
-        &sPorter,
-        0
-    );
-  }
+
  return rc;
 }
@@ -364,9 +364,6 @@ int sqlite3Fts5UnicodeCatParse(const char *zCat, u8 *aArray){
            default: return 1;          }
          break;

-
-    default:
-      return 1;
  }
  return 0;
 }
@@ -64,7 +64,6 @@ struct Fts5VocabCursor {

  int nLeTerm;                    /* Size of zLeTerm in bytes */
  char *zLeTerm;                  /* (term <= $zLeTerm) paramater, or NULL */
-  int colUsed;                    /* Copy of sqlite3_index_info.colUsed */

  /* These are used by 'col' tables only */
  int iCol;
@@ -91,11 +90,9 @@ struct Fts5VocabCursor {
 /*
 ** Bits for the mask used as the idxNum value by xBestIndex/xFilter.
 */
-#define FTS5_VOCAB_TERM_EQ 0x0100
-#define FTS5_VOCAB_TERM_GE 0x0200
-#define FTS5_VOCAB_TERM_LE 0x0400
-
-#define FTS5_VOCAB_COLUSED_MASK 0xFF
+#define FTS5_VOCAB_TERM_EQ 0x01
+#define FTS5_VOCAB_TERM_GE 0x02
+#define FTS5_VOCAB_TERM_LE 0x04


 /*
@@ -272,13 +269,11 @@ static int fts5VocabBestIndexMethod(
  int iTermEq = -1;
  int iTermGe = -1;
  int iTermLe = -1;
-  int idxNum = (int)pInfo->colUsed;
+  int idxNum = 0;
  int nArg = 0;

  UNUSED_PARAM(pUnused);

-  assert( (pInfo->colUsed & FTS5_VOCAB_COLUSED_MASK)==pInfo->colUsed );
-
  for(i=0; i<pInfo->nConstraint; i++){
    struct sqlite3_index_constraint *p = &pInfo->aConstraint[i];
    if( p->usable==0 ) continue;
@@ -370,7 +365,7 @@ static int fts5VocabOpenMethod(
      if( rc==SQLITE_OK ){
        pVTab->zErrMsg = sqlite3_mprintf(
            "no such fts5 table: %s.%s", pTab->zFts5Db, pTab->zFts5Tbl
-        );
+            );
        rc = SQLITE_ERROR;
      }
    }else{
@@ -530,19 +525,9 @@ static int fts5VocabNextMethod(sqlite3_vtab_cursor *pCursor){

        switch( pTab->eType ){
          case FTS5_VOCAB_ROW:
-            /* Do not bother counting the number of instances if the "cnt"
-            ** column is not being read (according to colUsed).  */
-            if( eDetail==FTS5_DETAIL_FULL && (pCsr->colUsed & 0x04) ){
-              while( iPos<nPos ){
-                u32 ii;
-                fts5FastGetVarint32(pPos, iPos, ii);
-                if( ii==1 ){ 
-                  /* New column in the position list */
-                  fts5FastGetVarint32(pPos, iPos, ii);
-                }else{
-                  /* An instance - increment pCsr->aCnt[] */
-                  pCsr->aCnt[0]++;
-                }
+            if( eDetail==FTS5_DETAIL_FULL ){
+              while( 0==sqlite3Fts5PoslistNext64(pPos, nPos, &iOff, &iPos) ){
+                pCsr->aCnt[0]++;
              }
            }
            pCsr->aDoc[0]++;
@@ -640,12 +625,11 @@ static int fts5VocabFilterMethod(
  if( idxNum & FTS5_VOCAB_TERM_EQ ) pEq = apVal[iVal++];
  if( idxNum & FTS5_VOCAB_TERM_GE ) pGe = apVal[iVal++];
  if( idxNum & FTS5_VOCAB_TERM_LE ) pLe = apVal[iVal++];
-  pCsr->colUsed = (idxNum & FTS5_VOCAB_COLUSED_MASK);

  if( pEq ){
    zTerm = (const char *)sqlite3_value_text(pEq);
    nTerm = sqlite3_value_bytes(pEq);
-    f = FTS5INDEX_QUERY_NOTOKENDATA;
+    f = 0;
  }else{
    if( pGe ){
      zTerm = (const char *)sqlite3_value_text(pGe);
@@ -51,10 +51,6 @@ proc fts5_test_poslist2 {cmd} {
  sort_poslist $res
 }

-proc fts5_test_insttoken {cmd iInst iToken} {
-  $cmd xInstToken $iInst $iToken
-}
-
 proc fts5_test_collist {cmd} {
  set res [list]

@@ -65,12 +61,6 @@ proc fts5_test_collist {cmd} {
  set res
 }

-proc fts5_collist {cmd iPhrase} {
-  set res [list]
-  $cmd xPhraseColumnForeach $iPhrase c { lappend res $c }
-  set res
-}
-
 proc fts5_test_columnsize {cmd} {
  set res [list]
  for {set i 0} {$i < [$cmd xColumnCount]} {incr i} {
@@ -79,13 +69,6 @@ proc fts5_test_columnsize {cmd} {
  set res
 }

-proc fts5_columntext {cmd iCol} {
-  $cmd xColumnText $iCol
-}
-proc fts5_columnlocale {cmd iCol} {
-  $cmd xColumnLocale $iCol
-}
-
 proc fts5_test_columntext {cmd} {
  set res [list]
  for {set i 0} {$i < [$cmd xColumnCount]} {incr i} {
@@ -94,14 +77,6 @@ proc fts5_test_columntext {cmd} {
  set res
 }

-proc fts5_test_columnlocale {cmd} {
-  set res [list]
-  for {set i 0} {$i < [$cmd xColumnCount]} {incr i} {
-    lappend res [$cmd xColumnLocale $i]
-  }
-  set res
-}
-
 proc fts5_test_columntotalsize {cmd} {
  set res [list]
  for {set i 0} {$i < [$cmd xColumnCount]} {incr i} {
@@ -129,10 +104,6 @@ proc fts5_test_rowcount {cmd} {
  $cmd xRowCount
 }

-proc fts5_test_rowid {cmd} {
-  $cmd xRowid
-}
-
 proc test_queryphrase_cb {cnt cmd} {
  upvar $cnt L 
  for {set i 0} {$i < [$cmd xInstCount]} {incr i} {
@@ -154,13 +125,6 @@ proc fts5_test_queryphrase {cmd} {
  set res
 }

-proc fts5_queryphrase {cmd iPhrase} {
-  set cnt [list]
-  for {set j 0} {$j < [$cmd xColumnCount]} {incr j} { lappend cnt 0 }
-  $cmd xQueryPhrase $iPhrase [list test_queryphrase_cb cnt]
-  set cnt
-}
-
 proc fts5_test_phrasecount {cmd} {
  $cmd xPhraseCount
 }
@@ -180,23 +144,16 @@ proc fts5_aux_test_functions {db} {
  foreach f {
    fts5_test_columnsize
    fts5_test_columntext
-    fts5_test_columnlocale
    fts5_test_columntotalsize
    fts5_test_poslist
    fts5_test_poslist2
    fts5_test_collist
-    fts5_test_insttoken
    fts5_test_tokenize
    fts5_test_rowcount
-    fts5_test_rowid
    fts5_test_all

    fts5_test_queryphrase
    fts5_test_phrasecount
-    fts5_columntext
-    fts5_columnlocale
-    fts5_queryphrase
-    fts5_collist
  } {
    sqlite3_fts5_create_function $db $f $f
  }
@@ -481,20 +438,6 @@ proc detail_is_none {} { detail_check ; expr {$::detail == "none"} }
 proc detail_is_col {}  { detail_check ; expr {$::detail == "col" } }
 proc detail_is_full {} { detail_check ; expr {$::detail == "full"} }

-proc foreach_tokenizer_mode {prefix script} {
-  set saved $::testprefix
-  foreach {d mapping} {
-    ""              {}
-    "-origintext"   {, tokenize="origintext unicode61", tokendata=1}
-  } {
-    set s [string map [list %TOKENIZER% $mapping] $script]
-    set ::testprefix "$prefix$d"
-    reset_db
-    sqlite3_fts5_register_origintext db
-    uplevel $s
-  }
-  set ::testprefix $saved
-}

 #-------------------------------------------------------------------------
 # Convert a poslist of the type returned by fts5_test_poslist() to a 
@@ -22,7 +22,6 @@ ifcapable !fts5 {
 }

 foreach_detail_mode $::testprefix {
-foreach_tokenizer_mode $::testprefix {

 do_execsql_test 1.0 {
  CREATE VIRTUAL TABLE t1 USING fts5(a, b, c);
@@ -45,7 +44,7 @@ do_execsql_test 1.1 {
 #

 do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x, y, detail=%DETAIL%);
 }
 do_execsql_test 2.1 {
  INSERT INTO t1 VALUES('a b c', 'd e f');
@@ -74,9 +73,8 @@ do_execsql_test 2.4 {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL%);
 }
 foreach {i x y} {
   1  {g f d b f} {h h e i a}
@@ -99,9 +97,8 @@ foreach {i x y} {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL%);
  INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
 }
 foreach {i x y} {
@@ -124,9 +121,8 @@ foreach {i x y} {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 5.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL%);
  INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
 }
 foreach {i x y} {
@@ -149,9 +145,8 @@ foreach {i x y} {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL%);
  INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
 }

@@ -186,7 +181,6 @@ do_execsql_test 6.6 {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 expr srand(0)
 do_execsql_test 7.0 {
  CREATE VIRTUAL TABLE t1 USING fts5(x,y,z);
@@ -228,7 +222,6 @@ for {set i 1} {$i <= 10} {incr i} {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 8.0 {
  CREATE VIRTUAL TABLE t1 USING fts5(x, prefix="1,2,3");
  INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
@@ -243,7 +236,6 @@ do_execsql_test 8.1 {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db

 expr srand(0)

@@ -288,9 +280,8 @@ for {set i 1} {$i <= 10} {incr i} {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 10.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x,y, detail=%DETAIL%);
 }
 set d10 {
   1  {g f d b f} {h h e i a}
@@ -323,19 +314,19 @@ do_execsql_test 10.4.2 { INSERT INTO t1(t1) VALUES('integrity-check') }
 #-------------------------------------------------------------------------
 #
 do_catchsql_test 11.1 {
-  CREATE VIRTUAL TABLE t2 USING fts5(a, b, c, rank, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t2 USING fts5(a, b, c, rank, detail=%DETAIL%);
 } {1 {reserved fts5 column name: rank}}
 do_catchsql_test 11.2 {
-  CREATE VIRTUAL TABLE rank USING fts5(a, b, c, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE rank USING fts5(a, b, c, detail=%DETAIL%);
 } {1 {reserved fts5 table name: rank}}
 do_catchsql_test 11.3 {
-  CREATE VIRTUAL TABLE t2 USING fts5(a, b, c, rowid, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t2 USING fts5(a, b, c, rowid, detail=%DETAIL%);
 } {1 {reserved fts5 column name: rowid}}

 #-------------------------------------------------------------------------
 #
 do_execsql_test 12.1 {
-  CREATE VIRTUAL TABLE t2 USING fts5(x,y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t2 USING fts5(x,y, detail=%DETAIL%);
 } {}

 do_catchsql_test 12.2 {
@@ -350,9 +341,8 @@ do_test 12.3 {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 13.1 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x, detail=%DETAIL%);
  INSERT INTO t1(rowid, x) VALUES(1, 'o n e'), (2, 't w o');
 } {}

@@ -375,9 +365,8 @@ do_execsql_test 13.6 {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 14.1 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(x, y, detail=%DETAIL%);
  INSERT INTO t1(t1, rank) VALUES('pgsz', 32);
  WITH d(x,y) AS (
    SELECT NULL, 'xyz xyz xyz xyz xyz xyz'
@@ -440,7 +429,7 @@ do_execsql_test 16.1 {
 proc funk {} {
  db eval { UPDATE n1_config SET v=50 WHERE k='version' }
  set fd [db incrblob main n1_data block 10]
-  fconfigure $fd -translation binary
+  fconfigure $fd -encoding binary -translation binary
 #  puts -nonewline $fd "\x44\x45"
  close $fd
 }
@@ -453,16 +442,15 @@ db func funk funk
 # statement no longer fails.
 #
 do_catchsql_test 16.2 {
-  SELECT funk(), format('%g',bm25(n1)), funk() FROM n1 WHERE n1 MATCH 'a+b+c+d'
+  SELECT funk(), bm25(n1), funk() FROM n1 WHERE n1 MATCH 'a+b+c+d'
 } {0 {{} -1e-06 {}}}
 # {1 {SQL logic error}}

 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 17.1 {
-  CREATE VIRTUAL TABLE b2 USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE b2 USING fts5(x, detail=%DETAIL%);
  INSERT INTO b2 VALUES('a');
  INSERT INTO b2 VALUES('b');
  INSERT INTO b2 VALUES('c');
@@ -478,9 +466,8 @@ do_test 17.2 {

 if {[string match n* %DETAIL%]==0} {
  reset_db
-  sqlite3_fts5_register_origintext db
  do_execsql_test 17.3 {
-    CREATE VIRTUAL TABLE c2 USING fts5(x, y, detail=%DETAIL% %TOKENIZER%);
+    CREATE VIRTUAL TABLE c2 USING fts5(x, y, detail=%DETAIL%);
    INSERT INTO c2 VALUES('x x x', 'x x x');
    SELECT rowid FROM c2 WHERE c2 MATCH 'y:x';
  } {1}
@@ -489,9 +476,8 @@ if {[string match n* %DETAIL%]==0} {
 #-------------------------------------------------------------------------
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 17.1 {
-  CREATE VIRTUAL TABLE uio USING fts5(ttt, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE uio USING fts5(ttt, detail=%DETAIL%);
  INSERT INTO uio VALUES(NULL);
  INSERT INTO uio SELECT NULL FROM uio;
  INSERT INTO uio SELECT NULL FROM uio;
@@ -538,8 +524,8 @@ do_execsql_test 17.9 {
 #--------------------------------------------------------------------
 #
 do_execsql_test 18.1 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a, b, detail=%DETAIL% %TOKENIZER%);
-  CREATE VIRTUAL TABLE t2 USING fts5(c, d, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t1 USING fts5(a, b, detail=%DETAIL%);
+  CREATE VIRTUAL TABLE t2 USING fts5(c, d, detail=%DETAIL%);
  INSERT INTO t1 VALUES('abc*', NULL);
  INSERT INTO t2 VALUES(1, 'abcdefg');
 }
@@ -554,9 +540,8 @@ do_execsql_test 18.3 {
 # fts5 table in the temp schema.
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 19.0 {
-  CREATE VIRTUAL TABLE temp.t1 USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE temp.t1 USING fts5(x, detail=%DETAIL%);
  INSERT INTO t1 VALUES('x y z');
  INSERT INTO t1 VALUES('w x 1');
  SELECT rowid FROM t1 WHERE t1 MATCH 'x';
@@ -566,9 +551,8 @@ do_execsql_test 19.0 {
 # Test that 6 and 7 byte varints can be read.
 #
 reset_db
-sqlite3_fts5_register_origintext db
 do_execsql_test 20.0 {
-  CREATE VIRTUAL TABLE temp.tmp USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE temp.tmp USING fts5(x, detail=%DETAIL%);
 }
 set ::ids [list \
  0 [expr 1<<36] [expr 2<<36] [expr 1<<43] [expr 2<<43]
@@ -586,7 +570,7 @@ do_test 20.1 {
 #
 do_execsql_test 21.0 {
  CREATE TEMP TABLE t8(a, b);
-  CREATE VIRTUAL TABLE ft USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE ft USING fts5(x, detail=%DETAIL%);
 }

 do_execsql_test 21.1 {
@@ -597,7 +581,7 @@ do_execsql_test 21.1 {
 }

 do_execsql_test 22.0 {
-  CREATE VIRTUAL TABLE t9 USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t9 USING fts5(x, detail=%DETAIL%);
  INSERT INTO t9(rowid, x) VALUES(2, 'bbb');
  BEGIN;
    INSERT INTO t9(rowid, x) VALUES(1, 'aaa');
@@ -612,7 +596,7 @@ do_execsql_test 22.1 {

 #-------------------------------------------------------------------------
 do_execsql_test 23.0 {
-  CREATE VIRTUAL TABLE t10 USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t10 USING fts5(x, detail=%DETAIL%);
  CREATE TABLE t11(x);
 }
 do_execsql_test 23.1 {
@@ -624,7 +608,7 @@ do_execsql_test 23.2 {

 #-------------------------------------------------------------------------
 do_execsql_test 24.0 {
-  CREATE VIRTUAL TABLE t12 USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t12 USING fts5(x, detail=%DETAIL%);
  INSERT INTO t12 VALUES('aaaa');
 }
 do_execsql_test 24.1 {
@@ -634,9 +618,6 @@ do_execsql_test 24.1 {
    INSERT INTO t12 VALUES('aaaa');
  END;
 }
-execsql_pp {
-  SELECT rowid, hex(block) FROM t12_data
-}
 do_execsql_test 24.2 {
  INSERT INTO t12(t12) VALUES('integrity-check');
 }
@@ -646,7 +627,7 @@ do_execsql_test 24.3 {

 #-------------------------------------------------------------------------
 do_execsql_test 25.0 {
-  CREATE VIRTUAL TABLE t13 USING fts5(x, detail=%DETAIL% %TOKENIZER%);
+  CREATE VIRTUAL TABLE t13 USING fts5(x, detail=%DETAIL%);
 }
 do_execsql_test 25.1 {
  BEGIN;
@@ -657,7 +638,6 @@ SELECT * FROM t13('BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
 }


-}
 }

 expand_all_sql db
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ab

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ac

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -18,7 +18,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ad

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ae

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -18,7 +18,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5af

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ag

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ah

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -163,17 +163,6 @@ do_execsql_test 1.8.2 {
  SELECT count(*) FROM t1 WHERE t1 MATCH 'x' AND rowid < 'text';
 } {10000}

-do_execsql_test 1.8.3 {
-  SELECT count(*) FROM t1 WHERE t1 MATCH 'x' AND rowid<5000 AND rowid < 'text';
-} {4999}
-do_execsql_test 1.8.4 {
-  SELECT count(*) FROM t1 WHERE t1 MATCH 'x' AND rowid>5000 AND rowid > 'text';
-} {0}
-
-do_catchsql_test 1.9 {
-  SELECT * FROM t1('*xy');
-} {1 {unknown special query: xy}}
-
 } ;# foreach_detail_mode

 #db eval {SELECT rowid, fts5_decode(rowid, block) aS r FROM t1_data} {puts $r}
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ai

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -19,7 +19,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5aj

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ak

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5al

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -293,16 +293,6 @@ do_catchsql_test 4.4.4 {
  SELECT *, rank FROM t3 WHERE t3 MATCH 'a' AND rank MATCH NULL
 } {1 {parse error in rank function: }}

-# Check that the second and subsequent rank= constraints are ignored.
-#
-do_catchsql_test 4.3.3 {
-  SELECT *, rank FROM t3
-  WHERE t3 MATCH 'a' AND 
-  rank MATCH 'nosuch()' AND
-  rank MATCH 'rowidmod(3)'  
-  ORDER BY rank ASC
-} {1 {unable to use function MATCH in the requested context}}
-
 } ;# foreach_detail_mode


@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5alter

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5auto

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5aux

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -334,71 +334,4 @@ do_execsql_test 11.2 {
  SELECT fts5_hitcount(x1) FROM x1('one') LIMIT 1;
 } {5}

-#-------------------------------------------------------------------------
-# Test that xColumnText returns SQLITE_RANGE when it should.
-#
-reset_db
-fts5_aux_test_functions db
-do_execsql_test 12.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a, b, c);
-  INSERT INTO t1 VALUES('one', 'two', 'three');
-  INSERT INTO t1 VALUES('one', 'one', 'one');
-  INSERT INTO t1 VALUES('two', 'two', 'two');
-  INSERT INTO t1 VALUES('three', 'three', 'three');
-}
-
-do_catchsql_test 12.1.1 {
-  SELECT fts5_columntext(t1, -1) FROM t1('two');
-} {1 SQLITE_RANGE}
-do_catchsql_test 12.1.2 {
-  SELECT fts5_columntext(t1, 3) FROM t1('two');
-} {1 SQLITE_RANGE}
-do_catchsql_test 12.1.2 {
-  SELECT fts5_columntext(t1, 1) FROM t1('one AND two');
-} {0 two}
-
-do_catchsql_test 12.2.1 {
-  SELECT fts5_queryphrase(t1, -1) FROM t1('one AND two');
-} {1 SQLITE_RANGE}
-do_catchsql_test 12.2.2 {
-  SELECT fts5_queryphrase(t1, 2) FROM t1('one AND two');
-} {1 SQLITE_RANGE}
-do_catchsql_test 12.2.3 {
-  SELECT fts5_queryphrase(t1, 1) FROM t1('one AND two');
-} {0 {{1 2 1}}}
-
-do_catchsql_test 12.3.1 {
-  SELECT fts5_collist(t1, -1) FROM t1('one AND two');
-} {1 SQLITE_RANGE}
-do_catchsql_test 12.3.2 {
-  SELECT fts5_collist(t1, 2) FROM t1('one AND two');
-} {1 SQLITE_RANGE}
-do_catchsql_test 12.3.3 {
-  SELECT fts5_collist(t1, 1) FROM t1('one AND two');
-} {0 1}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 13.1 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a, tokenize=ascii);
-  INSERT INTO t1 VALUES('a b c'), ('d e f');
-  PRAGMA integrity_check;
-} {ok}
-
-do_catchsql_test 13.2 {
-  SELECT highlight(t1, 0, '[', ']') FROM t1
-} {0 {{a b c} {d e f}}}
-
-do_execsql_test 13.3 {
-  PRAGMA writable_schema = 1;
-  UPDATE sqlite_schema SET sql = 'CREATE VIRTUAL TABLE t1 USING fts5(a, tokenize=blah)'
-  WHERE name = 't1';
-}
-
-db close
-sqlite3 db test.db
-do_catchsql_test 13.4 {
-  SELECT highlight(t1, 0, '[', ']') FROM t1
-} {1 {SQL logic error}}
-
 finish_test
@@ -1,71 +0,0 @@
-# 2024 June 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.
-#
-#***********************************************************************
-#
-# Tests focusing on the auxiliary function APIs.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5aux
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE x1 USING fts5(a, b);
-  INSERT INTO x1 VALUES('a b', 'c d');
-  INSERT INTO x1 VALUES('d e', 'a b');
-  INSERT INTO x1 VALUES('a b', 'e f');
-  INSERT INTO x1 VALUES('d e', 'c d');
-}
-
-fts5_aux_test_functions db
-do_execsql_test 1.1 {
-  SELECT fts5_test_all(x1) FROM x1 WHERE rowid=2
-} [list [list {*}{
-  columnsize {2 2}
-  columntext {{d e} {a b}}
-  columntotalsize {8 8}
-  poslist {}
-  tokenize {{d e} {a b}}
-  rowcount 4
-}]]
-
-do_execsql_test 1.2 {
-  SELECT fts5_test_columntext(x1) FROM x1
-} {
-  {{a b} {c d}}
-  {{d e} {a b}}
-  {{a b} {e f}}
-  {{d e} {c d}}
-}
-
-do_execsql_test 1.3 {
-  SELECT fts5_test_rowid(x1) FROM x1
-} {
-  1 2 3 4
-}
-do_execsql_test 1.4 {
-  SELECT fts5_test_phrasecount(x1) FROM x1
-} {
-  0 0 0 0
-}
-do_catchsql_test 1.5 {
-  SELECT fts5_queryphrase(x1, 0) FROM x1
-} {1 SQLITE_RANGE} 
-do_execsql_test 1.6 {
-  SELECT fts5_test_rowcount(x1) FROM x1
-} {4 4 4 4}
-
-
-finish_test
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5auxdata

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5bigpl

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -1,166 +0,0 @@
-# 2024 July 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.
-#
-#***********************************************************************
-#
-# This file verifies that:
-#
-#   * blob values may be written to locale=0 tables.
-#
-#   * blob values - other than fts5_locale() values - may not be written 
-#     to locale=0 tables. This is an SQLITE_MISMATCH error
-#
-#   * blob values may be returned by queries on the external-content table
-#     of a locale=0 table.
-#
-#   * blob values not may be returned by queries on the external-content 
-#     table of a locale=1 table, apart from fts5_locale() blobs. This is an
-#     SQLITE_MISMATCH error.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5blob
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-# Test that blobs may be stored in normal locale=0 tables.
-#
-foreach {tn enc} {
-  1 utf8  
-  2 utf16 
-} {
-  reset_db
-  fts5_aux_test_functions db
-
-  execsql "PRAGMA encoding = $enc"
-
-  execsql "
-    CREATE VIRTUAL TABLE t1 USING fts5(x, y);
-  "
-  do_execsql_test 1.$tn.0 {
-    CREATE VIRTUAL TABLE tt USING fts5vocab('t1', 'instance');
-    INSERT INTO t1(rowid, x, y) VALUES(1, 555, X'0000000041424320444546');
-    INSERT INTO t1(rowid, x, y) VALUES(2, 666, X'41424300444546');
-    INSERT INTO t1(rowid, x, y) VALUES(3, 777, 'xyz');
-  }
-
-  do_execsql_test 1.$tn.1 {
-    SELECT rowid, quote(x), quote(y) FROM t1
-  } {
-    1 555 X'0000000041424320444546'
-    2 666 X'41424300444546'
-    3 777 'xyz'
-  }
-
-  do_execsql_test 1.$tn.2 {
-    DELETE FROM t1 WHERE rowid=2;
-    DELETE FROM t1 WHERE rowid=1;
-  }
-
-  do_execsql_test 1.$tn.3 {
-    PRAGMA integrity_check;
-  } {ok}
-}
-
-#--------------------------------------------------------------------------
-# Test that a blob may be stored and retrieved in an unindexed column of
-# a regular table with locale=1.
-#
-reset_db
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y UNINDEXED, locale=1);
-  INSERT INTO t1(rowid, x, y) VALUES(12, 'twelve', X'0000000041424320444546');
-}
-
-do_execsql_test 2.1 {
-  select rowid, x, quote(y) FROM t1
-} {
-  12 twelve X'0000000041424320444546'
-}
-
-#--------------------------------------------------------------------------
-# Test that blobs may not be written to any type of table with locale=1
-# set. Except, they may be written to UNINDEXED columns.
-#
-reset_db
-do_execsql_test 3.0 {
-  CREATE TABLE t1(a, b);
-
-  CREATE VIRTUAL TABLE x1 USING fts5(a, b, locale=1);
-  CREATE VIRTUAL TABLE x2 USING fts5(a, b, locale=1, content=t2);
-  CREATE VIRTUAL TABLE x3 USING fts5(a, b, locale=1, content=);
-}
-
-do_catchsql_test 3.1 {
-  INSERT INTO x1(rowid, a, b) VALUES(113, 'hello world', X'123456');
-} {0 {}}
-do_catchsql_test 3.2 {
-  INSERT INTO x2(rowid, a, b) VALUES(113, 'hello world', X'123456');
-} {0 {}}
-do_catchsql_test 3.3 {
-  INSERT INTO x3(rowid, a, b) VALUES(113, 'hello world', X'123456');
-} {0 {}}
-
-
-#--------------------------------------------------------------------------
-# Test that fts5_locale() values may not be written to any type of table
-# without locale=1 set. Even to an UNINDEXED column.
-#
-reset_db
-do_execsql_test 3.0 {
-  CREATE TABLE t1(a, b);
-
-  CREATE VIRTUAL TABLE x1 USING fts5(a, b);
-  CREATE VIRTUAL TABLE x2 USING fts5(a, b, content=t2);
-  CREATE VIRTUAL TABLE x3 USING fts5(a, b, content=);
-
-  CREATE VIRTUAL TABLE x4 USING fts5(a, b, c UNINDEXED);
-}
-
-do_catchsql_test 3.1 {
-  INSERT INTO x1(rowid, a, b) 
-    VALUES(113, 'hello world', fts5_locale('en_AU', 'abc'));
-} {1 {fts5_locale() requires locale=1}}
-do_catchsql_test 3.2 {
-  INSERT INTO x2(rowid, a, b) 
-    VALUES(113, 'hello world', fts5_locale('en_AU', 'abc'));
-} {1 {fts5_locale() requires locale=1}}
-do_catchsql_test 3.3 {
-  INSERT INTO x3(rowid, a, b) 
-    VALUES(113, 'hello world', fts5_locale('en_AU', 'abc'));
-} {1 {fts5_locale() requires locale=1}}
-do_catchsql_test 3.4 {
-  INSERT INTO x4(rowid, a, b, c) 
-    VALUES(113, 'hello world', 'yesno', fts5_locale('en_AU', 'abc'));
-} {1 {fts5_locale() requires locale=1}}
-
-
-#-------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE x1 USING fts5(x);
-}
-
-foreach {tn sql} {
-  1 { INSERT INTO x1(rowid, x) VALUES(4.5, 'abcd') }
-  2 { INSERT INTO x1(rowid, x) VALUES('xyz', 'abcd') }
-  3 { INSERT INTO x1(rowid, x) VALUES(X'001122', 'abcd') }
-} {
-  do_catchsql_test 4.1.$tn $sql {1 {datatype mismatch}}
-}
-
-
-finish_test
-
-
@@ -55,22 +55,5 @@ do_execsql_test 1.5 {
  SELECT * FROM t4t
 } {สนามกีฬา 1 1}

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 2.0 "
-  CREATE VIRTUAL TABLE x1 USING fts5(c, 
-      tokenize=\"unicode61 categories ' \t'\");
-"
-
-do_catchsql_test 2.1 "
-  CREATE VIRTUAL TABLE x2 USING fts5(c, 
-      tokenize=\"unicode61 categories 'N*\t\tMYZ'\");
-" {1 {error in tokenizer constructor}}
-
-do_catchsql_test 2.2 "
-  CREATE VIRTUAL TABLE x2 USING fts5(c, 
-      tokenize=\"unicode61 categories 'N*\t\tXYZ'\");
-" {1 {error in tokenizer constructor}}
-

 finish_test
@@ -79,7 +79,7 @@ foreach_detail_mode $::testprefix {

  do_catchsql_test 4.1 {
    SELECT * FROM t1 WHERE rowid MATCH 'a'
-  } {1 {no query solution}}
+  } {1 {unable to use function MATCH in the requested context}}
 }

 #-------------------------------------------------------------------------
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5columnsize

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5config

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5content

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -293,76 +293,4 @@ do_catchsql_test 7.2.5 {
  SELECT * FROM t1('abc') ORDER BY rank;
 } {1 {recursively defined fts5 content table}}

-#---------------------------------------------------------------------------
-# Check that if the content table is a view, and that view contains an
-# error, a reasonable error message is returned if the user tries to
-# read from the view via the fts5 table.
-#
-reset_db
-do_execsql_test 8.1 {
-  CREATE VIEW a1 AS 
-    SELECT 1 AS r, text_value(1) AS t
-      UNION ALL
-    SELECT 2 AS r, text_value(2) AS t;
-
-  CREATE VIRTUAL TABLE t1 USING fts5(t, content='a1', content_rowid='r');
-}
-
-foreach {tn sql} {
-  1 "SELECT * FROM t1"
-  2 "INSERT INTO t1(t1) VALUES('rebuild')"
-  3 "SELECT * FROM t1 WHERE rowid=1"
-} {
-  do_catchsql_test 8.2.$tn $sql {1 {no such function: text_value}}
-}
-
-proc text_value {i} {
-  if {$i==1} { return "one" }
-  if {$i==2} { return "two" }
-  return "many"
-}
-db func text_value text_value
-
-do_execsql_test 8.3.1 { SELECT * FROM t1 } {one two}
-do_execsql_test 8.3.2 { INSERT INTO t1(t1) VALUES('rebuild') }
-do_execsql_test 8.3.3 { SELECT * FROM t1 WHERE rowid=1 } {one}
-do_execsql_test 8.3.4 { SELECT rowid FROM t1('two') } {2}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 9.1 {
-  CREATE TABLE t1(a INTEGER PRIMARY KEY, b);
-  INSERT INTO t1 VALUES(1, 'one two three');
-  INSERT INTO t1 VALUES(2, 'one two three');
-
-  CREATE VIRTUAL TABLE ft USING fts5(b, content=t1, content_rowid=a);
-  INSERT INTO ft(ft) VALUES('rebuild');
-}
-
-do_execsql_test 9.2 {
-  SELECT rowid, b FROM ft('two');
-} {
-  1 {one two three}
-  2 {one two three}
-}
-
-do_execsql_test 9.3 {
-  DELETE FROM t1 WHERE a=2;
-} 
-
-do_catchsql_test 9.4 {
-  SELECT rowid FROM ft('two');
-} {0 {1 2}}
-
-do_catchsql_test 9.5 {
-  SELECT * FROM ft('two');
-} {1 {fts5: missing row 2 from content table 'main'.'t1'}}
-
-fts5_aux_test_functions db
-
-do_catchsql_test 9.6 {
-  SELECT rowid, fts5_columntext(ft, 0) FROM ft('two');
-} {1 SQLITE_CORRUPT_VTAB}
-
 finish_test
-
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5contentless

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -267,24 +267,4 @@ do_execsql_test 8.2 {
  SELECT rowid FROM ft('four');
 } {}

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 9.0 {
-  CREATE VIRTUAL TABLE ft USING fts5(x, content='', contentless_delete=0);
-  INSERT INTO ft VALUES('hello world');
-  INSERT INTO ft VALUES('one two three');
-}
-
-do_catchsql_test 9.1 {
-  INSERT INTO ft(ft, rowid, x) VALUES('delete', 1, 'hello world');
-} {0 {}}
-
-do_catchsql_test 9.2 {
-  CREATE VIRTUAL TABLE ft2 USING fts5(x, content='', contentless_delete=2);
-} {1 {malformed contentless_delete=... directive}}
-
-do_catchsql_test 9.3 {
-  CREATE VIRTUAL TABLE ft2 USING fts5(x, content='', contentless_delete=11);
-} {1 {malformed contentless_delete=... directive}}
-
 finish_test
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5contentless2

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5contentless3

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5contentless4

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,12 +15,11 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5contentless5

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
 }
-unset -nocomplain res

 do_execsql_test 1.0 {
  CREATE VIRTUAL TABLE t1 USING fts5(a, b, c, content='', contentless_delete=1);
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -99,27 +99,6 @@ sqlite3_db_config db DEFENSIVE 0
 do_catchsql_test 3.1 {
  DELETE FROM t3_content WHERE rowid = 3;
  SELECT * FROM t3 WHERE t3 MATCH 'o';
-} {1 {fts5: missing row 3 from content table 'main'.'t3_content'}}
-
-#--------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE t2 USING fts5(x);
-  INSERT INTO t2 VALUES('one two three');
-  INSERT INTO t2 VALUES('four five six');
-  INSERT INTO t2 VALUES('seven eight nine');
-  INSERT INTO t2 VALUES('ten eleven twelve');
-}
-do_execsql_test 4.1 {
-  SELECT hex(block) FROM t2_data WHERE id=1;
-} {040C}
-do_execsql_test 4.2 {
-  UPDATE t2_data SET block = X'0402' WHERE id=1
-}
-breakpoint
-do_catchsql_test 4.3 {
-  DELETE FROM t2 WHERE rowid=3
 } {1 {database disk image is malformed}}

 finish_test
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt2

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -100,7 +100,6 @@ set lrowid [db one {SELECT max(rowid) FROM t1_data WHERE (rowid & $mask)=0}]
 set nbyte [db one {SELECT length(block) FROM t1_data WHERE rowid=$lrowid}]
 set all [db eval {SELECT rowid FROM t1}]
 sqlite3_db_config db DEFENSIVE 0
-unset -nocomplain res
 for {set i [expr $nbyte-2]} {$i>=0} {incr i -1} {
  do_execsql_test 2.$i.1 {
    BEGIN;
@@ -153,7 +152,7 @@ foreach {tn hdr} {
      execsql BEGIN

      set fd [db incrblob main x3_data block $rowid]
-      fconfigure $fd -translation binary
+      fconfigure $fd -encoding binary -translation binary
      set existing [read $fd [string length $hdr]]
      seek $fd 0
      puts -nonewline $fd $hdr
@@ -239,7 +238,7 @@ foreach {tn hdr} {
      execsql BEGIN

      set fd [db incrblob main x5_data block $rowid]
-      fconfigure $fd -translation binary
+      fconfigure $fd -encoding binary -translation binary
      puts -nonewline $fd $hdr
      close $fd

@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt3

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -680,11 +680,11 @@ do_test 12.0 {

 do_catchsql_test 11.1 {
  SELECT * FROM t1 WHERE t1 MATCH 'abandon';
-} {1 {database disk image is malformed}}
+} {1 {vtable constructor failed: t1}}

 do_catchsql_test 11.2 {
  INSERT INTO t1(t1, rank) VALUES('merge', 500);
-} {1 {database disk image is malformed}}
+} {1 {vtable constructor failed: t1}}

 #-------------------------------------------------------------------------
 #
@@ -1040,7 +1040,7 @@ do_test 16.0 {

 do_catchsql_test 16.1 {
 INSERT INTO t1(t1) VALUES('integrity-check');
-} {1 {database disk image is malformed}}
+} {1 {vtable constructor failed: t1}}

 #--------------------------------------------------------------------------
 reset_db
@@ -1126,7 +1126,7 @@ do_test 17.0 {

 do_catchsql_test 17.1 {
  SELECT * FROM t1 WHERE t1 MATCH 'abandon';
-} {1 {database disk image is malformed}}
+} {1 {vtable constructor failed: t1}}

 #--------------------------------------------------------------------------
 reset_db
@@ -1630,7 +1630,7 @@ do_test 20.0 {

 do_catchsql_test 20.1 {
  SELECT * FROM t1 WHERE t1 MATCH 'abandon';
-} {1 {database disk image is malformed}}
+} {1 {vtable constructor failed: t1}}

 #-------------------------------------------------------------------------
 reset_db
@@ -2100,7 +2100,7 @@ do_test 22.0 {

 do_catchsql_test 22.1 {
  INSERT INTO t1(t1) VALUES('optimize');
-} {1 {database disk image is malformed}}
+} {1 {vtable constructor failed: t1}}

 #--------------------------------------------------------------------------
 reset_db
@@ -3700,7 +3700,7 @@ do_catchsql_test 32.1 {
         highlight(t1, 2, '[', ']') 
  FROM t1('g + h') 
  WHERE rank MATCH 'bm25(1.0, 1.0)' ORDER BY rank;
-} {1 {database disk image is malformed}}
+} {1 {vtable constructor failed: t1}}

 do_catchsql_test 32.2 {
  SELECT * FROM t3;
@@ -4267,7 +4267,7 @@ do_test 35.0 {

 do_catchsql_test 35.1 {
  SELECT * FROM t1 WHERE t1 MATCH 'e*';
-} {1 {fts5: missing row 14 from content table 'main'.'t1_content'}}
+} {1 {database disk image is malformed}}

 #-------------------------------------------------------------------------
 reset_db
@@ -8958,6 +8958,7 @@ do_catchsql_test 61.2 {
  SELECT * FROM t3 ORDER BY rowid;
 } {/*malformed database schema*/}

+breakpoint
 #-------------------------------------------------------------------------
 do_test 62.0 {
  sqlite3 db {}
@@ -10767,7 +10768,6 @@ do_catchsql_test 73.1 {
 reset_db
 do_test 74.0 {
  sqlite3 db {}
-  sqlite3_fts5_register_matchinfo db
  db deserialize [decode_hexdb {
 | size 106496 pagesize 4096 filename x.db
 | page 1 offset 0
@@ -14587,19 +14587,14 @@ do_test 74.0 {
 | end x.db
 }]} {}

-do_catchsql_test 74.0.5 {
-  SELECT matchinfo(1,2);
-} {1 {unable to use function matchinfo in the requested context}}
-
 do_catchsql_test 74.1 {
-  SELECT rowid, quote(matchinfo(t1,'pxyb<s')) FROM t1 WHERE t1 MATCH 'e*';
-} {1 {unrecognized matchinfo flag: <}}
+  SELECT rowid, quote(matchinfo(t1,'p�xyb<s')) FROM t1 WHERE t1 MATCH 'e*';
+} {1 {unable to use function matchinfo in the requested context}}

 #-------------------------------------------------------------------------
 reset_db
 do_test 75.0 {
  sqlite3 db {}
-  sqlite3_fts5_register_matchinfo db
  db deserialize [decode_hexdb {
 | size 32768 pagesize 4096 filename crash-033d665d5caa8d.db
 | page 1 offset 0
@@ -14796,7 +14791,7 @@ do_test 75.0 {

 do_catchsql_test 75.1 {
  SELECT rowid, quote(matchinfo(t1,'pcxybs')) FROM t1 WHERE t1 MATCH 'e*';
-} {1 {database disk image is malformed}}
+} {1 {unable to use function matchinfo in the requested context}}

 #-------------------------------------------------------------------------
 reset_db
@@ -15524,160 +15519,6 @@ do_catchsql_test 80.1 {
 SELECT snippet(rowid, -1, '.', '..', '[', '(]'),snippet(rowid, -1, '.', '.', '', '(]'), highlight(t1, 29, 1 , '') FROM t1('g+ h') WHERE rank MATCH 'bm25(1.0, 10)' ORDER BY NOT (SELECT 1 FROM t1('g+ æ') WHERE rank MATCH 'bm25(1.0, 10)' ORDER BY rank);
 } {1 {database disk image is malformed}}

-#-------------------------------------------------------------------------
-reset_db
-do_test 81.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 40960 pagesize 4096 filename crash-44e8035a976422.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 0a   .....@  ........
-|     32: 00 00 00 00 00 00 00 00 00 00 00 0d 00 00 00 04   ................
-|     48: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00   ................
-|     96: 00 00 00 00 0d 00 00 00 0d 0b 6e 00 0f a3 0f 4c   ..........n....L
-|    112: 0e e1 0e 81 0e 24 0d cc 0d 72 0d 1b 0c b0 0c 50   .....$...r.....P
-|    128: 0b f8 0b b3 0b 6e 00 00 00 00 00 00 00 00 00 00   .....n..........
-|   2912: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 43 0d   ..............C.
-|   2928: 06 17 11 11 08 75 74 61 62 6c 65 74 34 74 34 43   .....utablet4t4C
-|   2944: 52 45 41 54 45 20 56 49 52 54 55 41 4c 20 54 41   REATE VIRTUAL TA
-|   2960: 42 4c 45 20 74 34 20 55 53 49 4e 47 20 66 74 73   BLE t4 USING fts
-|   2976: 35 76 6f 63 61 62 28 27 74 32 27 2c 20 27 72 6f   5vocab('t2', 'ro
-|   2992: 77 27 29 43 0c 06 17 11 11 08 75 74 61 62 6c 65   w')C......utable
-|   3008: 74 33 74 33 43 52 45 41 54 45 20 56 49 52 54 55   t3t3CREATE VIRTU
-|   3024: 41 4c 20 54 41 42 4c 45 20 74 33 20 55 53 49 4e   AL TABLE t3 USIN
-|   3040: 47 20 66 74 73 35 76 6f 63 61 62 28 27 74 31 27   G fts5vocab('t1'
-|   3056: 2c 20 27 72 6f 77 27 29 56 0b 06 17 1f 1f 01 7d   , 'row')V.......
-|   3072: 74 61 62 6c 65 74 32 5f 63 6f 6e 66 69 67 74 32   tablet2_configt2
-|   3088: 5f 63 6f 6e 66 69 67 0a 43 52 45 41 54 45 20 54   _config.CREATE T
-|   3104: 41 42 4c 45 20 27 74 32 5f 63 6f 6e 66 69 67 27   ABLE 't2_config'
-|   3120: 28 6b 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20   (k PRIMARY KEY, 
-|   3136: 76 29 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44   v) WITHOUT ROWID
-|   3152: 5e 0a 07 17 21 21 01 81 07 74 61 62 6c 65 74 32   ^...!!...tablet2
-|   3168: 5f 63 6f 6e 74 65 6e 74 74 32 5f 63 6f 6e 74 65   _contentt2_conte
-|   3184: 6e 74 09 43 52 45 41 54 45 20 54 41 42 4c 45 20   nt.CREATE TABLE 
-|   3200: 27 74 32 5f 63 6f 6e 74 65 6e 74 27 28 69 64 20   't2_content'(id 
-|   3216: 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59 20   INTEGER PRIMARY 
-|   3232: 4b 45 59 2c 20 63 30 2c 20 63 31 2c 20 63 32 29   KEY, c0, c1, c2)
-|   3248: 69 09 07 17 19 19 01 81 2d 74 61 62 6c 65 74 32   i.......-tablet2
-|   3264: 5f 69 64 78 74 32 5f 69 64 78 08 43 52 45 41 54   _idxt2_idx.CREAT
-|   3280: 45 20 54 41 42 4c 45 20 27 74 32 5f 69 64 78 27   E TABLE 't2_idx'
-|   3296: 28 73 65 67 69 64 2c 20 74 65 72 6d 2c 20 70 67   (segid, term, pg
-|   3312: 6e 6f 2c 20 50 52 49 4d 41 52 59 20 4b 45 59 28   no, PRIMARY KEY(
-|   3328: 73 65 67 69 64 2c 20 74 65 72 6d 29 29 20 57 49   segid, term)) WI
-|   3344: 54 48 4f 55 54 20 52 4f 57 49 44 55 08 07 17 1b   THOUT ROWIDU....
-|   3360: 1b 01 81 01 74 61 62 6c 65 74 32 5f 64 61 74 61   ....tablet2_data
-|   3376: 74 32 5f 64 61 74 61 07 43 52 45 41 54 45 20 54   t2_data.CREATE T
-|   3392: 41 42 4c 45 20 27 74 32 5f 64 61 74 61 27 28 69   ABLE 't2_data'(i
-|   3408: 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52   d INTEGER PRIMAR
-|   3424: 59 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42 4c 4f   Y KEY, block BLO
-|   3440: 42 29 58 07 07 17 11 11 08 81 1d 74 61 62 6c 65   B)X........table
-|   3456: 74 32 74 32 43 52 45 41 54 45 20 56 49 52 54 55   t2t2CREATE VIRTU
-|   3472: 41 4c 20 54 41 42 4c 45 20 74 32 20 55 53 49 4e   AL TABLE t2 USIN
-|   3488: 47 20 66 74 73 35 28 27 61 27 2c 5b 62 5d 2c 22   G fts5('a',[b],.
-|   3504: 63 22 2c 64 65 74 61 69 6c 3d 6e 6f 6e 65 2c 63   c.,detail=none,c
-|   3520: 6f 6c 75 6d 6e 73 69 7a 65 3d 30 29 56 06 06 17   olumnsize=0)V...
-|   3536: 1f 1f 01 7d 74 61 62 6c 65 74 31 5f 63 6f 6e 66   ....tablet1_conf
-|   3552: 69 67 74 31 5f 63 6f 6e 66 69 67 06 43 52 45 41   igt1_config.CREA
-|   3568: 54 45 20 54 41 42 4c 45 20 27 74 31 5f 63 6f 6e   TE TABLE 't1_con
-|   3584: 66 69 67 27 28 6b 20 50 52 49 4d 41 52 59 20 4b   fig'(k PRIMARY K
-|   3600: 45 59 2c 20 76 29 20 57 49 54 48 4f 55 54 20 52   EY, v) WITHOUT R
-|   3616: 4f 57 49 44 5b 05 07 17 21 21 01 81 01 74 61 62   OWID[...!!...tab
-|   3632: 6c 65 74 31 5f 64 6f 63 73 69 7a 65 74 31 5f 64   let1_docsizet1_d
-|   3648: 6f 63 73 69 7a 65 05 43 52 45 41 54 45 20 54 41   ocsize.CREATE TA
-|   3664: 42 4c 45 20 27 74 31 5f 64 6f 63 73 69 7a 65 27   BLE 't1_docsize'
-|   3680: 28 69 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d   (id INTEGER PRIM
-|   3696: 41 52 59 20 4b 45 59 2c 20 73 7a 20 42 4c 4f 42   ARY KEY, sz BLOB
-|   3712: 29 5e 04 07 17 21 21 01 81 07 74 61 62 6c 65 74   )^...!!...tablet
-|   3728: 31 5f 63 6f 6e 74 65 6e 74 74 31 5f 63 6f 6e 74   1_contentt1_cont
-|   3744: 65 6e 74 04 43 52 45 41 54 45 20 54 41 42 4c 45   ent.CREATE TABLE
-|   3760: 20 27 74 31 5f 63 6f 6e 74 65 6e 74 27 28 69 64    't1_content'(id
-|   3776: 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59    INTEGER PRIMARY
-|   3792: 20 4b 45 59 2c 20 63 30 2c 20 63 31 2c 20 63 32    KEY, c0, c1, c2
-|   3808: 29 69 03 07 17 19 19 01 81 2d 74 61 62 6c 65 74   )i.......-tablet
-|   3824: 31 5f 69 64 78 74 31 5f 69 64 78 03 43 52 45 41   1_idxt1_idx.CREA
-|   3840: 54 45 20 54 41 42 4c 45 20 27 74 31 5f 69 64 78   TE TABLE 't1_idx
-|   3856: 27 28 73 65 67 69 64 2c 20 74 65 72 6d 2c 20 70   '(segid, term, p
-|   3872: 67 6e 6f 2c 20 50 52 49 4d 41 52 59 20 4b 45 59   gno, PRIMARY KEY
-|   3888: 28 73 65 67 69 64 2c 20 74 65 72 6d 29 29 20 57   (segid, term)) W
-|   3904: 49 54 48 4f 55 54 20 52 4f 57 49 44 55 02 07 17   ITHOUT ROWIDU...
-|   3920: 1b 1b 01 81 01 74 61 62 6c 65 74 31 5f 64 61 74   .....tablet1_dat
-|   3936: 61 74 31 5f 64 61 74 61 02 43 52 45 41 54 45 20   at1_data.CREATE 
-|   3952: 54 41 42 4c 45 20 27 74 31 5f 64 61 74 61 27 28   TABLE 't1_data'(
-|   3968: 69 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d 41   id INTEGER PRIMA
-|   3984: 52 59 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42 4c   RY KEY, block BL
-|   4000: 4f 42 29 5b 01 07 17 11 11 08 81 23 74 61 62 6c   OB)[.......#tabl
-|   4016: 65 74 31 74 31 43 52 45 41 54 45 20 56 49 52 54   et1t1CREATE VIRT
-|   4032: 55 41 4c 20 54 41 42 4c 45 20 74 31 20 55 53 49   UAL TABLE t1 USI
-|   4048: 4e 47 20 66 74 73 35 28 61 2c 62 20 75 6e 69 6e   NG fts5(a,b unin
-|   4064: 64 65 78 65 64 2c 63 2c 74 6f 6b 65 6e 69 7a 65   dexed,c,tokenize
-|   4080: 3d 22 70 6f 72 74 65 72 20 61 73 63 69 69 22 29   =.porter ascii.)
-| page 2 offset 4096
-|      0: 0d 0f 68 00 05 0f 13 00 0f e6 0f 13 0f a8 0f 7c   ..h............|
-|     16: 0f 2a 00 00 00 00 00 00 00 00 00 00 00 00 00 00   .*..............
-|   3856: 00 00 00 15 0a 03 00 30 00 00 00 00 01 03 03 00   .......0........
-|   3872: 03 01 01 01 02 01 01 03 01 01 37 8c 80 80 80 80   ..........7.....
-|   3888: 01 03 00 74 00 00 00 2e 02 30 61 03 02 02 01 01   ...t.....0a.....
-|   3904: 62 03 02 03 01 01 63 03 02 04 01 01 67 03 06 01   b.....c.....g...
-|   3920: 02 02 01 01 68 03 06 01 02 03 01 01 69 03 06 01   ....h.......i...
-|   3936: 02 04 04 06 06 06 08 08 0f ef 00 14 2a 00 00 00   ............*...
-|   3952: 00 01 02 02 00 02 01 01 01 02 01 01 25 88 80 80   ............%...
-|   3968: 80 80 01 03 00 50 00 00 00 1f 02 30 67 02 08 02   .....P.....0g...
-|   3984: 01 02 02 01 01 68 02 08 03 8d 02 03 01 01 6a 42   .....h........jB
-|   4000: 08 04 01 02 04 04 09 09 37 84 80 80 80 80 01 03   ........7.......
-|   4016: 00 74 00 00 00 2e 02 30 61 01 12 02 01 01 62 01   .t.....0a.....b.
-|   4032: 02 03 01 01 63 01 02 04 01 01 67 01 06 01 02 02   ....c.....g.....
-|   4048: 01 01 68 01 05 01 02 03 01 01 69 01 06 01 02 04   ..h.......i.....
-|   4064: 04 06 06 06 08 08 07 01 03 00 14 03 09 00 09 00   ................
-|   4080: 00 00 11 24 00 00 00 00 01 01 01 00 01 01 01 01   ...$............
-| page 3 offset 8192
-|      0: 0a 00 00 00 03 0f ec 00 0f fa 0f f3 0f ec 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 00 06 04 01 0c   ................
-|   4080: 01 03 02 06 04 01 0c 01 02 02 05 04 09 0c 01 02   ................
-| page 4 offset 12288
-|      0: 0d 00 00 00 03 0f be 00 0f ea 00 00 00 00 00 00   ................
-|   4016: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 03   ................
-|   4032: 05 00 17 17 17 61 20 62 20 63 67 20 68 20 69 67   .....a b cg h ig
-|   4048: 20 68 20 69 14 02 05 00 17 17 17 67 20 68 20 69    h i.......g h i
-|   4064: 61 20 62 20 63 67 20 68 20 69 14 01 05 00 17 17   a b cg h i......
-|   4080: 17 61 20 62 20 63 64 20 65 20 66 67 20 68 20 69   .a b cd e fg h i
-| page 5 offset 16384
-|      0: 0d 00 00 00 03 0f e8 00 0f f8 0f f0 0f e8 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 06 03 03 00 12 03 00 03   ................
-|   4080: 06 02 03 00 12 03 00 03 06 01 03 00 12 03 00 03   ................
-| page 6 offset 20480
-|      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.
-| page 7 offset 24576
-|      0: 0d 00 00 00 03 0f 9e 00 0f e6 0f ef 0f 9e 00 00   ................
-|   3984: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 41 84   ..............A.
-|   4000: 80 80 80 80 01 04 00 81 06 00 00 00 34 02 30 61   ............4.0a
-|   4016: 01 01 01 01 01 62 01 01 01 01 01 63 01 01 01 01   .....b.....c....
-|   4032: e6 64 01 01 01 65 01 01 01 66 01 01 01 67 01 01   .d...e...f...g..
-|   4048: 01 01 01 68 01 01 01 01 01 69 01 01 01 04 06 06   ...h.....i......
-|   4064: 06 04 04 04 06 06 07 01 03 00 14 03 09 09 09 0f   ................
-|   4080: 0a 03 00 24 00 00 00 00 01 01 01 00 01 01 01 01   ...$............
-| page 8 offset 28672
-|      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 9 offset 32768
-|      0: 0d 00 00 00 03 0f be 00 0f ea 0f d4 0f be 00 00   ................
-|   4016: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 03   ................
-|   4032: 05 00 17 17 17 61 20 62 20 63 67 20 68 20 69 67   .....a b cg h ig
-|   4048: 20 68 21 69 14 02 05 00 17 17 17 67 20 68 20 69    h!i.......g h i
-|   4064: 61 20 62 20 63 67 20 68 20 69 14 01 05 00 17 17   a b cg h i......
-|   4080: 17 61 20 62 20 63 64 20 65 20 66 67 20 68 20 69   .a b cd e fg h i
-| page 10 offset 36864
-|      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-44e8035a976422.db
-}]} {}
-
-do_catchsql_test 81.2 {
-  UPDATE t1 SET b=zeroblob(299);
-} {1 {database disk image is malformed}}
-

 sqlite3_fts5_may_be_corrupt 0
 finish_test
@@ -14,7 +14,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt4

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt5

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -966,262 +966,6 @@ do_catchsql_test 6.2 {
  UPDATE t1 SET content=randomblob(500) WHERE t1;
 } {1 {constraint failed}}

-#-------------------------------------------------------------------------
-reset_db
-do_test 7.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 40960 pagesize 4096 filename crash-d8b4a99207c10b.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 0a   .....@  ........
-|     32: 00 00 00 00 00 00 00 00 00 00 00 0d 00 00 00 04   ................
-|     48: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00   ................
-|     96: 00 00 00 00 0d 00 00 00 0d 0b 62 00 0f 97 0f 40   ..........b....@
-|    112: 0e d5 0e 75 0e 18 0d c0 0d 66 0d 0f 0c a4 0c 44   ...u.....f.....D
-|    128: 0b ec 0b a7 0b 62 00 00 00 00 00 00 00 00 00 00   .....b..........
-|   2912: 00 00 43 0d 06 17 11 11 08 75 74 61 62 6c 65 74   ..C......utablet
-|   2928: 34 74 34 43 52 45 41 54 45 20 56 49 52 54 55 41   4t4CREATE VIRTUA
-|   2944: 4c 20 54 41 42 4c 45 20 74 34 20 55 53 49 4e 47   L TABLE t4 USING
-|   2960: 20 66 74 73 35 76 6f 63 61 62 28 27 74 32 27 2c    fts5vocab('t2',
-|   2976: 20 27 72 6f 77 27 29 43 0c 06 17 11 11 08 75 74    'row')C......ut
-|   2992: 61 62 6c 65 74 33 74 33 43 52 45 41 54 45 20 56   ablet3t3CREATE V
-|   3008: 49 52 54 55 41 4c 20 54 41 42 4c 45 20 74 33 20   IRTUAL TABLE t3 
-|   3024: 55 53 49 4e 47 20 66 74 73 35 76 6f 63 61 62 28   USING fts5vocab(
-|   3040: 27 74 31 27 2c 20 27 72 6f 77 27 29 56 0b 06 17   't1', 'row')V...
-|   3056: 1f 1f 01 7d 74 61 62 6c 65 74 32 5f 63 6f 6e 66   ....tablet2_conf
-|   3072: 69 67 74 32 5f 63 6f 6e 66 69 67 0a 43 52 45 41   igt2_config.CREA
-|   3088: 54 45 20 54 41 42 4c 45 20 27 74 32 5f 63 6f 6e   TE TABLE 't2_con
-|   3104: 66 69 67 27 28 6b 20 50 52 49 4d 41 52 59 20 4b   fig'(k PRIMARY K
-|   3120: 45 59 2c 20 76 29 20 57 49 54 48 4f 55 54 20 52   EY, v) WITHOUT R
-|   3136: 4f 57 49 44 5e 0a 07 17 21 21 01 81 07 74 61 62   OWID^...!!...tab
-|   3152: 6c 65 74 32 5f 63 6f 6e 74 65 6e 74 74 32 5f 63   let2_contentt2_c
-|   3168: 6f 6e 74 65 6e 74 09 43 52 45 41 54 45 20 54 41   ontent.CREATE TA
-|   3184: 42 4c 45 20 27 74 32 5f 63 6f 6e 74 65 6e 74 27   BLE 't2_content'
-|   3200: 28 69 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d   (id INTEGER PRIM
-|   3216: 41 52 59 20 4b 45 59 2c 20 63 30 2c 20 63 31 2c   ARY KEY, c0, c1,
-|   3232: 20 63 32 29 69 09 07 17 19 19 01 81 2d 74 61 62    c2)i.......-tab
-|   3248: 6c 65 74 32 5f 69 64 78 74 32 5f 69 64 78 08 43   let2_idxt2_idx.C
-|   3264: 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 32 5f   REATE TABLE 't2_
-|   3280: 69 64 78 27 28 73 65 67 69 64 2c 20 74 65 72 6d   idx'(segid, term
-|   3296: 2c 20 70 67 6e 6f 2c 20 50 52 49 4d 41 52 59 20   , pgno, PRIMARY 
-|   3312: 4b 45 59 28 73 65 67 69 64 2c 20 74 65 72 6d 29   KEY(segid, term)
-|   3328: 29 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44 55   ) WITHOUT ROWIDU
-|   3344: 08 07 17 1b 1b 01 81 01 74 61 62 6c 65 74 32 5f   ........tablet2_
-|   3360: 64 61 74 61 74 32 5f 64 61 74 61 07 43 52 45 41   datat2_data.CREA
-|   3376: 54 45 20 54 41 42 4c 45 20 27 74 32 5f 64 61 74   TE TABLE 't2_dat
-|   3392: 61 27 28 69 64 20 49 4e 54 45 47 45 52 20 50 52   a'(id INTEGER PR
-|   3408: 49 4d 41 52 59 20 4b 45 59 2c 20 62 6c 6f 63 6b   IMARY KEY, block
-|   3424: 20 42 4c 4f 42 29 58 07 07 17 11 11 08 81 1d 74    BLOB)X........t
-|   3440: 61 62 6c 65 74 32 74 32 43 52 45 41 54 45 20 56   ablet2t2CREATE V
-|   3456: 49 52 54 55 41 4c 20 54 41 42 4c 45 20 74 32 20   IRTUAL TABLE t2 
-|   3472: 55 53 49 4e 47 20 66 74 73 35 28 27 61 27 2c 5b   USING fts5('a',[
-|   3488: 62 5d 2c 22 63 22 2c 64 65 74 61 69 6c 3d 6e 6f   b],.c.,detail=no
-|   3504: 6e 65 2c 63 6f 6c 75 6d 6e 73 69 7a 65 3d 30 29   ne,columnsize=0)
-|   3520: 56 06 06 17 1f 1f 01 7d 74 61 62 6c 65 74 31 5f   V.......tablet1_
-|   3536: 63 6f 6e 66 69 67 74 31 5f 63 6f 6e 66 69 67 06   configt1_config.
-|   3552: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-|   3568: 5f 63 6f 6e 66 69 67 27 28 6b 20 50 52 49 4d 41   _config'(k PRIMA
-|   3584: 52 59 20 4b 45 59 2c 20 76 29 20 57 49 54 48 4f   RY KEY, v) WITHO
-|   3600: 55 54 20 52 4f 57 49 44 5b 05 07 17 21 21 01 81   UT ROWID[...!!..
-|   3616: 01 74 61 62 6c 65 74 31 5f 64 6f 63 73 69 7a 65   .tablet1_docsize
-|   3632: 74 31 5f 64 6f 63 73 69 7a 65 05 43 52 45 41 54   t1_docsize.CREAT
-|   3648: 45 20 54 41 42 4c 45 20 27 74 31 5f 64 6f 63 73   E TABLE 't1_docs
-|   3664: 69 7a 65 27 28 69 64 20 49 4e 54 45 47 45 52 20   ize'(id INTEGER 
-|   3680: 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 73 7a 20   PRIMARY KEY, sz 
-|   3696: 42 4c 4f 42 29 5e 04 07 17 21 21 01 81 07 74 61   BLOB)^...!!...ta
-|   3712: 62 6c 65 74 31 5f 63 6f 6e 74 65 6e 74 74 31 5f   blet1_contentt1_
-|   3728: 63 6f 6e 74 65 6e 74 04 43 52 45 41 54 45 20 54   content.CREATE T
-|   3744: 41 42 4c 45 20 27 74 31 5f 63 6f 6e 74 65 6e 74   ABLE 't1_content
-|   3760: 27 28 69 64 20 49 4e 54 45 47 45 52 20 50 52 49   '(id INTEGER PRI
-|   3776: 4d 41 52 59 20 4b 45 59 2c 20 63 30 2c 20 63 31   MARY KEY, c0, c1
-|   3792: 2c 20 63 32 29 69 03 07 17 19 19 01 81 2d 74 61   , c2)i.......-ta
-|   3808: 62 6c 65 74 31 5f 69 64 78 74 31 5f 69 64 78 03   blet1_idxt1_idx.
-|   3824: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-|   3840: 5f 69 64 78 27 28 73 65 67 69 64 2c 20 74 65 72   _idx'(segid, ter
-|   3856: 6d 2c 20 70 67 6e 6f 2c 20 50 52 49 4d 41 52 59   m, pgno, PRIMARY
-|   3872: 20 4b 45 59 28 73 65 67 69 64 2c 20 74 65 72 6d    KEY(segid, term
-|   3888: 29 29 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44   )) WITHOUT ROWID
-|   3904: 55 02 07 17 1b 1b 01 81 01 74 61 62 6c 65 74 31   U........tablet1
-|   3920: 5f 64 61 74 61 74 31 5f 64 61 74 61 02 43 52 45   _datat1_data.CRE
-|   3936: 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 64 61   ATE TABLE 't1_da
-|   3952: 74 61 27 28 69 64 20 49 4e 54 45 47 45 52 20 50   ta'(id INTEGER P
-|   3968: 52 49 4d 41 52 59 20 4b 45 59 2c 20 62 6c 6f 63   RIMARY KEY, bloc
-|   3984: 6b 20 42 4c 4f 42 29 67 01 07 17 11 11 08 81 3b   k BLOB)g.......;
-|   4000: 74 61 62 6c 65 74 31 74 31 43 52 45 41 54 45 20   tablet1t1CREATE 
-|   4016: 56 49 52 54 55 41 4c 20 54 41 42 4c 45 20 74 31   VIRTUAL TABLE t1
-|   4032: 20 55 53 49 4e 47 20 66 74 73 35 28 61 2c 62 20    USING fts5(a,b 
-|   4048: 75 6e 69 6e 64 65 78 65 64 2c 63 2c 74 6f 6b 65   unindexed,c,toke
-|   4064: 6e 69 7a 65 3d 22 70 6f 72 74 65 72 20 61 73 63   nize=.porter asc
-|   4080: 69 69 22 2c 74 6f 6b 65 6e 64 61 74 61 3d 31 29   ii.,tokendata=1)
-| page 2 offset 4096
-|      0: 0d 0f 68 00 05 0f 13 00 0f e6 0f 13 0f a8 0f 7c   ..h............|
-|     16: 0f 2a 00 00 00 00 00 00 00 00 00 00 00 00 00 00   .*..............
-|   3856: 00 00 00 15 0a 03 00 30 00 00 00 00 01 03 03 00   .......0........
-|   3872: 03 01 01 01 02 01 01 03 01 01 37 8c 80 80 80 80   ..........7.....
-|   3888: 01 03 00 74 00 00 00 2e 02 30 61 03 02 02 01 01   ...t.....0a.....
-|   3904: 62 03 02 03 01 01 63 03 02 04 01 01 67 03 06 01   b.....c.....g...
-|   3920: 02 02 01 01 68 03 06 01 02 03 01 01 69 03 06 01   ....h.......i...
-|   3936: 02 04 04 06 06 06 08 08 0f ef 00 14 2a 00 00 00   ............*...
-|   3952: 00 01 02 02 00 02 01 01 01 02 01 01 25 88 80 80   ............%...
-|   3968: 80 80 01 03 00 50 00 00 00 1f 02 30 67 02 08 02   .....P.....0g...
-|   3984: 01 02 02 01 01 68 02 08 03 01 02 03 01 01 69 02   .....h........i.
-|   4000: 08 04 01 02 04 04 09 09 37 84 80 80 80 7f f1 03   ........7.......
-|   4016: 00 74 00 00 00 2e 02 30 61 01 02 02 01 01 62 01   .t.....0a.....b.
-|   4032: 02 03 01 01 63 01 02 04 01 01 67 01 06 01 02 02   ....c.....g.....
-|   4048: 01 01 68 01 06 01 02 03 01 01 69 01 06 01 02 04   ..h.......i.....
-|   4064: 04 06 06 06 08 08 07 01 03 00 14 03 09 00 09 00   ................
-|   4080: 00 00 11 24 00 00 00 00 01 01 01 00 01 01 01 01   ...$............
-| page 3 offset 8192
-|      0: 0a 00 00 00 03 0f ec 00 0f fa 0f f3 0f ec 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 00 06 04 01 0c   ................
-|   4080: 01 03 02 06 04 01 0c 01 02 02 05 04 09 0c 01 02   ................
-| page 4 offset 12288
-|      0: 0d 00 00 00 03 0f be 00 0f ea 0f d4 0f be 00 00   ................
-|   4016: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 03   ................
-|   4032: 05 00 17 17 17 61 20 62 20 63 67 20 68 20 69 67   .....a b cg h ig
-|   4048: 20 68 20 69 14 02 05 00 17 17 17 67 20 68 20 69    h i.......g h i
-|   4064: 61 20 62 20 63 67 20 68 20 69 14 01 05 00 17 17   a b cg h i......
-|   4080: 17 61 20 62 20 63 64 20 65 20 66 67 20 68 20 69   .a b cd e fg h i
-| page 5 offset 16384
-|      0: 0d 00 00 00 03 0f e8 00 0f f8 0f f0 0f e8 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 06 03 03 00 12 03 00 03   ................
-|   4080: 06 02 03 00 12 03 00 03 06 01 03 00 12 03 00 03   ................
-| page 6 offset 20480
-|      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.
-| page 7 offset 24576
-|      0: 0d 00 00 00 03 0f 9e 00 0f e6 0f ef 0f 9e 00 00   ................
-|   3984: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 41 84   ..............A.
-|   4000: 80 80 80 80 01 04 00 81 06 00 00 00 34 02 30 61   ............4.0a
-|   4016: 01 01 01 01 01 62 01 01 01 01 01 63 01 01 01 01   .....b.....c....
-|   4032: 01 64 01 01 01 65 01 01 01 66 01 01 01 67 01 01   .d...e...f...g..
-|   4048: 01 01 01 68 01 01 01 01 01 69 01 01 01 04 06 06   ...h.....i......
-|   4064: 06 04 04 04 06 06 07 01 03 00 14 03 09 09 09 0f   ................
-|   4080: 0a 03 00 24 00 00 00 00 01 01 01 00 01 01 01 01   ...$............
-| page 8 offset 28672
-|      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 9 offset 32768
-|      0: 0d 00 00 00 03 0f be 00 0f ea 0f d4 0f be 00 00   ................
-|   4016: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 14 03   ................
-|   4032: 05 00 17 17 17 61 20 62 20 63 67 20 68 20 69 67   .....a b cg h ig
-|   4048: 20 68 20 69 14 02 05 00 17 17 17 67 20 68 20 69    h i.......g h i
-|   4064: 61 20 62 20 63 67 20 68 20 69 14 01 05 00 17 17   a b cg h i......
-|   4080: 17 61 20 62 20 63 64 20 65 20 66 67 20 68 20 69   .a b cd e fg h i
-| page 10 offset 36864
-|      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-d8b4a99207c10b.db
-}]} {}
-
-do_catchsql_test 7.1 {
-  SELECT snippet(t1, -1, '.', '..', '[', ']'), 
-         highlight(t1, 2, '[', ']') 
-           FROM t1('g + h') 
-           WHERE rank MATCH 'bm25(1.0, 1.0)' ORDER BY rank;
-} {1 {database disk image is malformed}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_test 8.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 20480 pagesize 4096 filename crash-d57c01958e48ab.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 05   .....@  ........
-|     32: 00 00 00 00 00 00 00 00 00 00 00 05 00 00 00 04   ................
-|     48: 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 00   ................
-|     96: 00 00 00 00 0d 00 00 00 05 0e 10 00 0f 97 0f 40   ...............@
-|    112: 0e d5 0e 68 0e 10 01 00 00 00 00 00 00 00 00 00   ...h............
-|   3600: 56 05 06 17 1f 1f 01 7d 74 61 62 6c 65 74 31 5f   V.......tablet1_
-|   3616: 63 6f 6e 66 69 67 74 31 5f 63 6f 6e 66 69 67 05   configt1_config.
-|   3632: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-|   3648: 5f 63 6f 6e 66 69 67 27 28 6b 20 50 52 49 4d 41   _config'(k PRIMA
-|   3664: 52 59 20 4b 45 59 2c 20 76 29 20 57 49 54 48 4f   RY KEY, v) WITHO
-|   3680: 55 54 20 52 4f 57 49 44 6b 04 07 17 21 21 01 81   UT ROWIDk...!!..
-|   3696: 21 74 61 62 6c 65 74 31 5f 64 6f 63 73 69 7a 65   !tablet1_docsize
-|   3712: 74 31 5f 64 6f 63 73 69 7a 65 04 43 52 45 41 54   t1_docsize.CREAT
-|   3728: 45 20 54 41 42 4c 45 20 27 74 31 5f 64 6f 63 73   E TABLE 't1_docs
-|   3744: 69 7a 65 27 28 69 64 20 49 4e 54 45 47 45 52 20   ize'(id INTEGER 
-|   3760: 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 73 7a 20   PRIMARY KEY, sz 
-|   3776: 42 4c 4f 42 2c 20 6f 72 69 67 69 6e 20 49 4e 54   BLOB, origin INT
-|   3792: 45 47 45 52 29 69 03 07 17 19 19 01 81 2d 74 61   EGER)i.......-ta
-|   3808: 62 6c 65 74 31 5f 69 64 78 74 31 5f 69 64 78 03   blet1_idxt1_idx.
-|   3824: 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74 31   CREATE TABLE 't1
-|   3840: 5f 69 64 78 27 28 73 65 67 69 64 2c 20 74 65 72   _idx'(segid, ter
-|   3856: 6d 2c 20 70 67 6e 6f 2c 20 50 52 49 4d 41 52 59   m, pgno, PRIMARY
-|   3872: 20 4b 45 59 28 73 65 67 69 64 2c 20 74 65 72 6d    KEY(segid, term
-|   3888: 29 29 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44   )) WITHOUT ROWID
-|   3904: 55 02 07 17 1b 1b 01 81 01 74 61 62 6c 65 74 31   U........tablet1
-|   3920: 5f 64 61 74 61 74 31 5f 64 61 74 61 02 43 52 45   _datat1_data.CRE
-|   3936: 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 64 61   ATE TABLE 't1_da
-|   3952: 74 61 27 28 69 64 20 49 4e 54 45 47 45 52 20 50   ta'(id INTEGER P
-|   3968: 52 49 4d 41 52 59 20 4b 45 59 2c 20 62 6c 6f 63   RIMARY KEY, bloc
-|   3984: 6b 20 42 4c 4f 42 29 67 01 07 17 11 11 08 81 3b   k BLOB)g.......;
-|   4000: 74 61 62 6c 65 74 31 74 31 43 52 45 41 54 45 20   tablet1t1CREATE 
-|   4016: 56 49 52 54 55 41 4c 20 54 41 42 4c 45 20 74 31   VIRTUAL TABLE t1
-|   4032: 20 55 53 49 4e 47 20 66 74 73 35 28 61 2c 20 62    USING fts5(a, b
-|   4048: 2c 20 63 6f 6e 74 65 6e 74 3d 27 27 2c 20 63 6f   , content='', co
-|   4064: 6e 74 65 6e 74 6c 65 73 73 5f 64 65 6c 65 74 65   ntentless_delete
-|   4080: 3d 31 2c 20 74 6f 6b 65 6e 64 61 74 61 3d 31 29   =1, tokendata=1)
-| page 2 offset 4096
-|      0: 0d 0f eb 00 03 0e 17 00 0f e2 0e 17 0e 31 00 00   .............1..
-|     16: 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
-|   3600: 00 00 00 00 00 00 00 18 0a 03 00 36 00 00 00 00   ...........6....
-|   3616: ff 00 00 01 01 01 01 00 01 01 01 01 01 01 00 00   ................
-|   3632: 07 83 29 84 80 80 80 80 01 04 00 86 56 00 00 01   ..).........V...
-|   3648: 96 04 30 61 61 61 01 02 02 01 04 02 04 01 08 02   ..0aaa..........
-|   3664: 04 04 04 01 10 02 04 04 04 04 04 04 04 01 20 02   .............. .
-|   3680: 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 01   ................
-|   3696: 40 02 04 04 04 04 04 04 04 04 04 04 04 04 04 04   @...............
-|   3712: 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04   ................
-|   3728: 04 01 81 00 02 04 04 04 04 04 04 04 04 04 04 04   ................
-|   3744: 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04   ................
-|   3760: 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04   ................
-|   3776: 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04 04   ................
-|   3792: 04 04 04 04 02 02 62 63 01 06 01 01 02 01 03 62   ......bc.......b
-|   3808: 62 62 02 02 03 01 04 03 06 01 08 03 06 06 06 01   bb..............
-|   3824: 10 03 06 06 06 06 06 06 06 01 20 03 06 06 06 06   .......... .....
-|   3840: 06 06 06 06 06 06 06 06 06 06 06 01 40 03 06 06   ............@...
-|   3856: 06 06 06 06 06 06 06 06 06 06 06 06 06 06 06 06   ................
-|   3872: 06 06 06 06 06 06 06 06 06 06 16 06 06 02 02 63   ...............c
-|   3888: 64 02 06 01 01 02 01 03 63 63 63 03 02 05 01 04   d.......ccc.....
-|   3904: 05 0a 01 08 05 0a 0a 0a 01 10 05 0a 0a 0a 0a 0a   ................
-|   3920: 0a 0a 01 20 05 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a 0a   ... ............
-|   3936: 0a 0a 0a 0a 02 02 64 65 03 06 01 01 02 01 03 64   ......de.......d
-|   3952: 64 64 04 02 09 01 04 09 12 01 08 09 12 12 12 01   dd..............
-|   3968: 10 09 12 12 12 12 12 12 12 02 02 65 66 04 06 01   ...........ef...
-|   3984: 01 02 01 03 65 65 65 05 02 11 01 04 11 22 01 08   ....eee.........
-|   4000: 11 22 22 22 02 02 66 67 05 06 01 01 02 01 03 66   ......fg.......f
-|   4016: 56 66 06 02 21 01 04 21 42 02 02 67 68 06 06 01   Vf..!..!B..gh...
-|   4032: 01 02 cb 03 67 67 67 07 02 41 02 02 68 69 07 06   ....ggg..A..hi..
-|   4048: 01 01 02 04 81 13 09 50 09 2e 09 1c 09 12 09 0c   .......P........
-|   4064: 09 08 07 01 03 00 14 07 81 77 07 00 00 00 15 22   .........w......
-|   4080: 00 00 00 00 ff 00 00 01 00 00 00 00 00 00 05 0c   ................
-| page 3 offset 8192
-|      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 4 offset 12288
-|      0: 0d 00 00 00 07 0f c8 00 0f f8 0f f0 0f e8 0f e0   ................
-|     16: 0f d8 0f d0 0f c8 00 00 00 00 00 00 00 00 00 00   ................
-|   4032: 00 00 00 00 00 00 00 00 06 07 04 00 10 09 7f 01   ................
-|   4048: 06 06 04 00 10 09 3f 01 06 05 04 00 10 09 1f 01   ......?.........
-|   4064: 06 04 04 00 10 09 0f 01 06 03 04 00 10 09 07 01   ................
-|   4080: 06 02 04 00 10 09 03 01 06 01 04 00 10 09 01 01   ................
-| page 5 offset 16384
-|      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-d57c01958e48ab.db
-}]} {}
-
-do_catchsql_test 8.1 {
-  SELECT rowid FROM t1('a* NOT ý') ;
-} {0 {1 2 3 4 5 6 7}}
-
 #-------------------------------------------------------------------------
 reset_db
 do_test 9.0 {
@@ -1453,4 +1197,3 @@ do_catchsql_test 9.2 {

 sqlite3_fts5_may_be_corrupt 0
 finish_test
-
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt6

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -13,7 +13,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5corrupt7

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -1,94 +0,0 @@
-# 2024 Aug 28
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5corrupt8
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x);
-}
-
-do_execsql_test 1.1 {
-  UPDATE t1_data SET block='hello world' WHERE id=10
-}
-
-db close
-sqlite3 db test.db
-
-do_catchsql_test 1.2 {
-  SELECT * FROM t1
-} {1 {database disk image is malformed}}
-do_catchsql_test 1.3 {
-  DROP TABLE t1
-} {0 {}}
-do_execsql_test 1.4 {
-  SELECT * FROM sqlite_schema
-}
-
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x);
-}
-do_execsql_test 2.1 {
-  UPDATE t1_config SET v=555 WHERE k='version'
-}
-db close
-sqlite3 db test.db
-do_catchsql_test 2.2 {
-  SELECT * FROM t1
-} {1 {invalid fts5 file format (found 555, expected 4 or 5) - run 'rebuild'}}
-do_catchsql_test 2.3 {
-  DROP TABLE t1
-} {1 {invalid fts5 file format (found 555, expected 4 or 5) - run 'rebuild'}}
-do_test 2.4 {
-  sqlite3_fts5_drop_corrupt_table db main t1
-} {}
-do_execsql_test 2.5 {
-  SELECT * FROM sqlite_schema
-}
-
-do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x);
-}
-do_execsql_test 3.1 {
-  DELETE FROM t1_config;
-}
-db close
-sqlite3 db test.db
-do_catchsql_test 3.2 {
-  SELECT * FROM t1
-} {1 {invalid fts5 file format (found 0, expected 4 or 5) - run 'rebuild'}}
-do_catchsql_test 3.3 {
-  DROP TABLE t1
-} {1 {invalid fts5 file format (found 0, expected 4 or 5) - run 'rebuild'}}
-
-
-do_test 3.4 {
-  sqlite3_db_config db DEFENSIVE 1
-} {1}
-do_test 3.5 {
-  sqlite3_fts5_drop_corrupt_table db main t1
-} {}
-do_test 3.6 {
-  sqlite3_db_config db DEFENSIVE -1
-} {1}
-do_execsql_test 3.7 {
-  SELECT * FROM sqlite_schema
-}
-
-finish_test
-
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5dlidx

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5doclist

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -16,7 +16,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5ea

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -13,7 +13,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5eb

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -86,13 +86,13 @@ do_execsql_test 3.0 {
  INSERT INTO e1 VALUES ('just a few words with a / inside');
 }
 do_execsql_test 3.1 {
-  SELECT rowid, format('%g',bm25(e1)) FROM e1 WHERE e1 MATCH '"just"' ORDER BY rank;
+  SELECT rowid, bm25(e1) FROM e1 WHERE e1 MATCH '"just"' ORDER BY rank;
 } {1 -1e-06}
 do_execsql_test 3.2 {
  SELECT rowid FROM e1 WHERE e1 MATCH '"/" OR "just"'
 } 1
 do_execsql_test 3.3 {
-  SELECT rowid, format('%g',bm25(e1)) FROM e1 WHERE e1 MATCH '"/" OR "just"' ORDER BY rank;
+  SELECT rowid, bm25(e1) FROM e1 WHERE e1 MATCH '"/" OR "just"' ORDER BY rank;
 } {1 -1e-06}

 do_execsql_test 3.4 "
@@ -1,52 +0,0 @@
-# 2024 August 8
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#*************************************************************************
-# This file implements regression tests for SQLite library.  The
-# focus of this script is testing the FTS5 module.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5expr
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE x1 USING fts5(a);
-  INSERT INTO x1(rowid, a) VALUES (113, 'fts5 expr test');
-}
-
-do_execsql_test 1.1 {
-  SELECT rowid FROM x1('expr');
-} {113}
-
-for {set ii 0} {$ii < 300} {incr ii} {
-  set expr "expr "
-  append expr [string repeat "NOT abcd " $ii]
-
-  if {$ii<257} {
-    set res {0 113}
-  } else {
-    set res {1 {fts5 expression tree is too large (maximum depth 256)}}
-  }
-  do_catchsql_test 1.1.$ii {
-    SELECT rowid FROM x1($expr)
-  } $res
-}
-
-do_execsql_test 1.2 {
-  SELECT rowid FROM x1 WHERE a MATCH '"..."'
-} {}
-
-finish_test
-
@@ -90,7 +90,7 @@ set ::res [db eval {SELECT rowid, x1 FROM x1 WHERE x1 MATCH '*reads'}]
 do_faultsim_test 4 -faults oom-* -body {
  db eval {SELECT rowid, x, x1 FROM x1 WHERE x1 MATCH '*reads'}
 } -test {
-  faultsim_test_result {0 {0 {} 2}}
+  faultsim_test_result {0 {0 {} 3}}
 }

 #-------------------------------------------------------------------------
@@ -16,7 +16,7 @@ source [file join [file dirname [info script]] fts5_common.tcl]
 source $testdir/malloc_common.tcl
 set testprefix fts5fault6

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -57,6 +57,7 @@ foreach_detail_mode $testprefix {

 } ;# foreach_detail_mode...

+
 do_execsql_test 4.0 {
  CREATE VIRTUAL TABLE x2 USING fts5(a);
  INSERT INTO x2(x2, rank) VALUES('crisismerge', 2);
@@ -79,18 +80,5 @@ do_faultsim_test 4 -faults oom-* -prep {
  faultsim_test_result {0 {}} {1 SQLITE_NOMEM}
 }

-set TMPDBERROR {1 {unable to open a temporary database file for storing temporary tables}}
-
-do_faultsim_test 5 -faults oom-t* -prep {
-  faultsim_restore_and_reopen
-  execsql { PRAGMA temp_store = memory }
-} -body {
-  execsql { PRAGMA integrity_check }
-} -test {
-  if {[string match {*error code=7*} $testresult]==0} {
-    faultsim_test_result {0 ok} {1 SQLITE_NOMEM} $::TMPDBERROR
-  }
-}
-

 finish_test
@@ -14,7 +14,7 @@ source [file join [file dirname [info script]] fts5_common.tcl]
 source $testdir/malloc_common.tcl
 set testprefix fts5faultG

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -1,150 +0,0 @@
-# 2010 June 15
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-source $testdir/malloc_common.tcl
-set testprefix fts5faultG
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-set ::testprefix fts5faultH
-
-sqlite3_fts5_register_origintext db
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(
-      x, tokenize="origintext unicode61", tokendata=1
-  );
-
-  BEGIN;
-    INSERT INTO t1 VALUES('oNe tWo thRee');
-    INSERT INTO t1 VALUES('One Two Three');
-    INSERT INTO t1 VALUES('onE twO threE');
-  COMMIT;
-  BEGIN;
-    INSERT INTO t1 VALUES('one two three');
-    INSERT INTO t1 VALUES('one two three');
-    INSERT INTO t1 VALUES('one two three');
-  COMMIT;
-}
-
-do_faultsim_test 1 -faults oom* -prep { 
-} -body {
-  execsql {
-    SELECT rowid FROM t1('three');
-  }
-} -test {
-  faultsim_integrity_check
-  faultsim_test_result {0 {1 2 3 4 5 6}}
-}
-
-
-reset_db
-sqlite3_fts5_register_origintext db
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(
-      x, tokenize="origintext unicode61", tokendata=1
-  );
-  INSERT INTO t1(t1, rank) VALUES('pgsz', 64);
-
-  BEGIN;
-    INSERT INTO t1(rowid, x) VALUES(10, 'aaa bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(12, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(13, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(14, 'bbb BBB bbb');
-    INSERT INTO t1(rowid, x) VALUES(15, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(16, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(17, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(18, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(19, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(20, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(21, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(22, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(23, 'bbb bbb bbb');
-    INSERT INTO t1(rowid, x) VALUES(24, 'aaa bbb BBB');
-  COMMIT;
-}
-
-do_faultsim_test 2 -faults oom* -prep { 
-} -body {
-  execsql {
-    SELECT rowid FROM t1('BBB AND AAA');
-  }
-} -test {
-  faultsim_integrity_check
-  faultsim_test_result {0 {10 24}}
-}
-
-reset_db
-sqlite3_fts5_register_origintext db
-do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(
-      x, tokenize="origintext unicode61", tokendata=1
-  );
-  INSERT INTO t1(t1, rank) VALUES('pgsz', 64);
-
-  INSERT INTO t1(rowid, x) VALUES(9, 'bbb Bbb BBB');
-  BEGIN;
-    INSERT INTO t1(rowid, x) VALUES(10, 'aaa bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(11, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(12, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(13, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(14, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(15, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(16, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(17, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(18, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(19, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(20, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(21, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(22, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(23, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(24, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(25, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(26, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(27, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(28, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(29, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(30, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(31, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(32, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(33, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(34, 'bbb Bbb BBB');
-    INSERT INTO t1(rowid, x) VALUES(35, 'aaa bbb BBB');
-  COMMIT;
-}
-
-do_faultsim_test 3.1 -faults oom* -prep { 
-} -body {
-  execsql {
-    SELECT rowid FROM t1('BBB AND AAA');
-  }
-} -test {
-  faultsim_integrity_check
-  faultsim_test_result {0 {10 35}}
-}
-do_faultsim_test 3.2 -faults oom* -prep { 
-} -body {
-  execsql {
-    SELECT count(*) FROM t1('BBB');
-  }
-} -test {
-  faultsim_integrity_check
-  faultsim_test_result {0 27}
-}
-
-
-finish_test
@@ -1,294 +0,0 @@
-# 2010 June 15
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-source $testdir/malloc_common.tcl
-set testprefix fts5faultI
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-set ::testprefix fts5faultI
-
-do_execsql_test 1.0 {
-  PRAGMA encoding = utf16;
-  CREATE VIRTUAL TABLE t1 USING fts5(x, locale=1);
-  INSERT INTO t1 VALUES('origintext unicode61 ascii porter trigram');
-}
-
-faultsim_save_and_close
-faultsim_restore_and_reopen
-
-do_faultsim_test 1 -faults oom* -prep { 
-} -body {
-  execsql {
-    SELECT rowid FROM t1(fts5_locale('en_US', 'origintext'));
-  }
-} -test {
-  faultsim_test_result {0 1}
-}
-
-do_faultsim_test 2 -faults oom* -prep { 
-  faultsim_restore_and_reopen
-  execsql {
-    SELECT * FROM t1('ascii');
-  }
-} -body {
-  execsql {
-    UPDATE t1 SET rowid=rowid+1;
-  }
-} -test {
-  faultsim_test_result {0 {}}
-}
-
-fts5_aux_test_functions db
-do_faultsim_test 3 -faults oom* -prep { 
-} -body {
-  execsql {
-    SELECT fts5_columnlocale(t1, 0) FROM t1('unicode*');
-  }
-} -test {
-  faultsim_test_result {0 {{}}} {1 SQLITE_NOMEM}
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE w1 USING fts5(a);
-}
-faultsim_save_and_close
-
-do_faultsim_test 4 -faults oom* -prep { 
-  faultsim_restore_and_reopen
-  execsql {
-    BEGIN;
-      INSERT INTO w1 VALUES('token token token');
-  }
-} -body {
-  execsql {
-    INSERT INTO w1(w1, rank) VALUES('rank', 'bm25()');
-  }
-} -test {
-  faultsim_test_result {0 {}}
-}
-
-do_faultsim_test 5 -faults oom* -prep { 
-  faultsim_restore_and_reopen
-  execsql { 
-    BEGIN;
-      INSERT INTO w1 VALUES('one');
-      SAVEPOINT one;
-        INSERT INTO w1 VALUES('two');
-      ROLLBACK TO one;
-  }
-
-} -body {
-  execsql {
-    INSERT INTO w1 VALUES('string');
-  }
-} -test {
-  faultsim_test_result {0 {}}
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 5.0 {
-  CREATE VIRTUAL TABLE w1 USING fts5(a);
-  INSERT INTO w1 VALUES('one two three');
-}
-fts5_aux_test_functions db
-
-do_faultsim_test 5 -faults oom* -prep {
-} -body {
-  execsql {
-    SELECT fts5_test_insttoken(w1, 0, 0) FROM w1('two');
-  }
-} -test {
-  faultsim_test_result {0 two} {1 SQLITE_NOMEM}
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE w1 USING fts5(a);
-  INSERT INTO w1 VALUES('one two three');
-}
-fts5_aux_test_functions db
-faultsim_save_and_close
-
-do_faultsim_test 6 -faults oom* -prep {
-  faultsim_restore_and_reopen
-  db eval {
-    BEGIN;
-      INSERT INTO w1 VALUES('four five six');
-      SAVEPOINT abc;
-        INSERT INTO w1 VALUES('seven eight nine');
-        SAVEPOINT def;
-          INSERT INTO w1 VALUES('ten eleven twelve');
-  }
-} -body {
-  execsql {
-    RELEASE abc;
-  }
-} -test {
-  faultsim_test_result {0 {}}
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 7.0 {
-  CREATE VIRTUAL TABLE w1 USING fts5(a);
-  INSERT INTO w1 VALUES('one two three');
-  INSERT INTO w1 VALUES('three two one');
-  DELETE FROM w1_content WHERE rowid=1;
-}
-
-faultsim_save_and_close
-
-do_faultsim_test 7 -faults oom* -prep {
-  faultsim_restore_and_reopen
-  db eval { SELECT * FROM w1 }
-} -body {
-  execsql {
-    PRAGMA integrity_check;
-  }
-} -test {
-}
-
-#-------------------------------------------------------------------------
-reset_db
-fts5_tclnum_register db
-fts5_aux_test_functions db
-
-do_execsql_test 8.0 {
-  CREATE VIRTUAL TABLE ft USING fts5(
-      x, tokenize = "tclnum query", detail=columns
-  );
-  INSERT INTO ft VALUES('one two three i ii iii');
-  INSERT INTO ft VALUES('four five six iv v vi');
-  INSERT INTO ft VALUES('eight nine ten viii ix x');
-} {}
-
-do_faultsim_test 8.1 -faults oom* -prep {
-} -body {
-  execsql {
-    SELECT fts5_test_collist (ft) FROM ft('one two');
-  }
-} -test {
-  faultsim_test_result {0 {{0.0 1.0}}} {1 {SQL logic error}} {1 SQLITE_NOMEM}
-}
-
-do_faultsim_test 8.2 -faults oom* -prep {
-} -body {
-  execsql {
-    SELECT rowid FROM ft('one two') ORDER BY rank;
-  }
-} -test {
-  faultsim_test_result {0 1} {1 {SQL logic error}} {1 SQLITE_NOMEM}
-}
-
-#-------------------------------------------------------------------------
-reset_db
-
-do_execsql_test 9.0 {
-  CREATE VIRTUAL TABLE ft USING fts5(x);
-  INSERT INTO ft VALUES('one two three i ii iii');
-  INSERT INTO ft VALUES('four five six iv v vi');
-  INSERT INTO ft VALUES('eight nine ten viii ix x');
-} {}
-
-faultsim_save_and_close
-
-do_faultsim_test 9.1 -faults oom* -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql {
-    UPDATE ft SET rowid=4 WHERE rowid=1
-  }
-} -test {
-  faultsim_test_result {0 {}}
-}
-
-do_faultsim_test 9.2 -faults oom* -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql {
-    SELECT rowid FROM ft WHERE x MATCH 'one AND two AND three'
-  }
-} -test {
-  faultsim_test_result {0 1}
-}
-
-#-------------------------------------------------------------------------
-reset_db
-
-do_execsql_test 10.0 {
-  CREATE VIRTUAL TABLE ft USING fts5(x, locale=1);
-  INSERT INTO ft VALUES(fts5_locale('hello', 'one two three i ii iii'));
-  INSERT INTO ft VALUES('four five six iv v vi');
-  INSERT INTO ft VALUES('eight nine ten viii ix x');
-} {}
-
-do_execsql_test 10.1 {
-  SELECT fts5_get_locale(ft, 0) FROM ft WHERE x MATCH 'one AND two AND three'
-} {hello}
-
-faultsim_save_and_close
-do_faultsim_test 10.1 -faults oom* -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql {
-    SELECT fts5_get_locale(ft, 0) FROM ft WHERE x MATCH 'one AND two AND three'
-  }
-} -test {
-  faultsim_test_result {0 hello}
-}
-
-breakpoint
-faultsim_save_and_close
-do_faultsim_test 10.2 -faults oom-t* -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql {
-    INSERT INTO ft VALUES(zeroblob(10000));
-  }
-} -test {
-  faultsim_test_result {0 {}}
-}
-
-#-------------------------------------------------------------------------
-reset_db
-
-do_execsql_test 11.0 {
-  CREATE VIRTUAL TABLE f1 USING fts5(content);
-  CREATE TABLE g1(id, content);
-  INSERT INTO g1 VALUES(30000, 'a b c');
-  INSERT INTO g1 VALUES(40000, 'd e f');
-}
-
-faultsim_save_and_close
-
-do_faultsim_test 11 -faults oom* -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql {
-    INSERT INTO f1(rowid, content) SELECT id, content FROM g1;
-  }
-} -test {
-  faultsim_test_result {0 {}}
-}
-
-finish_test
-
@@ -22,7 +22,6 @@ do_execsql_test 1.0 {
  CREATE VIRTUAL TABLE x1 USING fts5(a, b);
 }

-unset -nocomplain res
 foreach {tn expr ok} {
  1 {^abc}           1
  2 {^abc + def}     1
@@ -17,7 +17,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5full

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5hash

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5integrity

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
@@ -153,7 +153,6 @@ do_execsql_test 5.3 {
  INSERT INTO gg(gg) VALUES('integrity-check');
 }

-unset -nocomplain res
 do_test 5.4.1 {
  set ok 0
  for {set i 0} {$i < 10000} {incr i} {
@@ -356,57 +355,4 @@ do_execsql_test 11.4 {
  PRAGMA integrity_check(t2);
 } {ok}

-#-------------------------------------------------------------------
-reset_db
-
-do_execsql_test 12.1 {
-  CREATE VIRTUAL TABLE x1 USING fts5(a, b);
-  INSERT INTO x1 VALUES('one', 'two');
-  INSERT INTO x1 VALUES('three', 'four');
-  INSERT INTO x1 VALUES('five', 'six');
-}
-
-do_execsql_test 12.2 {
-  PRAGMA integrity_check
-} {ok}
-
-db close
-sqlite3 db test.db -readonly 1
-
-explain_i {
-  PRAGMA integrity_check
-  }
-do_execsql_test 12.3 {
-  PRAGMA integrity_check
-} {ok}
-
-
-#-------------------------------------------------------------------
-reset_db
-do_execsql_test 13.1 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a, tokenize=ascii);
-  INSERT INTO t1 VALUES('a b c'), ('d e f');
-  PRAGMA integrity_check;
-} {ok}
-
-db close
-sqlite3 db test.db
-do_catchsql_test 13.2 {
-  PRAGMA integrity_check;
-} {0 ok}
-
-do_execsql_test 13.3 {
-  PRAGMA writable_schema = 1;
-  UPDATE sqlite_schema SET sql = 'CREATE VIRTUAL TABLE t1 USING fts5(a, tokenize=blah)'
-  WHERE name = 't1';
-}
-
-db close
-sqlite3 db test.db
-breakpoint
-do_catchsql_test 13.4 {
-  PRAGMA integrity_check;
-} {1 {SQL logic error}}
-
-
 finish_test
@@ -1,56 +0,0 @@
-# 2024 September 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 the integrity-check procedure.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5integrity2
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t2 USING fts5(a, detail='none');
-  BEGIN;
-    INSERT INTO t2(rowid, a) VALUES(-1, 'hello world');
-    INSERT INTO t2(rowid, a) VALUES(9223372036854775807, 'hello world');
-  COMMIT;
-}
-
-do_execsql_test 2.1 {
-  SELECT rowid FROM t2('hello AND world');
-} {-1 9223372036854775807}
-
-#-------------------------------------------------------------------------
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(a, detail='none');
-  CREATE TABLE r1(r);
-  
-  WITH c(x) AS (VALUES(1) UNION SELECT x<<1 FROM c)
-    INSERT INTO r1(r) SELECT -1-x FROM c;
-
-  INSERT INTO t1(rowid, a) SELECT r, 'abc' FROM r1;
-}
-
-do_execsql_test 2.1 {
-  PRAGMA integrity_check;
-} {ok}
-
-do_execsql_test 2.2 {
-  SELECT rowid FROM t1('abc') ORDER BY +rowid;
-} [db eval {SELECT r FROM r1 ORDER BY r}]
-
-
-finish_test
@@ -33,7 +33,6 @@ proc progress_handler {args} {
  return 0
 }

-unset -nocomplain res
 foreach {tn sql} {
  1 { INSERT INTO t1(rowid, a) VALUES(0, 'z z z z') }
  2 { COMMIT }
@@ -65,3 +64,4 @@ foreach {tn sql} {
 }

 finish_test
+
@@ -15,7 +15,7 @@
 source [file join [file dirname [info script]] fts5_common.tcl]
 set testprefix fts5lastrowid

-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
+# If SQLITE_ENABLE_FTS5 is defined, omit this file.
 ifcapable !fts5 {
  finish_test
  return
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
drh	cb6105badd	Version 3.44.4 FossilOrigin-Name: f1e31fd9961ac82535a5d0702b127d84de8ca21d4df1c51c73e078ea0ad4afa8	2025-02-19 00:18:53 +00:00
drh	090e39c7db	Cherry pick recent fixes into branch-3.44. FossilOrigin-Name: 75bbd094db08d421b7555bda5447902e44adff99cc095e7216a21cb5a3002167	2025-02-18 18:05:16 +00:00
drh	2688bc35cc	Mark the BTree cell overflow cache as invalid whenever the rowid goes invalid. FossilOrigin-Name: 0ec6669c84462c9ab965f912d3a09fa56cd99b5491c57da4a1941efa763ed5b0	2024-04-12 15:15:05 +00:00
drh	6f5ebb23c4	Ignore CHECK constraints when qualifying the xfer optimization while running VACUUM. FossilOrigin-Name: 944d1b6eb346a9b3c32bce3457f8a62013ee5d6b538fa19243036cd2924678d4	2024-04-09 14:08:39 +00:00
drh	3f00c1b31c	Check-in a9657c87c53c1922 is wrong: the IndexedExpr.bMaybeNullRow flag is required for virtual columns if they are part of an outer join. Add a test case to prove it. FossilOrigin-Name: 083b0f7e771838e5f02744c245e8dbd7bef4fc998df59466ba65c531c7162d99	2024-04-05 14:13:43 +00:00
drh	67276c648b	When compiling with SQLITE_ALLOW_ROWID_IN_VIEW, if the RETURNING clause of an UPDATE of a view specifies a rowid, then return NULL for the value of that rowid. FossilOrigin-Name: d38cfa6067ccd450c4fac183765c05ff247ecb49ccf172a68ef9d381577df84f	2024-04-05 11:28:30 +00:00
drh	ff549b1384	Fix the xBestIndex method of the pragma virtual table so that it correctly gives a higher cost to plans where the schema hidden parameter is unconstrained. FossilOrigin-Name: d68fb8b5dbb8305e00d2dd14d8fe6b3d9f67e2459102ff160d956a6b75ddc18e	2024-03-24 21:15:01 +00:00
drh	5b9ba67d8e	Do not automatically assume that ROWID is NOT NULL when compiled with SQLITE_ALLOW_ROWID_IN_VIEW. dbsqlfuzz 31b38eeb63a4e1562de665078f52b7b47a7543cf FossilOrigin-Name: b5d2dce18fcd00749a3efe8386df42fca103f86bd862f2610cfb05651ddb9d59	2024-03-24 16:42:12 +00:00
drh	c2526e2c2d	Fix a assert() that is incorrect, though harmless. Also add a test case. FossilOrigin-Name: 57b0c984605d0f437b4930f6b994e15b80340c753d46a679b07d356c645856ea	2024-03-21 22:08:33 +00:00
drh	29ef48a097	Fix test cases for rtree and fts5. No changes to code. FossilOrigin-Name: 633dca907488b721ec1b8e470904af73369c1b1225005038aacb3e8a78c6390c	2024-03-20 16:29:19 +00:00
drh	47f478c9da	Have rtree avoid keeping a blob handle open following an error. FossilOrigin-Name: 1303716a113c51e949acc46fbd01634ce0e5a016cbc2d01bb20dd03ffd1f28e0	2024-03-20 16:04:53 +00:00
drh	a93344297f	Following a ROLLBACK that reverts changes to an RTREE, any pending queries against that same RTREE abort with code SQLITE_ABORT_ROLLBACK. dbsqlfuzz de7d17b72d0e842352c998dd86a47b7d0f707be9. FossilOrigin-Name: b26e5a500ebc358047eff79db61b5edfec319b95fbf8685e6a798c5e6c1923fb	2024-03-20 15:26:30 +00:00
drh	b2bc4c9338	Back port various minor patches FossilOrigin-Name: a1a5c427c2c5cfff1ffeb71b29c9f64121465334c6a3fde8213df1dc2a1228d4	2024-03-20 12:19:40 +00:00
drh	d07908335d	Automatically disable the DISTINCT optimization during query planning if the ORDER BY clause exceeds 63 terms. dbsqlfuzz afd1d61fc27d14938a0d78a50970fa1e9fbfee58. FossilOrigin-Name: e8d5caef260b171b4df7f6166e191fc763e25be5b94fc1e097cd5c4ec05604e4	2024-03-20 11:36:26 +00:00
drh	76214b6661	Ignore COLLATE operators when determining whether the result of a subexpression should be shallow-copied or deep-copied. FossilOrigin-Name: dd58d1178f840f0249cb3d84f44c9da0335ca6a44f064f6ad6ec68ec621556c5	2024-03-20 11:30:40 +00:00
drh	c5c26d7f59	Fix a harmless compiler warning in the randomjson.c extension. FossilOrigin-Name: a4c93512345f498e3e9aa1673c368bb9b0939b21bd492411b7eff581cd9a709a	2024-03-20 11:25:33 +00:00
drh	27039a32d5	If a term of an ORDER BY or GROUP BY contains an aggregate function or column, then it is not an alias that needs to be resolved, so don't try to. This fixes a harmless assertion found by dbsqlfuzz. FossilOrigin-Name: e7ba2af5a1ae5d464ad4d4edfdf551bc237168e04784c07a229ba7b28c4f4695	2024-03-20 11:24:11 +00:00
drh	8276a5f336	Fix the SQLITE_ALLOW_ROWID_IN_VIEW bug-compatibility option so that it works again. Add the SQLITE_CONFIG_ROWID_IN_VIEW sqlite3_config() value to optionally disable the bug-compatibility mode at start-time. Enable testing of SQLITE_ALLOW_ROWID_IN_VIEW. FossilOrigin-Name: acc08353e27a960bf949cfc5f94e874a91e1c42fd7a26617dc24cf549fa9b120	2024-03-20 11:04:38 +00:00
drh	0febad8fdf	Fix a problem involving infinities int the Kahan-Babushka-Neumaier summation algorithm. FossilOrigin-Name: 0984e5cd2574780dc1952e3daebafba9ddbb3b4937325117b922fdad0652db57	2024-03-19 10:46:41 +00:00
drh	8d6a941353	Silently ignore redundant ON CONFLICT clauses in an UPSERT. FossilOrigin-Name: e546d8c68539920ea7b88932e9553d908d6a1956b85e29518ee4f81035987403	2024-03-08 14:16:20 +00:00
drh	da3c2bb7db	In os_unix.c and os_win.c, do not allow xFetch() to return a pointer to a page buffer that is right at the end of the mapped region - if the database is corrupted in a specific way such a page buffer might be overread by several bytes. FossilOrigin-Name: 198a1daae01dd9308f91eec1087279481ce0ff632bb3e5ab54cbf3738a903811	2024-01-23 16:21:07 +00:00
stephan	2295e72ef6	Update #ifdef checks in pager.c and util.c to account for [0462a2612d1fc1d0] to resolve the build problem reported in [forum:9819032aac\|forum post 9819032aac]. FossilOrigin-Name: 7374c2342e66b352c2098d401e7660b18a0cdf1a69c24386953b1331c2afcbbf	2023-12-22 15:42:09 +00:00
drh	7722f9a60d	When unable to resolve an identifier, change the Expr node into TK_NULL rather than TK_COLUMN, to prevent any downstream misuse of the non-existent column. FossilOrigin-Name: 8f770d14d3dca5eb38faa89c4cba269233aa45cc4a56176fdae22f14974ceeb2	2023-12-19 13:00:21 +00:00
drh	1088fc8387	Avoid invoking sqlite3ExprColUsage() on an unresolve column reference. FossilOrigin-Name: 6e0e2ee7c723582be5ad9126f5cd642c3cecf615c609bc0b87e914a6f5c0c904	2023-12-13 16:50:21 +00:00
stephan	fe8d9f4287	Worker1 Promiser API: when multiple db connections are active then use the requested connection instead of always the first-opened connection. Bug reported in [forum:894c330e7f23b177\|forum post 894c330e7f23b177]. FossilOrigin-Name: 3874e5a3282888b5b24835194d2f6c7b93f1ef456aa70013218b21038e831ba3	2023-12-12 17:55:20 +00:00
dan	1c6b0e5db9	Different fix for the fts5 COMMIT-following-OOM problem first fixed by [fba3129d]. This one does not cause problems if an fts5 table is renamed and then dropped within the same transaction. FossilOrigin-Name: 67da596d82ec0ed3c679da3be9d7379c557cd2fb83d7d833556107caf31327f6	2023-12-11 13:48:30 +00:00
drh	e467488d36	Increase the patch level to 3.44.3. FossilOrigin-Name: bb4d35e2628320e187f96ca671cbbf68df51e423e93678b56f18983e93f91b9f	2023-11-29 02:53:53 +00:00
drh	0495cf05a0	Reference count the Table passed into the OP_VCheck opcode. FossilOrigin-Name: 79e6496bb18246c29970a0da53f2178b6de36c5d1f50da881a6846f188e8c04d	2023-11-29 02:50:31 +00:00
drh	c8f9803dc3	Version 3.44.2 FossilOrigin-Name: ebead0e7230cd33bcec9f95d2183069565b9e709bf745c9b5db65cc0cbf92c0f	2023-11-24 11:41:44 +00:00
drh	b4b2be91dd	Another assertion fault fix, similar to [a9443dbfbe25e588]. FossilOrigin-Name: f796da626b5c3b099cc246a8b46d92839922e34f398d673b0b03d7ee33a28a60	2023-11-23 12:12:54 +00:00
drh	6292bb4fc0	Fix harmless compiler warnings in debugging code. FossilOrigin-Name: db40272c36c01d5eeb902daed2670d57ee858caae560785350aed2600b573c2d	2023-11-23 11:45:15 +00:00
drh	90d7893739	Fix an fts5 problem that could occur when mixing regular and secure delete operations on a single table. FossilOrigin-Name: 25fb5a540b1a61e1d0ff3d74ad7135bc53eb3fbe9f5352f98dd22dc7edd063bb	2023-11-23 11:29:00 +00:00
drh	efba33ed48	Increase the version number to 3.44.2. FossilOrigin-Name: 73d3cb790950e317256f500e8bfd707a6156631628a80bcafce494e8bb1e1966	2023-11-23 11:21:20 +00:00
larrybr	e6fa99aebd	Fix output redirect bug reported in [forum:/forumposts/cbf4933cfeee74bb\|the forum]. FossilOrigin-Name: 2ab256bc0bb351c16feaf0d4917ad9c3f55e39821cc7d319d86c6f0752188af7	2023-11-23 07:06:21 +00:00
stephan	c028221c3f	Correct the URL for loading sqlite3-worker1-bundler-friendly.mjs from sqlite3-worker1-promiser-bundler-friendly.js, so that the promiser can be used in bundler-using environments. Problem reported via email. FossilOrigin-Name: b1128838f9508ba8e4b735a386c5dd42c1faf84705b95fb069ab724637341170	2023-11-22 17:13:27 +00:00
drh	fef8c0b942	Version 3.44.1 FossilOrigin-Name: d295f48e8f367b066b881780c98bdf980a1d550397d5ba0b0e49842c95b3e8b4	2023-11-22 14:18:12 +00:00
larrybr	1c83877d82	Pickup minor stylistic changes related to console I/O and, for Windows builds, get fact of UTF-16 translation into the sign-on banner. (a straight cherry-pick) FossilOrigin-Name: d7a59e79467cf7aa13291c58f1cc4c1e2a51494bdd28661039421868f61088bd	2023-11-21 18:46:17 +00:00
drh	1dda1e22c9	Back out an incorrect change to the sqlite3ExprCompareSkip() function from long ago. FossilOrigin-Name: 89658abbcd04e6f6d5a2139fa92091df1de72e56bdbb12aacebf9e9178c58e3b	2023-11-20 15:58:14 +00:00
larrybr	84548fbd21	Arrange to not compile unused console I/O function. FossilOrigin-Name: 184a0cd2e855c5177948eaf754c82685e2fcd5a08488d4d3d7b5fc7537e007b4	2023-11-20 13:59:44 +00:00
drh	8fa99e9568	Convert an assert in OP_VCheck into a branch that aborts the opcode, as this can happen on some very obscure conditions, as discovered by dbsqlfuzz. FossilOrigin-Name: 0d5f68717c829d4066c6af925c3a71f673ea34f14b1805388d1bdef152864d52	2023-11-20 13:12:05 +00:00
drh	02726b172a	Cherry pick additional assert() fixes from trunk into the branch-3.44 branch. FossilOrigin-Name: 6d8a8b700237d738e7b16dd844cf2514f0df7e2275bd9eab8de0a780e3687298	2023-11-20 12:00:29 +00:00
drh	61d0a37cdf	Fix an assert() in fts5 that could be true following an OOM or IO error in contentless-delete mode. FossilOrigin-Name: 80a0bd7a692b7f08d0fddc5bc2a75e3c8146c54a08c19a70d0e1b6d0e1ac383e	2023-11-20 11:50:22 +00:00
larrybr	4ba9f44d18	Fix test 5.0 in shell1.test for Windows. (A double-quote wrapped single-quote needs no further treatment to be recognized as a single single-quote.) FossilOrigin-Name: aaa73400c41f382bbbd4ea32ad196d271c7a5e800bfee9afd998037a14fc89b9	2023-11-19 17:33:51 +00:00
larrybr	bd0d38f410	Merge changes to do Windows console I/O with UTF-16. FossilOrigin-Name: f782054e7ccdfb421a73acde6994f5046b99884924a508316a0d4a0dc9b03318	2023-11-18 22:10:40 +00:00
drh	eedca24422	Correct conditional compilation issue seen with MSVC in the Win32 mutex subsystem. FossilOrigin-Name: 6c069c5d664dca7908167e5759f952e407382b2669b25191167ad8d8fb03daa2	2023-11-18 20:24:55 +00:00
larrybr	241677519a	Cherrypick changes to simplify and make more rational how console I/O package features are selected. FossilOrigin-Name: b20c9f1785e94af4b81dcbbc63c49a883ab4095ff251b19e814ab6ef7ff06f2b	2023-11-16 20:50:56 +00:00
larrybr	22402d7d05	Get Fiddle build to succeed. (It runs, too, but not from changes here.) FossilOrigin-Name: 957ebaa2be3056371d679f7a00aeba242db34218fb839ffd1d1197cad0c4a510	2023-11-15 16:54:49 +00:00
larrybr	c283f969aa	Changes to console I/O for Fiddle build, to always defer to C library (as before.) A WIP, pending testing with Fiddle build. FossilOrigin-Name: 45b8061e7568ccca164fe000f1f0a0d984b1c28fad530bc9fdea35793a0f40bc	2023-11-15 15:20:52 +00:00
larrybr	26b57aaed7	Cherry-pick some assert()s to cover misuse of Put() from 500+ shell.c callers. FossilOrigin-Name: c1a53c28a4286c4c52fb78398d4dbf5c03de514a1fa9199bf0cfcd2cd3cc7cd9	2023-11-14 03:31:24 +00:00
larrybr	6edc7ab317	Manual merge of branch-3.44 with 3 sources affected/created by console-io-lib changes. FossilOrigin-Name: 18ebcf117aad77fa968ff5c537c9b56c1342dea687377a72a02519412a6aa565	2023-11-13 17:45:13 +00:00
drh	937ea25bcc	Remove an incorrect ALWAYS() and NEVER(). FossilOrigin-Name: 94f62093866823e013f976db8f80390bee2a9140f4cbec50d1ad8ded28f732ae	2023-11-13 12:05:09 +00:00
drh	2f51f78f97	Fix another problem with mixed join types and the RIGHT JOIN strength-reduction optimization. FossilOrigin-Name: 8f01f8b260bf70f047a720f1e61e578e500b87bdc2e867f8a8a521068a56c70c	2023-11-10 21:03:37 +00:00
drh	a048396674	Fix an obscure problem with the join-strength-reduction optimization that could occur when mixing LEFT and RIGHT joins in the same query. FossilOrigin-Name: dcf1c1378130538f1820263b4e62d06067d5ab30c07e2584c5c1b5082ede0d56	2023-11-10 15:20:41 +00:00
stephan	f78c986679	Expose the missing SQLITE_SUBTYPE to wasm. FossilOrigin-Name: 7bebfe20e77a2b4edc47debede669fab5af9ed165e5feb59a532fb2c7475fcb0	2023-11-10 15:01:45 +00:00
drh	3414ff463a	Ensure 8-byte alignment of data structues in sqlite3_database_file_object(). FossilOrigin-Name: 3cfcaafaff181c7945cc659ff6d58a0d2232d49830a259f0510d833a7a5a824b	2023-11-09 18:41:42 +00:00
stephan	5f61fa6789	Expose SQLITE_RESULT_SUBTYPE to wasm. FossilOrigin-Name: fc03988650645f0b08f1a3fb85b9ff54a04e0d7d27ca9f063198e43260826278	2023-11-09 17:55:27 +00:00
drh	599e56af76	Add the SQLITE_RESULT_SUBTYPE flag for application-defined functions. Add the -DSQLITE_STRICT_SUBTYPE=1 compile-time option that raises an error if any function invokes sqlite3_result_subtype() without the SQLITE_RESULT_SUBTYPE flag. SQLITE_RESULT_SUBTYPE prevents an indexed value of that function from being used to replace an equivalent expression, since the indexed expression does not carry the subtype. FossilOrigin-Name: 65a9cfc466d3d904af50fa5eba46d29c5a24e7dde06e5c50c03b343723be7441	2023-11-09 17:42:46 +00:00
drh	5e34405f74	JSON5 bug fix: Escape double-quotes that occur inside of single-quoted strings. FossilOrigin-Name: 6cc57bb2ce92f64af59c569696d4fbd08183feffaeee560450d13370d60f96d5	2023-11-09 01:56:55 +00:00
drh	6d12b9f850	Update the documentation to the sqlite3_set_auxdata() and sqlite3_get_auxdata() routines to make it clear that they do not work as one might expect when they are called during query planning, instead of during query execution. The JSON routines misuse those interfaces, so add a special flag to JSON routines that prevents them from being invoked during query planning. FossilOrigin-Name: 36259009c5b581ea692e8c86f505783336e4615bb5134e3afd5498f10eb36239	2023-11-07 19:15:55 +00:00
drh	a7dc704f70	Update the srctree-check.tcl script and child script so that they can be run on a read-only source tree and so that if any inconsistencies are found, the script returns a non-zero exit code and thus halts the build. FossilOrigin-Name: a0cc7e8117abf03c8d0ab903f1f4b8ff48b6c0e6de85080c9d2a915fd1c16778	2023-11-06 19:08:46 +00:00
drh	9d8ad69b1f	Fix an fts5 problem where a transaction consisting of (a) a DELETE on rowid X, (b) a prefix query, and (c) an INSERT on rowid X, could corrupt the index. FossilOrigin-Name: 34af510a5615339f2963875eab94d4b07725e766c20819f82add19faa229d552	2023-11-06 19:01:25 +00:00
drh	11379c0809	Update the version number to 3.44.1 FossilOrigin-Name: 34f23c3d0d080fef82e3515ecb74257f68878c74fb0bdceac176a004aa1a84e9	2023-11-02 11:14:43 +00:00
drh	d9369971ef	CLI to compile with older MSVC compiler. FossilOrigin-Name: c8bf4f7a6a4c4f0f8cd21de25918f4d96f6831a145af4fb63e4b5984f79613b2	2023-11-02 11:08:57 +00:00
@@ -1 +1 @@
 .47.0
 .44.4