Add tests for virtual table shmlock.

FossilOrigin-Name: 1c6a8442735e9f6117d7a8f1d88630958ec8fdb25a75cc392af1e8511a5fc56d
Fix reporting on locks from external processes. Various other fixes.
2020-09-02 16:14:17 +00:00 · 2020-09-02 15:26:28 +00:00 · 2020-09-01 20:56:28 +00:00
119 changed files with 1450 additions and 3550 deletions
@@ -441,7 +441,6 @@ TESTSRC += \
  $(TOP)/ext/expert/test_expert.c \
  $(TOP)/ext/misc/amatch.c \
  $(TOP)/ext/misc/carray.c \
-  $(TOP)/ext/misc/cksumvfs.c \
  $(TOP)/ext/misc/closure.c \
  $(TOP)/ext/misc/csv.c \
  $(TOP)/ext/misc/decimal.c \
@@ -1087,7 +1086,6 @@ SHELL_SRC = \
        $(TOP)/ext/misc/decimal.c \
 	$(TOP)/ext/misc/fileio.c \
        $(TOP)/ext/misc/ieee754.c \
-        $(TOP)/ext/misc/series.c \
 	$(TOP)/ext/misc/shathree.c \
 	$(TOP)/ext/misc/sqlar.c \
        $(TOP)/ext/misc/uint.c \
@@ -1234,7 +1232,6 @@ TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DESERIALIZE
-TESTFIXTURE_FLAGS += -DSQLITE_CKSUMVFS_STATIC

 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 TESTFIXTURE_SRC1 = sqlite3.c
@@ -1558,7 +1558,6 @@ TESTEXT = \
  $(TOP)\ext\expert\test_expert.c \
  $(TOP)\ext\misc\amatch.c \
  $(TOP)\ext\misc\carray.c \
-  $(TOP)\ext\misc\cksumvfs.c \
  $(TOP)\ext\misc\closure.c \
  $(TOP)\ext\misc\csv.c \
  $(TOP)\ext\misc\decimal.c \
@@ -2209,7 +2208,6 @@ SHELL_SRC = \
        $(TOP)\ext\misc\decimal.c \
 	$(TOP)\ext\misc\fileio.c \
        $(TOP)\ext\misc\ieee754.c \
-        $(TOP)\ext\misc\series.c \
 	$(TOP)\ext\misc\shathree.c \
 	$(TOP)\ext\misc\uint.c \
 	$(TOP)\ext\expert\sqlite3expert.c \
@@ -2388,7 +2386,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_BYTECODE_VTAB=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DESERIALIZE=1
-TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CKSUMVFS_STATIC=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)

 TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
@@ -1 +1 @@
-3.34.1
+3.34.0
@@ -153,7 +153,7 @@ Please `cd` to its location first.
 #
 #-------------------------------------------------------------------------

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

 # nmakehelp -V <file> <tag> will search the file for tag, skips until a
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.34.1.
+# Generated by GNU Autoconf 2.69 for sqlite 3.34.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -726,8 +726,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='sqlite'
 PACKAGE_TARNAME='sqlite'
-PACKAGE_VERSION='3.34.1'
-PACKAGE_STRING='sqlite 3.34.1'
+PACKAGE_VERSION='3.34.0'
+PACKAGE_STRING='sqlite 3.34.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''

@@ -799,6 +799,7 @@ TEMP_STORE
 ALLOWRELEASE
 SQLITE_THREADSAFE
 BUILD_CC
+VERSION_NUMBER
 RELEASE
 VERSION
 program_prefix
@@ -1466,7 +1467,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures sqlite 3.34.1 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.34.0 to adapt to many kinds of systems.

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

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

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

@@ -1658,7 +1659,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-sqlite configure 3.34.1
+sqlite configure 3.34.0
 generated by GNU Autoconf 2.69

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

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

  $ $0 $@
@@ -3935,13 +3936,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
  lt_cv_nm_interface="BSD nm"
  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3938: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3939: $ac_compile\"" >&5)
  (eval "$ac_compile" 2>conftest.err)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3941: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3942: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  cat conftest.err >&5
-  (eval echo "\"\$as_me:3944: output\"" >&5)
+  (eval echo "\"\$as_me:3945: output\"" >&5)
  cat conftest.out >&5
  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
    lt_cv_nm_interface="MS dumpbin"
@@ -5147,7 +5148,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 5150 "configure"' > conftest.$ac_ext
+  echo '#line 5151 "configure"' > conftest.$ac_ext
  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@@ -6672,11 +6673,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6675: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6676: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:6679: \$? = $ac_status" >&5
+   echo "$as_me:6680: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -7011,11 +7012,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7014: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7015: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:7018: \$? = $ac_status" >&5
+   echo "$as_me:7019: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s "$ac_outfile"; then
     # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings other than the usual output.
@@ -7116,11 +7117,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7119: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7120: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7123: \$? = $ac_status" >&5
+   echo "$as_me:7124: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -7171,11 +7172,11 @@ else
   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7174: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7175: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:7178: \$? = $ac_status" >&5
+   echo "$as_me:7179: \$? = $ac_status" >&5
   if (exit $ac_status) && test -s out/conftest2.$ac_objext
   then
     # The compiler can only warn and ignore the option if not recognized
@@ -9551,7 +9552,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<_LT_EOF
-#line 9554 "configure"
+#line 9555 "configure"
 #include "confdefs.h"

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

 #if HAVE_DLFCN_H
@@ -10387,6 +10388,12 @@ RELEASE=`cat $srcdir/VERSION`
 { $as_echo "$as_me:${as_lineno-$LINENO}: Release set to $RELEASE" >&5
 $as_echo "$as_me: Release set to $RELEASE" >&6;}

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

 #########
 # Locate a compiler for the build machine.  This compiler should
@@ -12236,7 +12243,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sqlite $as_me 3.34.1, which was
+This file was extended by sqlite $as_me 3.34.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

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

@@ -155,6 +155,11 @@ AC_SUBST(VERSION)
 RELEASE=`cat $srcdir/VERSION`
 AC_MSG_NOTICE(Release set to $RELEASE)
 AC_SUBST(RELEASE)
+VERSION_NUMBER=[`cat $srcdir/VERSION \
+                           | sed 's/[^0-9]/ /g' \
+                | awk '{printf "%d%03d%03d",$1,$2,$3}'`]
+AC_MSG_NOTICE(Version number set to $VERSION_NUMBER)
+AC_SUBST(VERSION_NUMBER)

 #########
 # Locate a compiler for the build machine.  This compiler should
@@ -1,49 +0,0 @@
-
-20-11-2020
-
-# Memory Allocation In vdbesort.c
-
-Memory allocation is slightly different depending on:
-
-  * whether or not SQLITE_CONFIG_SMALL_MALLOC is set, and
-  * whether or not worker threads are enabled.
-
-## SQLITE_CONFIG_SMALL_MALLOC=0
-
-Assuming SQLITE_CONFIG_SMALL_MALLOC is not set, keys passed to the sorter are
-added to an in-memory buffer. This buffer is grown using sqlite3Realloc() as
-required it reaches the size configured for the main pager cache using "PRAGMA
-cache_size". i.e. if the user has executed "PRAGMA main.cache_size = -2048",
-then this buffer is allowed to grow up to 2MB in size.
-
-Once the buffer has grown to its threshold, keys are sorted and written to
-a temp file. If worker threads are not enabled, this is the only significant
-allocation the sorter module makes. After keys are sorted and flushed out to
-the temp file, the buffer is reused to accumulate the next batch of keys.
-
-If worker threads are available, then the buffer is passed to a worker thread
-to sort and flush once it is full, and a new buffer allocated to allow the
-main thread to continue to accumulate keys. Buffers are reused once they
-have been flushed, so in this case at most (nWorker+1) buffers are allocated
-and used, where nWorker is the number of configured worker threads.
-
-There are no other significant users of heap memory in the sorter module. 
-Once sorted buffers of keys have been flushed to disk, they are read back
-either by mapping the file (via sqlite3_file.xFetch()) or else read back
-in one page at a time.
-
-All buffers are allocated by the main thread. A sorter object is associated
-with a single database connection, to which it holds a pointer.
-
-## SQLITE_CONFIG_SMALL_MALLOC=1
-
-This case is similar to the above, except that instead of accumulating
-multiple keys in a single large buffer, sqlite3VdbeSorterWrite() stores
-keys in a regular heap-memory linked list (one allocation per element).
-List elements are freed as they are flushed to disk, either by the main
-thread or by a worker thread.
-
-Each time a key is added the sorter (and an allocation made),
-sqlite3HeapNearlyFull() is called. If it returns true, the current
-list of keys is flushed to a temporary file, even if it has not yet
-reached the size threshold.
@@ -326,47 +326,6 @@ do_setup_rec_test $tn.16 {
  SCAN TABLE t1
 }

-do_setup_rec_test $tn.17.1 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a=?
-} {
-  (no new indexes)
-  SEARCH TABLE example USING INDEX sqlite_autoindex_example_1 (A=?)
-}
-do_setup_rec_test $tn.17.2 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE b=?
-} {
-  CREATE INDEX example_idx_00000042 ON example(B);
-  SEARCH TABLE example USING INDEX example_idx_00000042 (B=?)
-}
-do_setup_rec_test $tn.17.3 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a=? AND b=?
-} {
-  (no new indexes)
-  SEARCH TABLE example USING INDEX sqlite_autoindex_example_1 (A=? AND B=?)
-}
-do_setup_rec_test $tn.17.4 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a=? AND b>?
-} {
-  (no new indexes)
-  SEARCH TABLE example USING INDEX sqlite_autoindex_example_1 (A=? AND B>?)
-}
-do_setup_rec_test $tn.17.5 {
-  CREATE TABLE example (A INTEGER, B INTEGER, C INTEGER, PRIMARY KEY (A,B));
-} {
-  SELECT * FROM example WHERE a>? AND b=?
-} {
-  CREATE INDEX example_idx_0000cb3f ON example(B, A);
-  SEARCH TABLE example USING INDEX example_idx_0000cb3f (B=? AND A>?)
-}
-
 }

 proc do_candidates_test {tn sql res} {
@@ -685,7 +685,6 @@ static int idxGetTableInfo(
  IdxTable *pNew = 0;
  int rc, rc2;
  char *pCsr = 0;
-  int nPk = 0;

  rc = idxPrintfPrepareStmt(db, &p1, pzErrmsg, "PRAGMA table_info=%Q", zTab);
  while( rc==SQLITE_OK && SQLITE_ROW==sqlite3_step(p1) ){
@@ -696,7 +695,6 @@ static int idxGetTableInfo(
    );
    nByte += 1 + STRLEN(zCol);
    nCol++;
-    nPk += (sqlite3_column_int(p1, 5)>0);
  }
  rc2 = sqlite3_reset(p1);
  if( rc==SQLITE_OK ) rc = rc2;
@@ -716,7 +714,7 @@ static int idxGetTableInfo(
    const char *zCol = (const char*)sqlite3_column_text(p1, 1);
    int nCopy = STRLEN(zCol) + 1;
    pNew->aCol[nCol].zName = pCsr;
-    pNew->aCol[nCol].iPk = (sqlite3_column_int(p1, 5)==1 && nPk==1);
+    pNew->aCol[nCol].iPk = sqlite3_column_int(p1, 5);
    memcpy(pCsr, zCol, nCopy);
    pCsr += nCopy;

@@ -1721,12 +1719,10 @@ static int idxPopulateStat1(sqlite3expert *p, char **pzErr){
  idxFinalize(&rc, pIndexXInfo);
  idxFinalize(&rc, pWrite);

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

  if( rc==SQLITE_OK ){
    rc = sqlite3_exec(p->dbm, "ANALYZE sqlite_schema", 0, 0, 0);
@@ -742,7 +742,6 @@ proc print_categories {lMap} {
        }
        iTbl++;
      }
-      aAscii[0] = 0;                  /* 0x00 is never a token character */
    }
  }]
 }
@@ -184,7 +184,6 @@ struct Fts5Config {
  Fts5Tokenizer *pTok;
  fts5_tokenizer *pTokApi;
  int bLock;                      /* True when table is preparing statement */
-  int ePattern;                   /* FTS_PATTERN_XXX constant */

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

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

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

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

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

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

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

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

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

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

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

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

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

-  /* Determine and return the BM25 score for the current row. Or, if an
-  ** error has occurred, throw an exception. */
+  /* Determine the BM25 score for the current row. */
+  for(i=0; rc==SQLITE_OK && i<pData->nPhrase; i++){
+    score += pData->aIDF[i] * (
+      ( aFreq[i] * (k1 + 1.0) ) / 
+      ( aFreq[i] + k1 * (1 - b + b * D / pData->avgdl) )
+    );
+  }
+  
+  /* If no error has occurred, return the calculated score. Otherwise,
+  ** throw an SQL exception.  */
  if( rc==SQLITE_OK ){
-    for(i=0; i<pData->nPhrase; i++){
-      score += pData->aIDF[i] * (
-          ( aFreq[i] * (k1 + 1.0) ) / 
-          ( aFreq[i] + k1 * (1 - b + b * D / pData->avgdl) )
-      );
-    }
    sqlite3_result_double(pCtx, -1.0 * score);
  }else{
    sqlite3_result_error_code(pCtx, rc);
@@ -325,7 +325,7 @@ static int fts5ConfigParseSpecial(
          rc = SQLITE_ERROR;
        }else{
          rc = sqlite3Fts5GetTokenizer(pGlobal, 
-              (const char**)azArg, (int)nArg, pConfig,
+              (const char**)azArg, (int)nArg, &pConfig->pTok, &pConfig->pTokApi,
              pzErr
          );
        }
@@ -397,7 +397,9 @@ static int fts5ConfigParseSpecial(
 */
 static int fts5ConfigDefaultTokenizer(Fts5Global *pGlobal, Fts5Config *pConfig){
  assert( pConfig->pTok==0 && pConfig->pTokApi==0 );
-  return sqlite3Fts5GetTokenizer(pGlobal, 0, 0, pConfig, 0);
+  return sqlite3Fts5GetTokenizer(
+      pGlobal, 0, 0, &pConfig->pTok, &pConfig->pTokApi, 0
+  );
 }

 /*
@@ -128,7 +128,6 @@ struct Fts5Parse {
  int nPhrase;                    /* Size of apPhrase array */
  Fts5ExprPhrase **apPhrase;      /* Array of all phrases */
  Fts5ExprNode *pExpr;            /* Result of a successful parse */
-  int bPhraseToAnd;               /* Convert "a+b" to "a AND b" */
 };

 void sqlite3Fts5ParseError(Fts5Parse *pParse, const char *zFmt, ...){
@@ -217,7 +216,6 @@ static void fts5ParseFree(void *p){ sqlite3_free(p); }

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

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

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

    if( pAppend==0 ){
-      if( parseGrowPhraseArray(pParse) ){
-        fts5ExprPhraseFree(sCtx.pPhrase);
-        return 0;
+      if( (pParse->nPhrase % 8)==0 ){
+        sqlite3_int64 nByte = sizeof(Fts5ExprPhrase*) * (pParse->nPhrase + 8);
+        Fts5ExprPhrase **apNew;
+        apNew = (Fts5ExprPhrase**)sqlite3_realloc64(pParse->apPhrase, nByte);
+        if( apNew==0 ){
+          pParse->rc = SQLITE_NOMEM;
+          fts5ExprPhraseFree(sCtx.pPhrase);
+          return 0;
+        }
+        pParse->apPhrase = apNew;
      }
      pParse->nPhrase++;
    }
@@ -2198,67 +2112,6 @@ static void fts5ExprAddChildren(Fts5ExprNode *p, Fts5ExprNode *pSub){
  }
 }

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

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

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

-      if( pRet ){
-        pRet->eType = eType;
-        pRet->pNear = pNear;
-        fts5ExprAssignXNext(pRet);
-        if( eType==FTS5_STRING ){
-          int iPhrase;
-          for(iPhrase=0; iPhrase<pNear->nPhrase; iPhrase++){
-            pNear->apPhrase[iPhrase]->pNode = pRet;
-            if( pNear->apPhrase[iPhrase]->nTerm==0 ){
-              pRet->xNext = 0;
-              pRet->eType = FTS5_EOF;
-            }
+    if( pRet ){
+      pRet->eType = eType;
+      pRet->pNear = pNear;
+      fts5ExprAssignXNext(pRet);
+      if( eType==FTS5_STRING ){
+        int iPhrase;
+        for(iPhrase=0; iPhrase<pNear->nPhrase; iPhrase++){
+          pNear->apPhrase[iPhrase]->pNode = pRet;
+          if( pNear->apPhrase[iPhrase]->nTerm==0 ){
+            pRet->xNext = 0;
+            pRet->eType = FTS5_EOF;
          }
-
-          if( pParse->pConfig->eDetail!=FTS5_DETAIL_FULL ){
-            Fts5ExprPhrase *pPhrase = pNear->apPhrase[0];
-            if( pNear->nPhrase!=1 
-                || pPhrase->nTerm>1
-                || (pPhrase->nTerm>0 && pPhrase->aTerm[0].bFirst)
-              ){
-              assert( pParse->rc==SQLITE_OK );
-              pParse->rc = SQLITE_ERROR;
-              assert( pParse->zErr==0 );
-              pParse->zErr = sqlite3_mprintf(
-                  "fts5: %s queries are not supported (detail!=full)", 
-                  pNear->nPhrase==1 ? "phrase": "NEAR"
-                  );
-              sqlite3_free(pRet);
-              pRet = 0;
-            }
-          }
-        }else{
-          fts5ExprAddChildren(pRet, pLeft);
-          fts5ExprAddChildren(pRet, pRight);
        }
+
+        if( pParse->pConfig->eDetail!=FTS5_DETAIL_FULL ){
+          Fts5ExprPhrase *pPhrase = pNear->apPhrase[0];
+          if( pNear->nPhrase!=1 
+           || pPhrase->nTerm>1
+           || (pPhrase->nTerm>0 && pPhrase->aTerm[0].bFirst)
+          ){
+            assert( pParse->rc==SQLITE_OK );
+            pParse->rc = SQLITE_ERROR;
+            assert( pParse->zErr==0 );
+            pParse->zErr = sqlite3_mprintf(
+                "fts5: %s queries are not supported (detail!=full)", 
+                pNear->nPhrase==1 ? "phrase": "NEAR"
+                );
+            sqlite3_free(pRet);
+            pRet = 0;
+          }
+        }
+      }else{
+        fts5ExprAddChildren(pRet, pLeft);
+        fts5ExprAddChildren(pRet, pRight);
      }
    }
  }
@@ -2563,9 +2409,7 @@ static char *fts5ExprPrint(Fts5Config *pConfig, Fts5ExprNode *pExpr){
            pConfig->azCol[pColset->aiCol[ii]], ii==pColset->nCol-1 ? "" : " "
        );
      }
-      if( zRet ){
-        zRet = fts5PrintfAppend(zRet, "%s : ", pColset->nCol>1 ? "}" : "");
-      }
+      zRet = fts5PrintfAppend(zRet, "%s : ", pColset->nCol>1 ? "}" : "");
      if( zRet==0 ) return 0;
    }

@@ -2688,7 +2532,7 @@ static void fts5ExprFunction(

  rc = sqlite3Fts5ConfigParse(pGlobal, db, nConfig, azConfig, &pConfig, &zErr);
  if( rc==SQLITE_OK ){
-    rc = sqlite3Fts5ExprNew(pConfig, 0, pConfig->nCol, zExpr, &pExpr, &zErr);
+    rc = sqlite3Fts5ExprNew(pConfig, pConfig->nCol, zExpr, &pExpr, &zErr);
  }
  if( rc==SQLITE_OK ){
    char *zText;
@@ -306,6 +306,7 @@ int sqlite3Fts5HashWrite(
      p->iCol = (pHash->eDetail==FTS5_DETAIL_FULL ? 0 : -1);
    }

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

    /* Appending to an existing hash-entry. Check that there is enough 
@@ -338,9 +339,8 @@ int sqlite3Fts5HashWrite(
  /* If this is a new rowid, append the 4-byte size field for the previous
  ** entry, and the new rowid for this entry.  */
  if( iRowid!=p->iRowid ){
-    u64 iDiff = (u64)iRowid - (u64)p->iRowid;
    fts5HashAddPoslistSize(pHash, p, 0);
-    p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iDiff);
+    p->nData += sqlite3Fts5PutVarint(&pPtr[p->nData], iRowid - p->iRowid);
    p->iRowid = iRowid;
    bNew = 1;
    p->iSzPoslist = p->nData;
@@ -1754,7 +1754,7 @@ static void fts5SegIterReverseInitPage(Fts5Index *p, Fts5SegIter *pIter){

  ASSERT_SZLEAF_OK(pIter->pLeaf);
  while( 1 ){
-    u64 iDelta = 0;
+    i64 iDelta = 0;

    if( eDetail==FTS5_DETAIL_NONE ){
      /* todo */
@@ -1769,7 +1769,7 @@ static void fts5SegIterReverseInitPage(Fts5Index *p, Fts5SegIter *pIter){
      i += nPos;
    }
    if( i>=n ) break;
-    i += fts5GetVarint(&a[i], &iDelta);
+    i += fts5GetVarint(&a[i], (u64*)&iDelta);
    pIter->iRowid += iDelta;

    /* If necessary, grow the pIter->aRowidOffset[] array. */
@@ -1868,7 +1868,7 @@ static void fts5SegIterNext_Reverse(
  if( pIter->iRowidOffset>0 ){
    u8 *a = pIter->pLeaf->p;
    int iOff;
-    u64 iDelta;
+    i64 iDelta;

    pIter->iRowidOffset--;
    pIter->iLeafOffset = pIter->aRowidOffset[pIter->iRowidOffset];
@@ -1877,7 +1877,7 @@ static void fts5SegIterNext_Reverse(
    if( p->pConfig->eDetail!=FTS5_DETAIL_NONE ){
      iOff += pIter->nPos;
    }
-    fts5GetVarint(&a[iOff], &iDelta);
+    fts5GetVarint(&a[iOff], (u64*)&iDelta);
    pIter->iRowid -= iDelta;
  }else{
    fts5SegIterReverseNewPage(p, pIter);
@@ -4997,9 +4997,7 @@ static void fts5MergePrefixLists(
        ** at most 20 bytes of unexpected space. */
        fts5MergeAppendDocid(&out, iLastRowid, i2.iRowid);
        fts5BufferZero(&tmp);
-        sqlite3Fts5BufferSize(&p->rc, &tmp, 
-            i1.nPoslist + i2.nPoslist + 10 + 10 + FTS5_DATA_ZERO_PADDING
-        );
+        sqlite3Fts5BufferSize(&p->rc, &tmp, i1.nPoslist + i2.nPoslist + 10 + 10);
        if( p->rc ) break;

        sqlite3Fts5PoslistNext64(a1, i1.nPoslist, &iOff1, &iPos1);
@@ -5073,10 +5071,9 @@ static void fts5MergePrefixLists(
    }
    assert_nc( out.n<=(p1->n+p2->n+9) );

-    fts5BufferFree(p1);
+    fts5BufferSet(&p->rc, p1, out.n, out.p);
    fts5BufferFree(&tmp);
-    memset(&out.p[out.n], 0, FTS5_DATA_ZERO_PADDING);
-    *p1 = out;
+    fts5BufferFree(&out);
  }
 }

@@ -6062,7 +6059,7 @@ static void fts5IndexIntegrityCheckSegment(
 ** error, or some other SQLite error code if another error (e.g. OOM)
 ** occurs.
 */
-int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum, int bUseCksum){
+int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum){
  int eDetail = p->pConfig->eDetail;
  u64 cksum2 = 0;                 /* Checksum based on contents of indexes */
  Fts5Buffer poslist = {0,0,0};   /* Buffer used to hold a poslist */
@@ -6123,7 +6120,6 @@ int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum, int bUseCksum){
    }else{
      poslist.n = 0;
      fts5SegiterPoslist(p, &pIter->aSeg[pIter->aFirst[1].iFirst], 0, &poslist);
-      fts5BufferAppendBlob(&p->rc, &poslist, 4, (const u8*)"\0\0\0\0");
      while( 0==sqlite3Fts5PoslistNext64(poslist.p, poslist.n, &iOff, &iPos) ){
        int iCol = FTS5_POS2COLUMN(iPos);
        int iTokOff = FTS5_POS2OFFSET(iPos);
@@ -6134,7 +6130,7 @@ int sqlite3Fts5IndexIntegrityCheck(Fts5Index *p, u64 cksum, int bUseCksum){
  fts5TestTerm(p, &term, 0, 0, cksum2, &cksum3);

  fts5MultiIterFree(pIter);
-  if( p->rc==SQLITE_OK && bUseCksum && cksum!=cksum2 ) p->rc = FTS5_CORRUPT;
+  if( p->rc==SQLITE_OK && cksum!=cksum2 ) p->rc = FTS5_CORRUPT;

  fts5StructureRelease(pStruct);
 #ifdef SQLITE_DEBUG
@@ -464,23 +464,6 @@ static void fts5SetUniqueFlag(sqlite3_index_info *pIdxInfo){
 #endif
 }

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

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

@@ -1252,14 +1229,19 @@ static int fts5FilterMethod(
      case 'r':
        pRank = apVal[i];
        break;
-      case 'M': {
+      case 'm': {
        const char *zText = (const char*)sqlite3_value_text(apVal[i]);
        if( zText==0 ) zText = "";
-        iCol = 0;
-        do{
-          iCol = iCol*10 + (idxStr[iIdxStr]-'0');
-          iIdxStr++;
-        }while( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' );
+
+        if( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' ){
+          iCol = 0;
+          do{
+            iCol = iCol*10 + (idxStr[iIdxStr]-'0');
+            iIdxStr++;
+          }while( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' );
+        }else{
+          iCol = pConfig->nCol;
+        }

        if( zText[0]=='*' ){
          /* The user has issued a query of the form "MATCH '*...'". This
@@ -1269,7 +1251,7 @@ static int fts5FilterMethod(
          goto filter_out;
        }else{
          char **pzErr = &pTab->p.base.zErrMsg;
-          rc = sqlite3Fts5ExprNew(pConfig, 0, iCol, zText, &pExpr, pzErr);
+          rc = sqlite3Fts5ExprNew(pConfig, iCol, zText, &pExpr, pzErr);
          if( rc==SQLITE_OK ){
            rc = sqlite3Fts5ExprAnd(&pCsr->pExpr, pExpr);
            pExpr = 0;
@@ -1279,25 +1261,6 @@ static int fts5FilterMethod(

        break;
      }
-      case 'L':
-      case 'G': {
-        int bGlob = (idxStr[iIdxStr-1]=='G');
-        const char *zText = (const char*)sqlite3_value_text(apVal[i]);
-        iCol = 0;
-        do{
-          iCol = iCol*10 + (idxStr[iIdxStr]-'0');
-          iIdxStr++;
-        }while( idxStr[iIdxStr]>='0' && idxStr[iIdxStr]<='9' );
-        if( zText ){
-          rc = sqlite3Fts5ExprPattern(pConfig, bGlob, iCol, zText, &pExpr);
-        }
-        if( rc==SQLITE_OK ){
-          rc = sqlite3Fts5ExprAnd(&pCsr->pExpr, pExpr);
-          pExpr = 0;
-        }
-        if( rc!=SQLITE_OK ) goto filter_out;
-        break;
-      }
      case '=':
        pRowidEq = apVal[i];
        break;
@@ -1545,8 +1508,7 @@ static int fts5SpecialInsert(
    int nMerge = sqlite3_value_int(pVal);
    rc = sqlite3Fts5StorageMerge(pTab->pStorage, nMerge);
  }else if( 0==sqlite3_stricmp("integrity-check", zCmd) ){
-    int iArg = sqlite3_value_int(pVal);
-    rc = sqlite3Fts5StorageIntegrity(pTab->pStorage, iArg);
+    rc = sqlite3Fts5StorageIntegrity(pTab->pStorage);
 #ifdef SQLITE_DEBUG
  }else if( 0==sqlite3_stricmp("prefix-index", zCmd) ){
    pConfig->bPrefixIndex = sqlite3_value_int(pVal);
@@ -2709,7 +2671,8 @@ int sqlite3Fts5GetTokenizer(
  Fts5Global *pGlobal, 
  const char **azArg,
  int nArg,
-  Fts5Config *pConfig,
+  Fts5Tokenizer **ppTok,
+  fts5_tokenizer **ppTokApi,
  char **pzErr
 ){
  Fts5TokenizerModule *pMod;
@@ -2721,22 +2684,16 @@ int sqlite3Fts5GetTokenizer(
    rc = SQLITE_ERROR;
    *pzErr = sqlite3_mprintf("no such tokenizer: %s", azArg[0]);
  }else{
-    rc = pMod->x.xCreate(
-        pMod->pUserData, &azArg[1], (nArg?nArg-1:0), &pConfig->pTok
-    );
-    pConfig->pTokApi = &pMod->x;
-    if( rc!=SQLITE_OK ){
-      if( pzErr ) *pzErr = sqlite3_mprintf("error in tokenizer constructor");
-    }else{
-      pConfig->ePattern = sqlite3Fts5TokenizerPattern(
-          pMod->x.xCreate, pConfig->pTok
-      );
+    rc = pMod->x.xCreate(pMod->pUserData, &azArg[1], (nArg?nArg-1:0), ppTok);
+    *ppTokApi = &pMod->x;
+    if( rc!=SQLITE_OK && pzErr ){
+      *pzErr = sqlite3_mprintf("error in tokenizer constructor");
    }
  }

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

  return rc;
@@ -429,16 +429,9 @@ static int fts5StorageDeleteFromIndex(
          zText, nText, (void*)&ctx, fts5StorageInsertCallback
      );
      p->aTotalSize[iCol-1] -= (i64)ctx.szCol;
-      if( p->aTotalSize[iCol-1]<0 ){
-        rc = FTS5_CORRUPT;
-      }
    }
  }
-  if( rc==SQLITE_OK && p->nTotalRow<1 ){
-    rc = FTS5_CORRUPT;
-  }else{
-    p->nTotalRow--;
-  }
+  p->nTotalRow--;

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

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

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

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

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

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

  sqlite3_free(aTotalSize);
@@ -1258,133 +1258,6 @@ static int fts5PorterTokenize(
  );
 }

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

 do_catchsql_test 65.1 {
  SELECT ( MATCH (t1,591)) FROM t1 WHERE t1 MATCH 'e*eŸ'
-} {1 {malformed database schema (t2) - invalid rootpage}}
+} {1 {database disk image is malformed}}

 #-------------------------------------------------------------------------
 #
@@ -10324,190 +10324,6 @@ do_catchsql_test 69.2 {
  SELECT * FROM t1 WHERE a MATCH 'fx*'
 } {1 {database disk image is malformed}}

-#-------------------------------------------------------------------------
-reset_db
-do_test 70.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 24576 pagesize 4096 filename sql022250.txt.db
-| page 1 offset 0
-|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-|     16: 10 00 01 01 00 40 20 20 00 00 00 00 00 00 00 00   .....@  ........
-|     96: 00 00 00 00 0d 00 00 00 06 0d e2 00 0f c4 0f 6a   ...............j
-|    112: 0e fc 0e 9d 0e 3d 0d e2 00 00 00 00 00 00 00 00   .....=..........
-|   3552: 00 00 59 06 06 17 21 21 01 7f 74 61 62 6c 65 74   ..Y...!!..tablet
-|   3568: 74 74 5f 63 6f 6e 66 69 67 74 74 74 5f 63 6f 6e   tt_configttt_con
-|   3584: 66 69 67 06 43 52 45 41 54 45 20 54 41 42 4c 45   fig.CREATE TABLE
-|   3600: 20 27 74 74 74 5f 63 6f 6e 66 69 67 27 28 6b 20    'ttt_config'(k 
-|   3616: 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 76 29 20   PRIMARY KEY, v) 
-|   3632: 57 49 54 48 4f 55 54 20 52 4f 57 49 44 5e 15 07   WITHOUT ROWID^..
-|   3648: 17 23 23 01 81 03 74 61 62 6c 65 74 74 74 5f 64   .##...tablettt_d
-|   3664: 6f 63 73 69 7a 65 74 74 74 5f 64 6f 63 73 69 7a   ocsizettt_docsiz
-|   3680: 65 05 43 52 45 41 54 45 20 54 41 42 4c 45 20 27   e.CREATE TABLE '
-|   3696: 74 74 74 5f 64 6f 63 73 69 7a 65 27 28 69 64 20   ttt_docsize'(id 
-|   3712: 49 4d 54 45 47 45 52 20 50 52 49 4d 41 52 59 20   IMTEGER PRIMARY 
-|   3728: 4b 45 59 2c 20 73 7a 20 42 4c 4f 20 29 5d 04 07   KEY, sz BLO )]..
-|   3744: 17 23 23 01 81 01 74 61 62 6c 65 74 74 74 5f 63   .##...tablettt_c
-|   3760: 6f 6e 74 65 6e 74 74 74 74 5f 63 6f 6e 74 65 6e   ontentttt_conten
-|   3776: 74 04 43 52 45 41 54 45 20 54 41 42 4c 45 20 27   t.CREATE TABLE '
-|   3792: 74 74 74 5f 63 6f 6e 74 65 6e 74 27 28 69 64 20   ttt_content'(id 
-|   3808: 49 4e 54 45 47 45 52 20 50 52 49 4d 41 52 59 20   INTEGER PRIMARY 
-|   3824: 4b 45 59 2c 20 63 30 2c 20 63 31 29 6c 03 07 17   KEY, c0, c1)l...
-|   3840: 1b 1b 01 81 2f 74 61 62 6c 65 74 74 74 5f 69 64   ..../tablettt_id
-|   3856: 78 74 74 74 5f 69 64 78 03 43 52 45 41 54 45 20   xttt_idx.CREATE 
-|   3872: 54 41 42 4c 45 20 27 74 74 74 5f 69 64 78 27 28   TABLE 'ttt_idx'(
-|   3888: 73 65 67 69 64 2c 20 74 65 72 6d 2c 20 70 67 6e   segid, term, pgn
-|   3904: 6f 2c 20 50 52 49 4d 41 52 59 20 4b 45 59 28 73   o, PRIMARY KEY(s
-|   3920: 65 67 69 64 2c 20 74 65 72 6d 29 29 20 57 49 54   egid, term)) WIT
-|   3936: 48 4f 55 54 20 52 4f 57 49 44 58 02 07 17 1d 1d   HOUT ROWIDX.....
-|   3952: 01 81 03 74 61 62 6c 65 74 74 74 5f 64 61 74 61   ...tablettt_data
-|   3968: 74 74 74 5f 64 61 74 61 02 43 52 45 41 54 45 20   ttt_data.CREATE 
-|   3984: 54 41 42 4c 45 20 27 74 74 74 5f 64 61 74 61 27   TABLE 'ttt_data'
-|   4000: 28 69 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d   (id INTEGER PRIM
-|   4016: 41 52 59 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42   ARY KEY, block B
-|   4032: 4c 4f 42 29 3a 01 06 17 13 13 08 5f 74 61 62 6c   LOB):......_tabl
-|   4048: 65 74 74 74 74 74 74 43 52 45 41 54 45 20 56 49   ettttttCREATE VI
-|   4064: 52 54 55 41 4c 20 54 41 42 4c 45 20 74 74 74 20   RTUAL TABLE ttt 
-|   4080: 55 53 49 4e 47 20 66 74 73 35 28 61 2c 20 62 29   USING fts5(a, b)
-| page 2 offset 4096
-|      0: 0d 0f 54 00 05 0e 81 00 0f e7 0e 81 0f af 0f 58   ..T............X
-|     16: 0e 98 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ................
-|   3712: 00 15 0a 03 00 30 00 00 00 00 01 03 03 00 03 01   .....0..........
-|   3728: 01 01 02 01 01 03 01 01 81 24 8c 80 80 80 80 01   .........$......
-|   3744: 04 00 82 4c 00 00 00 9b 02 30 65 03 1a 02 05 05   ...L.....0e.....
-|   3760: 07 05 01 01 04 03 03 08 03 03 01 2e 02 05 05 07   ................
-|   3776: 05 07 05 07 05 01 01 14 03 03 08 03 03 08 03 bf   ................
-|   3792: 07 f2 f3 02 01 65 03 1e 03 05 05 04 05 05 01 01   .....e..........
-|   3808: 03 06 04 04 06 04 03 01 36 03 05 05 04 05 05 04   ........6.......
-|   3824: 05 15 04 05 05 01 01 03 06 04 04 06 04 04 a1 04   ................
-|   3840: 04 06 04 03 03 01 65 03 14 04 05 07 05 05 01 01   ......e.........
-|   3856: 02 09 0a 01 20 04 05 07 05 07 05 07 05 05 01 01   .... ...........
-|   3872: 02 0f da 0a 0a 04 01 64 f3 02 0a 01 06 0a 0a 0a   .......d........
-|   3888: 05 01 65 03 06 01 01 0a 01 0a 01 01 0a 0a 0a 04   ..e.............
-|   3904: 2b 31 21 0b 0f ef 00 14 2a 00 00 00 00 01 02 02   +1!.....*.......
-|   3920: 00 02 01 01 01 02 01 01 50 88 80 80 80 80 01 04   ........P.......
-|   3936: 00 81 24 00 00 00 47 01 30 65 02 1a 02 05 05 07   ..$...G.0e......
-|   3952: 05 01 01 04 03 03 08 03 03 02 01 65 02 1d f3 05   ...........e....
-|   3968: 05 04 05 05 01 01 04 06 04 04 06 04 03 03 01 65   ...............e
-|   3984: 02 14 04 05 07 05 05 01 01 02 08 0a 04 01 65 02   ..............e.
-|   4000: 02 0a 05 01 65 02 06 01 01 0a 04 12 14 0f 06 31   ....e..........1
-|   4016: 84 80 80 80 80 01 03 00 68 00 00 00 2b 02 30 65   ........h...+.0e
-|   4032: 01 10 02 05 05 01 01 04 03 03 02 01 66 01 12 03   ............f...
-|   4048: 05 05 01 01 03 06 04 03 03 01 65 01 0e 04 05 05   ..........e.....
-|   4064: 01 01 02 08 04 0d 0e 06 01 03 00 12 04 4c 4c 00   .............LL.
-|   4080: 00 00 11 24 00 00 00 00 01 01 01 00 01 01 01 01   ...$............
-| page 3 offset 8192
-|      0: 0a 2f 00 00 00 00 00 00 00 00 00 00 00 00 00 00   ./..............
-| page 4 offset 12288
-|   3344: 00 00 00 00 00 00 00 00 00 00 81 52 04 06 10 81   ...........R....
-|   3360: 5d 81 55 65 20 65 65 20 65 65 65 20 65 20 65 65   ].Ue ee eee e ee
-|   3376: 20 65 65 65 20 65 20 65 65 20 65 65 65 65 20 65    eee e ee eeee e
-|   3392: 65 20 65 65 65 24 a5 20 65 65 20 65 65 65 20 65   e eee$. ee eee e
-|   3408: 24 05 65 20 65 65 65 65 20 65 65 20 65 65 65 20   $.e eeee ee eee 
-|   3424: 65 20 65 65 20 65 65 65 20 65 20 65 65 20 65 65   e ee eee e ee ee
-|   3440: 65 65 20 65 65 20 65 65 65 20 65 20 65 65 10 65   ee ee eee e ee.e
-|   3456: 65 65 20 65 20 65 65 20 65 65 65 65 65 65 20 65   ee e ee eeeeee e
-|   3472: 65 20 65 20 65 20 65 20 65 65 20 65 65 65 20 65   e e e e ee eee e
-|   3488: 1f 20 65 65 66 65 65 20 65 65 20 65 20 65 20 2d   . eefee ee e e -
-| page 5 offset 16384
-|   4064: 00 00 00 00 05 04 d0 00 10 21 21 05 03 03 00 10   .........!!.....
-|   4080: 11 11 05 02 03 00 10 11 10 05 01 03 00 10 09 09   ................
-| 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.
-| end sql022250.txt.db
-}]} {}
-
-do_catchsql_test 70.1 {
-  SELECT snippet(ttt, -1, '', '','','>')FROM ttt('e* NOT ee*e* NOT ee*');
-} {1 {database disk image is malformed}}
-
-do_catchsql_test 70.2 {
-  SELECT snippet(ttt, -1, '', '','',13)FROM ttt('e* NOT ee*e* NOT ee*')
-} {1 {database disk image is malformed}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_test 71.0 {
-  sqlite3 db {}
-  db deserialize [decode_hexdb {
-.open --hexdb
-| size 28672 pagesize 4096 filename sql025294.txt.db
-| page 1 offset 0
-|      0: 53 51 4c 69 74 65 20 66 6f 72 6d 61 74 20 33 00   SQLite format 3.
-|     16: 10 00 00 01 00 40 20 20 00 00 00 00 00 00 00 07   .....@  ........
-|     96: 00 00 00 00 0d 00 00 00 07 0d d2 00 0f c4 0f 6d   ...............m
-|    112: 0f 02 0e ab 0e 4e 0d f6 0d d2 00 00 00 00 00 00   .....N..........
-|   3536: 00 00 22 07 06 17 11 11 01 31 74 61 62 6c 65 74   .........1tablet
-|   3552: 32 74 32 07 43 52 45 41 54 45 20 54 41 42 4c 45   2t2.CREATE TABLE
-|   3568: 20 74 32 28 78 29 56 06 06 17 1f 1f 01 7d 74 61    t2(x)V.......ta
-|   3584: 62 6c 65 74 31 5f 63 6f 6e 66 69 67 74 31 5f 63   blet1_configt1_c
-|   3600: 6f 6e 66 69 67 06 43 52 45 41 54 45 20 54 41 42   onfig.CREATE TAB
-|   3616: 4c 45 20 27 74 31 5f 63 6f 6e 66 69 67 27 28 6b   LE 't1_config'(k
-|   3632: 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 76 29    PRIMARY KEY, v)
-|   3648: 20 57 49 54 48 4f 55 54 20 52 4f 57 49 44 5b 05    WITHOUT ROWID[.
-|   3664: 07 17 21 21 01 81 01 74 61 62 6c 65 74 31 5f 64   ..!!...tablet1_d
-|   3680: 6f 63 73 69 7a 65 74 31 5f 64 6f 63 73 69 7a 65   ocsizet1_docsize
-|   3696: 05 43 52 45 41 54 45 20 54 41 42 4c 45 20 27 74   .CREATE TABLE 't
-|   3712: 31 5f 64 6f 63 73 69 7a 65 27 28 69 64 20 49 4e   1_docsize'(id IN
-|   3728: 54 45 47 45 52 20 50 52 49 4d 41 52 59 20 4b 45   TEGER PRIMARY KE
-|   3744: 59 2c 20 73 7a 20 42 4c 4f 42 29 55 04 06 17 21   Y, sz BLOB)U...!
-|   3760: 21 01 77 74 61 62 6c 65 74 31 5f 63 6f 6e 74 65   !.wtablet1_conte
-|   3776: 6e 74 74 31 5f 63 6f 6e 74 65 6e 74 04 43 52 45   ntt1_content.CRE
-|   3792: 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 63 6f   ATE TABLE 't1_co
-|   3808: 6e 74 65 6e 74 27 28 69 64 20 49 4e 54 45 47 45   ntent'(id INTEGE
-|   3824: 52 20 50 52 49 4d 41 52 59 20 4b 45 59 2c 20 63   R PRIMARY KEY, c
-|   3840: 30 29 69 03 07 17 19 19 01 81 2d 74 61 62 6c 65   0)i.......-table
-|   3856: 74 31 5f 69 64 78 74 31 5f 69 64 78 03 43 52 45   t1_idxt1_idx.CRE
-|   3872: 41 54 45 20 54 41 42 4c 45 20 27 74 31 5f 69 64   ATE TABLE 't1_id
-|   3888: 78 27 28 73 65 67 69 64 2c 20 74 65 72 6d 2c 20   x'(segid, term, 
-|   3904: 70 67 6e 6f 2c 20 50 52 49 4d 41 52 59 20 4b 45   pgno, PRIMARY KE
-|   3920: 59 28 73 65 67 69 64 2c 20 74 65 72 6d 29 29 20   Y(segid, term)) 
-|   3936: 57 49 54 48 4f 55 54 20 52 4f 57 49 44 55 02 07   WITHOUT ROWIDU..
-|   3952: 17 1b 1b 01 81 01 74 61 62 6c 65 74 31 5f 64 61   ......tablet1_da
-|   3968: 74 61 74 31 5f 64 61 74 61 02 43 52 45 41 54 45   tat1_data.CREATE
-|   3984: 20 54 41 42 4c 45 20 27 74 31 5f 64 61 74 61 27    TABLE 't1_data'
-|   4000: 28 69 64 20 49 4e 54 45 47 45 52 20 50 52 49 4d   (id INTEGER PRIM
-|   4016: 41 52 58 20 4b 45 59 2c 20 62 6c 6f 63 6b 20 42   ARX KEY, block B
-|   4032: 4c 4f 42 29 3a 01 06 17 11 11 08 63 74 61 62 6c   LOB):......ctabl
-|   4048: 65 74 31 74 31 43 52 45 41 54 45 20 56 49 52 54   et1t1CREATE VIRT
-|   4064: 55 41 4c 20 54 41 42 4c 45 20 74 31 20 55 53 49   UAL TABLE t1 USI
-|   4080: 4e 47 20 66 74 73 35 28 63 6f 6e 74 65 6e 74 29   NG fts5(content)
-| page 2 offset 4096
-|      0: 0d 00 00 00 03 0f bd 00 0f e8 0f ef 0f bd 00 00   ................
-|   4016: 00 00 00 00 00 00 00 00 00 00 00 00 00 24 84 80   .............$..
-|   4032: 80 80 80 01 03 00 4e 00 00 00 1e 06 30 61 62 61   ......N.....0aba
-|   4048: 60 eb 01 02 02 04 01 66 74 02 02 02 04 04 6e 64   `......ft.....nd
-|   4064: 6f 6e 03 01 f2 04 1a 07 05 01 03 00 10 03 03 0f   on..............
-|   4080: 0a 03 00 24 00 00 00 00 01 01 4b 00 01 01 01 01   ...$......K.....
-| page 3 offset 8192
-|      0: 0a 00 00 00 00 00 00 00 00 00 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 03 0f e0 00 0f f6 0f ec 0f e0 00 00   ................
-|   4064: 0a 03 03 00 1b 61 62 61 6e 64 6f 6e 08 02 03 00   .....abandon....
-|   4080: 17 61 62 61 66 74 08 01 03 00 17 61 62 61 63 6b   .abaft.....aback
-| page 5 offset 16384
-|      0: 0d 00 00 00 03 0f ee 00 0f fa 0f f4 0f ee 00 00   ................
-|   4064: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 03   ................
-|   4080: 03 00 0e 01 04 02 03 00 0e 01 04 01 03 00 0e 01   ................
-| 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 d6 00 0f f4 0f e1 00 00 00 00   ................
-|   4048: 00 00 00 00 00 00 09 03 02 1b 72 65 62 75 69 6c   ..........rebuil
-|   4064: 64 11 02 02 2b 69 6e 74 65 67 72 69 74 79 2d 63   d...+integrity-c
-|   4080: 68 65 63 6b 0a 01 02 1d 6f 70 74 69 6d 69 7a 65   heck....optimize
-| end sql025294.txt.db
-}]} {}
-
-do_catchsql_test 71.2 {
-  INSERT INTO t1(t1) VALUES('integrity-check');
-} {1 {database disk image is malformed}}
-
-
 sqlite3_fts5_may_be_corrupt 0
 finish_test

@@ -50,47 +50,4 @@ do_test 1.2 {
  }
 } {}

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 2.0 {
-  CREATE TABLE test (
-      id INTEGER PRIMARY KEY,
-      name TEXT,
-      value TEXT
-  );
-  CREATE VIRTUAL TABLE test_idx USING fts5(
-      name, content=test, content_rowid=id
-  );
-}
-
-do_catchsql_test 2.1 {
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 1, 'quick');
-} {1 {database disk image is malformed}}
-
-do_catchsql_test 2.2 {
-  INSERT INTO test_idx(rowid, name) VALUES(123, 'one one one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-} {1 {database disk image is malformed}}
-
-do_execsql_test 2.3 {
-  DROP TABLE test_idx;
-  CREATE VIRTUAL TABLE test_idx USING fts5(
-      name, content=test, content_rowid=id
-  );
-
-  INSERT INTO test_idx(rowid, name) VALUES(123, 'one one one');
-  INSERT INTO test_idx(rowid, name) VALUES(124, 'two two two');
-  INSERT INTO test_idx(rowid, name) VALUES(125, 'two two two');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-  INSERT INTO test_idx (test_idx, rowid, name) VALUES('delete', 123, 'one');
-}
-
-do_catchsql_test 2.4 {
-  SELECT rowid FROM test_idx WHERE test_idx MATCH 'two' ORDER BY rank;
-} {1 {database disk image is malformed}}
-
-
-
 finish_test
@@ -14,7 +14,7 @@

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

 # If SQLITE_ENABLE_FTS3 is defined, omit this file.
 ifcapable !fts5 {
@@ -1,71 +0,0 @@
-# 2016 February 2
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#*************************************************************************
-#
-# This file is focused on OOM errors.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-source $testdir/malloc_common.tcl
-set testprefix fts5faultE
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-faultsim_save_and_close
-do_faultsim_test 1 -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql { CREATE VIRTUAL TABLE t1 USING fts5(x, y, tokenize=trigram) }
-} -test {
-  faultsim_test_result {0 {}} {1 {vtable constructor failed: t1}} 
-}
-
-reset_db
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y, tokenize=trigram);
-}
-
-faultsim_save_and_close
-do_faultsim_test 2 -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql { 
-    INSERT INTO t1 VALUES('abcdefghijklmnopqrstuvwxyz', NULL);
-    SELECT count(*) FROM t1 WHERE x LIKE '%mnop%' AND t1 MATCH 'jkl';
-  }
-} -test {
-  faultsim_test_result {0 1} {1 {vtable constructor failed: t1}}
-}
-
-reset_db
-do_execsql_test 3.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(x, y, tokenize=trigram, detail=none);
-  INSERT INTO t1 VALUES('abcdefghijklmnopqrstuvwxyz', NULL);
-}
-
-faultsim_save_and_close
-do_faultsim_test 3 -prep {
-  faultsim_restore_and_reopen
-} -body {
-  execsql { 
-    SELECT count(*) FROM t1 WHERE x LIKE '%mnopqrs%' AND t1 MATCH 'abc'
-  }
-} -test {
-  faultsim_test_result {0 1} {1 {vtable constructor failed: t1}}
-}
-
-
-
-finish_test
-
@@ -112,7 +112,7 @@ foreach_detail_mode $testprefix {
  # Add a small and very large token with the same hash value to an
  # empty table. At one point this would provoke an asan error.
  #
-  do_test 1.5 {
+  do_test 2.0 {
    set big [string repeat 12345 40]
    set hash [sqlite3_fts5_token_hash 1024 $big]
    while {1} {
@@ -128,41 +128,4 @@ foreach_detail_mode $testprefix {

 } ;# foreach_detail_mode

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

+breakpoint
 do_execsql_test 9.2 {
  INSERT INTO vt0 VALUES (SUBSTR(x'37', 0));
 --  INSERT INTO vt0 VALUES (x'37');
@@ -281,40 +282,4 @@ do_execsql_test 9.3 {
  INSERT INTO vt0(vt0) VALUES('integrity-check');
 }

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 10.0 {
-  CREATE TABLE t1(i INTEGER PRIMARY KEY, a, b);
-  CREATE VIRTUAL TABLE vt0 USING fts5(a, b, content=t1);
-  INSERT INTO vt0(rowid, a, b) VALUES(1, 'abc', 'def');
-}
-do_catchsql_test 10.1 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-} {0 {}}
-do_catchsql_test 10.2 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 0);
-} {0 {}}
-do_catchsql_test 10.3 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 1);
-} {1 {database disk image is malformed}}
-do_catchsql_test 10.3 {
-  INSERT INTO t1 VALUES(1, 'abc', 'def');
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 1);
-} {0 {}}
-
-do_execsql_test 10.4 {
-  CREATE VIRTUAL TABLE vt1 USING fts5(a, b, content=);
-  INSERT INTO vt1(rowid, a, b) VALUES(1, 'abc', 'def');
-}
-
-do_catchsql_test 10.5.1 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 0);
-} {0 {}}
-do_catchsql_test 10.5.2 {
-  INSERT INTO vt0(vt0, rank) VALUES('integrity-check', 1);
-} {0 {}}
-do_catchsql_test 10.5.3 {
-  INSERT INTO vt0(vt0) VALUES('integrity-check');
-} {0 {}}
-
 finish_test
@@ -31,7 +31,7 @@ do_eqp_test 1.1 {
 } {
  QUERY PLAN
  |--SCAN TABLE t1
-  `--SCAN TABLE f1 VIRTUAL TABLE INDEX 0:M1
+  `--SCAN TABLE f1 VIRTUAL TABLE INDEX 0:m
 }

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

@@ -111,40 +111,5 @@ do_catchsql_test 2.1 {
  SELECT * FROM t4;
 } {1 {SQL logic error}}

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

 finish_test
@@ -1,201 +0,0 @@
-# 2020 September 30
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#*************************************************************************
-#
-# Tests for the fts5 "trigram" tokenizer.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-ifcapable !fts5 { finish_test ; return }
-set ::testprefix fts5trigram
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize=trigram);
-  INSERT INTO t1 VALUES('abcdefghijklm');
-  INSERT INTO t1 VALUES('กรุงเทพมหานคร');
-}
-
-foreach {tn s res} {
-  1 abc           "(abc)defghijklm"
-  2 defgh         "abc(defgh)ijklm"
-  3 abcdefghijklm "(abcdefghijklm)"
-  4 กรุ            "(กรุ)งเทพมหานคร"
-  5 งเทพมห        "กรุ(งเทพมห)านคร"
-  6 กรุงเทพมหานคร  "(กรุงเทพมหานคร)"
-  7 Abc           "(abc)defghijklm"
-  8 deFgh         "abc(defgh)ijklm"
-  9 aBcdefGhijKlm "(abcdefghijklm)"
-} {
-  do_execsql_test 1.1.$tn {
-    SELECT highlight(t1, 0, '(', ')') FROM t1($s)
-  } $res
-}
-
-do_execsql_test 1.2.0 {
-  SELECT fts5_expr('ABCD', 'tokenize=trigram')
-} {{"abc" + "bcd"}}
-
-do_execsql_test 1.2.1 {
-  SELECT * FROM t1 WHERE y LIKE ? ESCAPE 'a'
-}
-
-foreach {tn like res} {
-  1 {%cDef%}   1
-  2 {cDef%}    {}
-  3 {%f%}      1
-  4 {%f_h%}    1
-  5 {%f_g%}    {}
-  6 {abc%klm}  1
-  7 {ABCDEFG%} 1
-  8 {%รุงเ%}    2
-} {
-  do_execsql_test 1.3.$tn {
-    SELECT rowid FROM t1 WHERE y LIKE $like
-  } $res
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 2.0 {
-  CREATE VIRTUAL TABLE t1 USING fts5(y, tokenize="trigram case_sensitive 1");
-  INSERT INTO t1 VALUES('abcdefghijklm');
-  INSERT INTO t1 VALUES('กรุงเทพมหานคร');
-}
-
-foreach {tn s res} {
-  1 abc           "(abc)defghijklm"
-  2 defgh         "abc(defgh)ijklm"
-  3 abcdefghijklm "(abcdefghijklm)"
-  4 กรุ            "(กรุ)งเทพมหานคร"
-  5 งเทพมห        "กรุ(งเทพมห)านคร"
-  6 กรุงเทพมหานคร  "(กรุงเทพมหานคร)"
-  7 Abc           ""
-  8 deFgh         ""
-  9 aBcdefGhijKlm ""
-} {
-  do_execsql_test 2.1.$tn {
-    SELECT highlight(t1, 0, '(', ')') FROM t1($s)
-  } $res
-}
-foreach {tn like res} {
-  1 {%cDef%}   1
-  2 {cDef%}    {}
-  3 {%f%}      1
-  4 {%f_h%}    1
-  5 {%f_g%}    {}
-  6 {abc%klm}  1
-  7 {ABCDEFG%} 1
-  8 {%รุงเ%}    2
-} {
-  do_execsql_test 2.2.$tn {
-    SELECT rowid FROM t1 WHERE y LIKE $like
-  } $res
-}
-foreach {tn like res} {
-  1 {*cdef*}     1
-  2 {cdef*}      {}
-  3 {*f*}        1
-  4 {*f?h*}      1
-  5 {*f?g*}      {}
-  6 {abc*klm}    1
-  7 {abcdefg*}   1
-  8 {*รุงเ*}      2
-  9 {abc[d]efg*} 1
- 10 {abc[]d]efg*} 1
- 11 {abc[^]d]efg*} {}
- 12 {abc[^]XYZ]efg*} 1
-} {
-  do_execsql_test 2.3.$tn {
-    SELECT rowid FROM t1 WHERE y GLOB $like
-  } $res
-}
-
-do_execsql_test 2.3.null.1 {
-  SELECT rowid FROM t1 WHERE y LIKE NULL
-}
-
-#-------------------------------------------------------------------------
-reset_db
-do_catchsql_test 3.1 {
-  CREATE VIRTUAL TABLE ttt USING fts5(c, tokenize="trigram case_sensitive 2");
-} {1 {error in tokenizer constructor}}
-do_catchsql_test 3.2 {
-  CREATE VIRTUAL TABLE ttt USING fts5(c, tokenize="trigram case_sensitive 11");
-} {1 {error in tokenizer constructor}}
-do_catchsql_test 3.3 {
-  CREATE VIRTUAL TABLE ttt USING fts5(c, "tokenize=trigram case_sensitive 1");
-} {0 {}}
-
-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 4.0 {
-  CREATE VIRTUAL TABLE t0 USING fts5(b, tokenize = "trigram");
-}
-do_execsql_test 4.1 {
-  INSERT INTO t0 VALUES (x'000b01');
-}
-do_execsql_test 4.2 {
-  INSERT INTO t0(t0) VALUES('integrity-check');
-}
-
-#-------------------------------------------------------------------------
-reset_db
-foreach_detail_mode $::testprefix {
-  foreach {ci} {0 1} {
-    reset_db
-    do_execsql_test 5.cs=$ci.0.1 "
-      CREATE VIRTUAL TABLE t1 USING fts5(
-          y, tokenize=\"trigram case_sensitive $ci\", detail=%DETAIL%
-      );
-    "
-    do_execsql_test 5.cs=$ci.0.2 {
-      INSERT INTO t1 VALUES('abcdefghijklm');
-      INSERT INTO t1 VALUES('กรุงเทพมหานคร');
-    }
-
-    foreach {tn like res} {
-      1 {%cDef%}   1
-      2 {cDef%}    {}
-      3 {%f%}      1
-      4 {%f_h%}    1
-      5 {%f_g%}    {}
-      6 {abc%klm}  1
-      7 {ABCDEFG%} 1
-      8 {%รุงเ%}    2
-    } {
-      do_execsql_test 5.cs=$ci.1.$tn {
-        SELECT rowid FROM t1 WHERE y LIKE $like
-      } $res
-    }
-  }
-}
-
-do_execsql_test 6.0 {
-  CREATE VIRTUAL TABLE ci0 USING fts5(x, tokenize="trigram");
-  CREATE VIRTUAL TABLE ci1 USING fts5(x, tokenize="trigram case_sensitive 1");
-}
-
-# LIKE and GLOB both work with case-insensitive tokenizers. Only GLOB works
-# with case-sensitive.
-do_eqp_test 6.1 {
-  SELECT * FROM ci0 WHERE x LIKE ?
-} {VIRTUAL TABLE INDEX 0:L0}
-do_eqp_test 6.2 {
-  SELECT * FROM ci0 WHERE x GLOB ?
-} {VIRTUAL TABLE INDEX 0:G0}
-do_eqp_test 6.3 {
-  SELECT * FROM ci1 WHERE x LIKE ?
-} {{SCAN TABLE ci1 VIRTUAL TABLE INDEX 0:}}
-do_eqp_test 6.4 {
-  SELECT * FROM ci1 WHERE x GLOB ?
-} {VIRTUAL TABLE INDEX 0:G0}
-
-finish_test
-
@@ -12,7 +12,6 @@ proc process_cmdline {} {
  cmdline::process ::A $::argv {
    {fts5                 "use fts5 (this is the default)"}
    {fts4                 "use fts4"}
-    {trigram              "Use tokenize=trigram"}
    {colsize   "10 10 10" "list of column sizes"}
    {tblname   "t1"       "table name to create"}
    {detail    "full"     "Fts5 detail mode to use"}
@@ -176,7 +175,6 @@ proc create_table {} {
  set sql    "CREATE VIRTUAL TABLE IF NOT EXISTS $A(tblname) USING $A(fts) ("
  append sql [join $cols ,]
  if {$A(fts)=="fts5"} { append sql ",detail=$A(detail)" }
-  if {$A(trigram)} { append sql ",tokenize=trigram" }
  append sql ", prefix='$A(prefix)');"

  db eval $sql
@@ -57,31 +57,20 @@ SQLITE_EXTENSION_INIT1
 #include <assert.h>
 #include <string.h>

-/* Allowed values for the mFlags parameter to sqlite3_carray_bind().
-** Must exactly match the definitions in carray.h.
-*/
-#define CARRAY_INT32     0      /* Data is 32-bit signed integers */
-#define CARRAY_INT64     1      /* Data is 64-bit signed integers */
-#define CARRAY_DOUBLE    2      /* Data is doubles */
-#define CARRAY_TEXT      3      /* Data is char* */
-
 #ifndef SQLITE_OMIT_VIRTUALTABLE

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

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


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

-/*
-** Destructor for the carray_bind object
-*/
-static void carrayBindDel(void *pPtr){
-  carray_bind *p = (carray_bind*)pPtr;
-  if( p->xDel!=SQLITE_STATIC ){
-     p->xDel(p->aData);
-  }
-  sqlite3_free(p);
-}
-
-/*
-** Invoke this interface in order to bind to the single-argument
-** version of CARRAY().
-*/
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int sqlite3_carray_bind(
-  sqlite3_stmt *pStmt,
-  int idx,
-  void *aData,
-  int nData,
-  int mFlags,
-  void (*xDestroy)(void*)
-){
-  carray_bind *pNew;
-  int i;
-  pNew = sqlite3_malloc64(sizeof(*pNew));
-  if( pNew==0 ){
-    if( xDestroy!=SQLITE_STATIC && xDestroy!=SQLITE_TRANSIENT ){
-      xDestroy(aData);
-    }
-    return SQLITE_NOMEM;
-  }
-  pNew->nData = nData;
-  pNew->mFlags = mFlags;
-  if( xDestroy==SQLITE_TRANSIENT ){
-    sqlite3_int64 sz = nData;
-    switch( mFlags & 0x03 ){
-      case CARRAY_INT32:   sz *= 4;              break;
-      case CARRAY_INT64:   sz *= 8;              break;
-      case CARRAY_DOUBLE:  sz *= 8;              break;
-      case CARRAY_TEXT:    sz *= sizeof(char*);  break;
-    }
-    if( (mFlags & 0x03)==CARRAY_TEXT ){
-      for(i=0; i<nData; i++){
-        const char *z = ((char**)aData)[i];
-        if( z ) sz += strlen(z) + 1;
-      }
-    } 
-    pNew->aData = sqlite3_malloc64( sz );
-    if( pNew->aData==0 ){
-      sqlite3_free(pNew);
-      return SQLITE_NOMEM;
-    }
-    if( (mFlags & 0x03)==CARRAY_TEXT ){
-      char **az = (char**)pNew->aData;
-      char *z = (char*)&az[nData];
-      for(i=0; i<nData; i++){
-        const char *zData = ((char**)aData)[i];
-        sqlite3_int64 n;
-        if( zData==0 ){
-          az[i] = 0;
-          continue;
-        }
-        az[i] = z;
-        n = strlen(zData);
-        memcpy(z, zData, n+1);
-        z += n+1;
-      }
-    }else{
-      memcpy(pNew->aData, aData, sz*nData);
-    }
-    pNew->xDel = sqlite3_free;
-  }else{
-    pNew->aData = aData;
-    pNew->xDel = xDestroy;
-  }
-  return sqlite3_bind_pointer(pStmt, idx, pNew, "carray-bind", carrayBindDel);
-}
-
-
 /*
 ** For testing purpose in the TCL test harness, we need a method for
 ** setting the pointer value.  The inttoptr(X) SQL function accomplishes
@@ -1,23 +0,0 @@
-/*
-** Interface definitions for the CARRAY table-valued function
-** extension.
-*/
-
-/* Use this interface to bind an array to the single-argument version
-** of CARRAY().
-*/
-int sqlite3_carray_bind(
-  sqlite3_stmt *pStmt,        /* Statement to be bound */
-  int i,                      /* Parameter index */
-  void *aData,                /* Pointer to array data */
-  int nData,                  /* Number of data elements */
-  int mFlags,                 /* CARRAY flags */
-  void (*xDel)(void*)         /* Destructgor for aData*/
-);
-
-/* Allowed values for the mFlags parameter to sqlite3_carray_bind().
-*/
-#define CARRAY_INT32     0    /* Data is 32-bit signed integers */
-#define CARRAY_INT64     1    /* Data is 64-bit signed integers */
-#define CARRAY_DOUBLE    2    /* Data is doubles */
-#define CARRAY_TEXT      3    /* Data is char* */
@@ -54,11 +54,11 @@
 ** statically linked against the application, initialize it using
 ** a single API call as follows:
 **
-**     sqlite3_register_cksumvfs();
+**     sqlite3_cksumvfs_init();
 **
 ** Cksumvfs is a VFS Shim. When loaded, "cksmvfs" becomes the new
 ** default VFS and it uses the prior default VFS as the next VFS
-** down in the stack.  This is normally what you want.  However, in
+** down in the stack.  This is normally what you want.  However, it
 ** complex situations where multiple VFS shims are being loaded,
 ** it might be important to ensure that cksumvfs is loaded in the
 ** correct order so that it sequences itself into the default VFS
@@ -79,7 +79,7 @@
 ** the reserve-bytes value to 8 by runing:
 **
 **    int n = 8;
-**    sqlite3_file_control(db, 0, SQLITE_FCNTL_RESERVE_BYTES, &n);
+**    sqlite3_file_control(db, 0, SQLITE_FCNTL_RESERVED_BYTES, &n);
 **
 ** If you do this immediately after creating a new database file,
 ** before anything else has been written into the file, then that
@@ -157,9 +157,6 @@
 ** value at offset 20 the SQLite database header is exactly 8.  If
 ** the reserved-space value is not 8, this module is a no-op.
 */
-#if defined(SQLITE_AMALGAMATION) && !defined(SQLITE_CKSUMVFS_STATIC)
-# define SQLITE_CKSUMVFS_STATIC
-#endif
 #ifdef SQLITE_CKSUMVFS_STATIC
 # include "sqlite3.h"
 #else
@@ -179,7 +176,7 @@ typedef struct CksmFile CksmFile;
 /*
 ** Useful datatype abbreviations
 */
-#if !defined(SQLITE_AMALGAMATION)
+#if !defined(SQLITE_CORE)
  typedef unsigned char u8;
  typedef unsigned int u32;
 #endif
@@ -398,9 +395,7 @@ static int cksmRead(
  pFile = ORIGFILE(pFile);
  rc = pFile->pMethods->xRead(pFile, zBuf, iAmt, iOfst);
  if( rc==SQLITE_OK ){
-    if( iOfst==0 && iAmt>=100 && (
-          memcmp(zBuf,"SQLite format 3",16)==0 || memcmp(zBuf,"ZV-",3)==0 
-    )){
+    if( iOfst==0 && iAmt>=100 && memcmp(zBuf,"SQLite format 3",16)==0 ){
      u8 *d = (u8*)zBuf;
      char hasCorrectReserveSize = (d[20]==8);
      cksmSetFlags(p, hasCorrectReserveSize);
@@ -439,9 +434,7 @@ static int cksmWrite(
 ){
  CksmFile *p = (CksmFile *)pFile;
  pFile = ORIGFILE(pFile);
-  if( iOfst==0 && iAmt>=100 && (
-        memcmp(zBuf,"SQLite format 3",16)==0 || memcmp(zBuf,"ZV-",3)==0 
-  )){
+  if( iOfst==0 && iAmt>=100 && memcmp(zBuf,"SQLite format 3",16)==0 ){
    u8 *d = (u8*)zBuf;
    char hasCorrectReserveSize = (d[20]==8);
    cksmSetFlags(p, hasCorrectReserveSize);
@@ -611,20 +604,13 @@ static int cksmFetch(
    return SQLITE_OK;
  }
  pFile = ORIGFILE(pFile);
-  if( pFile->pMethods->iVersion>2 && pFile->pMethods->xFetch ){
-    return pFile->pMethods->xFetch(pFile, iOfst, iAmt, pp);
-  }
-  *pp = 0;
-  return SQLITE_OK;
+  return pFile->pMethods->xFetch(pFile, iOfst, iAmt, pp);
 }

 /* Release a memory-mapped page */
 static int cksmUnfetch(sqlite3_file *pFile, sqlite3_int64 iOfst, void *pPage){
  pFile = ORIGFILE(pFile);
-  if( pFile->pMethods->iVersion>2 && pFile->pMethods->xUnfetch ){
-    return pFile->pMethods->xUnfetch(pFile, iOfst, pPage);
-  }
-  return SQLITE_OK;
+  return pFile->pMethods->xUnfetch(pFile, iOfst, pPage);
 }

 /*
@@ -777,13 +763,6 @@ int sqlite3_register_cksumvfs(const char *NotUsed){
  (void)NotUsed;
  return cksmRegisterVfs();
 }
-int sqlite3_unregister_cksumvfs(void){
-  if( sqlite3_vfs_find("cksmvfs") ){
-    sqlite3_vfs_unregister(&cksm_vfs);
-    sqlite3_cancel_auto_extension((void(*)(void))cksmRegisterFunc);
-  }
-  return SQLITE_OK;
-}
 #endif /* defined(SQLITE_CKSUMVFS_STATIC */

 #if !defined(SQLITE_CKSUMVFS_STATIC)
@@ -776,7 +776,7 @@ static int csvtabColumn(
  CsvCursor *pCur = (CsvCursor*)cur;
  CsvTable *pTab = (CsvTable*)cur->pVtab;
  if( i>=0 && i<pTab->nCol && pCur->azVal[i]!=0 ){
-    sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_TRANSIENT);
+    sqlite3_result_text(ctx, pCur->azVal[i], -1, SQLITE_STATIC);
  }
  return SQLITE_OK;
 }
@@ -106,10 +106,10 @@ struct series_cursor {
 */
 static int seriesConnect(
  sqlite3 *db,
-  void *pUnused,
-  int argcUnused, const char *const*argvUnused,
+  void *pAux,
+  int argc, const char *const*argv,
  sqlite3_vtab **ppVtab,
-  char **pzErrUnused
+  char **pzErr
 ){
  sqlite3_vtab *pNew;
  int rc;
@@ -120,10 +120,6 @@ static int seriesConnect(
 #define SERIES_COLUMN_STOP  2
 #define SERIES_COLUMN_STEP  3

-  (void)pUnused;
-  (void)argcUnused;
-  (void)argvUnused;
-  (void)pzErrUnused;
  rc = sqlite3_declare_vtab(db,
     "CREATE TABLE x(value,start hidden,stop hidden,step hidden)");
  if( rc==SQLITE_OK ){
@@ -146,9 +142,8 @@ static int seriesDisconnect(sqlite3_vtab *pVtab){
 /*
 ** Constructor for a new series_cursor object.
 */
-static int seriesOpen(sqlite3_vtab *pUnused, sqlite3_vtab_cursor **ppCursor){
+static int seriesOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
  series_cursor *pCur;
-  (void)pUnused;
  pCur = sqlite3_malloc( sizeof(*pCur) );
  if( pCur==0 ) return SQLITE_NOMEM;
  memset(pCur, 0, sizeof(*pCur));
@@ -255,12 +250,11 @@ static int seriesEof(sqlite3_vtab_cursor *cur){
 */
 static int seriesFilter(
  sqlite3_vtab_cursor *pVtabCursor, 
-  int idxNum, const char *idxStrUnused,
+  int idxNum, const char *idxStr,
  int argc, sqlite3_value **argv
 ){
  series_cursor *pCur = (series_cursor *)pVtabCursor;
  int i = 0;
-  (void)idxStrUnused;
  if( idxNum & 1 ){
    pCur->mnValue = sqlite3_value_int64(argv[i++]);
  }else{
@@ -317,7 +311,7 @@ static int seriesFilter(
 **  (8)  output in descending order
 */
 static int seriesBestIndex(
-  sqlite3_vtab *tabUnused,
+  sqlite3_vtab *tab,
  sqlite3_index_info *pIdxInfo
 ){
  int i, j;              /* Loop over constraints */
@@ -331,7 +325,6 @@ static int seriesBestIndex(
  ** are the last three columns in the virtual table. */
  assert( SERIES_COLUMN_STOP == SERIES_COLUMN_START+1 );
  assert( SERIES_COLUMN_STEP == SERIES_COLUMN_START+2 );
-  (void)tabUnused;
  aIdx[0] = aIdx[1] = aIdx[2] = -1;
  pConstraint = pIdxInfo->aConstraint;
  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
@@ -405,10 +398,6 @@ static sqlite3_module seriesModule = {
  0,                         /* xRollback */
  0,                         /* xFindMethod */
  0,                         /* xRename */
-  0,                         /* xSavepoint */
-  0,                         /* xRelease */
-  0,                         /* xRollbackTo */
-  0                          /* xShadowName */
 };

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

    /* Compute a hash over the result of the query */
    while( SQLITE_ROW==sqlite3_step(pStmt) ){
@@ -0,0 +1,352 @@
+/*
+** 2020-09-02
+**
+** The author disclaims copyright to this source code.  In place of
+** a legal notice, here is a blessing:
+**
+**    May you do good and not evil.
+**    May you find forgiveness for yourself and forgive others.
+**    May you share freely, never taking more than you give.
+**
+*************************************************************************
+**
+** This file contains the implementation of the "shmlock" eponymous 
+** virtual table module. The schema of which is effectively:
+**
+**   CREATE TABLE shmlock(
+**       connid TEXT, 
+**       lock TEXT, 
+**       locktype TEXT, 
+**       mxFrame INTEGER,
+**       dbname HIDDEN
+**   );
+**
+** This virtual table may be used to query for the locks held on the main or
+** any attached database that is in wal mode. If the database is not in
+** wal mode, zero rows are returned. Otherwise, one row is returned for
+** each lock held on the database by a connection in either the current 
+** process, as well as - to the extent possible - one row for each lock held 
+** by another process. On unix, "to the extent possible" means that if
+** two or more external processes hold a SHARED wal-mode lock on the same
+** locking-slot, only one of them is reported on.
+**
+** To query for locks on the main database, either of:
+**
+**     SELECT * FROM shmlock;
+**     SELECT * FROM shmlock('main');
+**
+** To query for locks on the attached database named 'aux':
+**
+**     SELECT * FROM shmlock('aux');
+**
+** The non-HIDDEN columns of each row may be interpreted as follows:
+**
+** connid:
+**   String identifying the connection. For a local connection lock, this is
+**   either the string representation of an internal pointer value, or else a
+**   string configured using the file-control SQLITE_FCNTL_SHMLOCK_NAME.
+**   For a lock from an external process, the id takes the form "pid.123",
+**   where 123 is the process-id of the lock holder.
+**
+** lock:
+**   A text value representing the particular wal mode lock held. One of
+**   "WRITE", "CHECKPOINT", "RECOVER" or "READ(n)", where n is between 0 and
+**   4, inclusive.
+**
+** locktype:
+**   'R' for a shared (reader) lock, or 'W' for an exclusive (writer) lock.
+**
+** mxframe:
+**   When the lock is a shared lock held on a READ(n) slot, the integer value
+**   of the corresponding read-mark slot in shared-memory.
+**
+** This module currently only works with the "unix" VFS.
+**
+*/
+#if !defined(SQLITEINT_H)
+#include "sqlite3ext.h"
+#endif
+SQLITE_EXTENSION_INIT1
+#include <string.h>
+#include <assert.h>
+
+/* shmlock_vtab is a subclass of sqlite3_vtab which is
+** underlying representation of the virtual table
+*/
+typedef struct shmlock_vtab shmlock_vtab;
+struct shmlock_vtab {
+  sqlite3_vtab base;  /* Base class - must be first */
+  sqlite3 *db;
+};
+
+/* shmlock_cursor is a subclass of sqlite3_vtab_cursor which will
+** serve as the underlying representation of a cursor that scans
+** over rows of the result
+*/
+typedef struct shmlock_cursor shmlock_cursor;
+struct shmlock_cursor {
+  sqlite3_vtab_cursor base;  /* Base class - must be first */
+  char *zFcntl;
+  int iFcntl;
+  char *aSpace;              /* Space to use for dequoted strings */
+
+  const char *azCol[4];
+  sqlite3_int64 iRowid;
+};
+
+/*
+** Create a new shmlock_vtab object.
+*/
+static int shmlockConnect(
+  sqlite3 *db,
+  void *pAux,
+  int argc, const char *const*argv,
+  sqlite3_vtab **ppVtab,
+  char **pzErr
+){
+  shmlock_vtab *pNew;
+  int rc;
+
+  rc = sqlite3_declare_vtab(db,
+    "CREATE TABLE shmlock("
+        "connid TEXT, "
+        "lock TEXT, "
+        "locktype TEXT, "
+        "mxFrame INTEGER,"
+        "dbname HIDDEN"
+    ");"
+  );
+  if( rc==SQLITE_OK ){
+    pNew = sqlite3_malloc( sizeof(*pNew) );
+    *ppVtab = (sqlite3_vtab*)pNew;
+    if( pNew==0 ) return SQLITE_NOMEM;
+    memset(pNew, 0, sizeof(*pNew));
+    pNew->db = db;
+  }
+  return rc;
+}
+
+/*
+** This method is the destructor for shmlock_vtab objects.
+*/
+static int shmlockDisconnect(sqlite3_vtab *pVtab){
+  shmlock_vtab *p = (shmlock_vtab*)pVtab;
+  sqlite3_free(p);
+  return SQLITE_OK;
+}
+
+/*
+** Constructor for a new shmlock_cursor object.
+*/
+static int shmlockOpen(sqlite3_vtab *p, sqlite3_vtab_cursor **ppCursor){
+  shmlock_cursor *pCur;
+  pCur = sqlite3_malloc( sizeof(*pCur) );
+  if( pCur==0 ) return SQLITE_NOMEM;
+  memset(pCur, 0, sizeof(*pCur));
+  *ppCursor = &pCur->base;
+  return SQLITE_OK;
+}
+
+/*
+** Destructor for a shmlock_cursor.
+*/
+static int shmlockClose(sqlite3_vtab_cursor *cur){
+  shmlock_cursor *pCur = (shmlock_cursor*)cur;
+  sqlite3_free(pCur->zFcntl);
+  sqlite3_free(pCur->aSpace);
+  sqlite3_free(pCur);
+  return SQLITE_OK;
+}
+
+
+/*
+** Advance a shmlock_cursor to its next row of output.
+*/
+static int shmlockNext(sqlite3_vtab_cursor *cur){
+  shmlock_cursor *pCur = (shmlock_cursor*)cur;
+  int ii = pCur->iFcntl;
+  const char *z = pCur->zFcntl;
+  char *a = pCur->aSpace;
+  int iCol;
+
+  memset(pCur->azCol, 0, sizeof(char*)*4);
+  if( z[ii]=='\0' ) return SQLITE_OK;;
+  for(iCol=0; iCol<4; iCol++){
+    if( z[ii]!='\'' ) return SQLITE_ERROR;
+
+    pCur->azCol[iCol] = a;
+    ii++;
+    while( z[ii] ){
+      if( z[ii]=='\'' ){
+        ii++;
+        if( z[ii]!='\'' ) break;
+      }
+      *a++ = z[ii++];
+    }
+    *a++ = '\0';
+    while( z[ii]==' ' ) ii++;
+    if( z[ii]=='\0' ) break;
+    if( z[ii]=='\n' ){
+      ii++;
+      break;
+    }
+  }
+
+  pCur->iFcntl = ii;
+  pCur->iRowid++;
+  return SQLITE_OK;
+}
+
+/*
+** Return values of columns for the row at which the shmlock_cursor
+** is currently pointing.
+*/
+static int shmlockColumn(
+  sqlite3_vtab_cursor *cur,   /* The cursor */
+  sqlite3_context *ctx,       /* First argument to sqlite3_result_...() */
+  int i                       /* Which column to return */
+){
+  shmlock_cursor *pCur = (shmlock_cursor*)cur;
+  if( i<=3 && pCur->azCol[i] ){
+    sqlite3_result_text(ctx, pCur->azCol[i], -1, SQLITE_TRANSIENT);
+  }
+  return SQLITE_OK;
+}
+
+/*
+** Return the rowid for the current row.  In this implementation, the
+** rowid is the same as the output value.
+*/
+static int shmlockRowid(sqlite3_vtab_cursor *cur, sqlite_int64 *pRowid){
+  shmlock_cursor *pCur = (shmlock_cursor*)cur;
+  *pRowid = pCur->iRowid;
+  return SQLITE_OK;
+}
+
+/*
+** Return TRUE if the cursor has been moved off of the last
+** row of output.
+*/
+static int shmlockEof(sqlite3_vtab_cursor *cur){
+  shmlock_cursor *pCur = (shmlock_cursor*)cur;
+  return pCur->azCol[1]==0;
+}
+
+/*
+** This method is called to "rewind" the shmlock_cursor object back
+** to the first row of output.  This method is always called at least
+** once prior to any call to shmlockColumn() or shmlockRowid() or 
+** shmlockEof().
+*/
+static int shmlockFilter(
+  sqlite3_vtab_cursor *pVtabCursor, 
+  int idxNum, const char *idxStr,
+  int argc, sqlite3_value **argv
+){
+  int rc;
+  shmlock_cursor *pCur = (shmlock_cursor *)pVtabCursor;
+  shmlock_vtab *pTab = (shmlock_vtab*)pVtabCursor->pVtab;
+  const char *zDb = "main";
+
+  if( idxNum==1 ){
+    assert( argc==1 );
+    zDb = (const char*)sqlite3_value_text(argv[0]);
+  }
+  sqlite3_free(pCur->aSpace);
+  pCur->zFcntl = 0;
+  pCur->aSpace = 0;
+  rc = sqlite3_file_control(
+      pTab->db, zDb, SQLITE_FCNTL_SHMLOCK_GET, (void*)&pCur->zFcntl
+  );
+  pCur->iRowid = 1;
+  pCur->iFcntl = 0;
+  if( rc==SQLITE_NOTFOUND ){
+    rc = SQLITE_OK;
+  }
+  if( pCur->zFcntl ){
+    int n = strlen(pCur->zFcntl);
+    pCur->aSpace = sqlite3_malloc(n);
+    if( pCur->aSpace==0 ){
+      rc = SQLITE_NOMEM;
+    }else{
+      rc = shmlockNext(pVtabCursor);
+    }
+  }
+  return rc;
+}
+
+/*
+** SQLite will invoke this method one or more times while planning a query
+** that uses the virtual table.  This routine needs to create
+** a query plan for each invocation and compute an estimated cost for that
+** plan.
+*/
+static int shmlockBestIndex(
+  sqlite3_vtab *tab,
+  sqlite3_index_info *pIdxInfo
+){
+  int ii;
+
+  /* Search for a dbname=? constraint. If one is found, set idxNum=1 and
+  ** pass the ? as the only argument to xFilter. Otherwise, leave idxNum=0
+  ** and pass no arguments to xFilter.  */
+  for(ii=0; ii<pIdxInfo->nConstraint; ii++){
+    struct sqlite3_index_constraint *p = &pIdxInfo->aConstraint[ii];
+    if( p->usable && p->op==SQLITE_INDEX_CONSTRAINT_EQ && p->iColumn==4 ){
+      pIdxInfo->aConstraintUsage[ii].argvIndex = 1;
+      pIdxInfo->aConstraintUsage[ii].omit = 1;
+      pIdxInfo->idxNum = 1;
+      break;
+    }
+  }
+
+  pIdxInfo->estimatedCost = (double)10;
+  pIdxInfo->estimatedRows = 10;
+  return SQLITE_OK;
+}
+
+/*
+** This following structure defines all the methods for the 
+** virtual table.
+*/
+static sqlite3_module shmlockModule = {
+  /* iVersion    */ 0,
+  /* xCreate     */ 0,
+  /* xConnect    */ shmlockConnect,
+  /* xBestIndex  */ shmlockBestIndex,
+  /* xDisconnect */ shmlockDisconnect,
+  /* xDestroy    */ 0,
+  /* xOpen       */ shmlockOpen,
+  /* xClose      */ shmlockClose,
+  /* xFilter     */ shmlockFilter,
+  /* xNext       */ shmlockNext,
+  /* xEof        */ shmlockEof,
+  /* xColumn     */ shmlockColumn,
+  /* xRowid      */ shmlockRowid,
+  /* xUpdate     */ 0,
+  /* xBegin      */ 0,
+  /* xSync       */ 0,
+  /* xCommit     */ 0,
+  /* xRollback   */ 0,
+  /* xFindMethod */ 0,
+  /* xRename     */ 0,
+  /* xSavepoint  */ 0,
+  /* xRelease    */ 0,
+  /* xRollbackTo */ 0,
+  /* xShadowName */ 0
+};
+
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+int sqlite3_shmlockvtab_init(
+  sqlite3 *db, 
+  char **pzErrMsg, 
+  const sqlite3_api_routines *pApi
+){
+  int rc = SQLITE_OK;
+  SQLITE_EXTENSION_INIT2(pApi);
+  rc = sqlite3_create_module(db, "shmlock", &shmlockModule, 0);
+  return rc;
+}
@@ -1075,7 +1075,7 @@ static int geopolyOverlap(GeoPoly *p1, GeoPoly *p2){
  geopolyAddSegments(p, p1, 1);
  geopolyAddSegments(p, p2, 2);
  pThisEvent = geopolySortEventsByX(p->aEvent, p->nEvent);
-  rX = pThisEvent && pThisEvent->x==0.0 ? -1.0 : 0.0;
+  rX = pThisEvent->x==0.0 ? -1.0 : 0.0;
  memset(aOverlap, 0, sizeof(aOverlap));
  while( pThisEvent ){
    if( pThisEvent->x!=rX ){
@@ -759,7 +759,7 @@ static int nodeAcquire(
  ** are the leaves, and so on. If the depth as specified on the root node
  ** is greater than RTREE_MAX_DEPTH, the r-tree structure must be corrupt.
  */
-  if( pNode && rc==SQLITE_OK && iNode==1 ){
+  if( pNode && iNode==1 ){
    pRtree->iDepth = readInt16(pNode->zData);
    if( pRtree->iDepth>RTREE_MAX_DEPTH ){
      rc = SQLITE_CORRUPT_VTAB;
@@ -227,7 +227,7 @@ static int SQLITE_TCLAPI test_session_cmd(
 ){
  TestSession *p = (TestSession*)clientData;
  sqlite3_session *pSession = p->pSession;
-  static struct SessionSubcmd {
+  struct SessionSubcmd {
    const char *zSub;
    int nArg;
    const char *zMsg;
@@ -1131,7 +1131,7 @@ static int SQLITE_TCLAPI test_rebaser_cmd(
  int objc,
  Tcl_Obj *CONST objv[]
 ){
-  static struct RebaseSubcmd {
+  struct RebaseSubcmd {
    const char *zSub;
    int nArg;
    const char *zMsg;
@@ -1248,7 +1248,7 @@ static int SQLITE_TCLAPI test_sqlite3session_config(
  int objc,
  Tcl_Obj *CONST objv[]
 ){
-  static struct ConfigOpt {
+  struct ConfigOpt {
    const char *zSub;
    int op;
  } aSub[] = {
@@ -361,7 +361,6 @@ TESTSRC = \
 TESTSRC += \
  $(TOP)/ext/misc/amatch.c \
  $(TOP)/ext/misc/carray.c \
-  $(TOP)/ext/misc/cksumvfs.c \
  $(TOP)/ext/misc/closure.c \
  $(TOP)/ext/misc/csv.c \
  $(TOP)/ext/misc/decimal.c \
@@ -378,6 +377,7 @@ TESTSRC += \
  $(TOP)/ext/misc/regexp.c \
  $(TOP)/ext/misc/remember.c \
  $(TOP)/ext/misc/series.c \
+  $(TOP)/ext/misc/shmlockvtab.c \
  $(TOP)/ext/misc/spellfix.c \
  $(TOP)/ext/misc/totype.c \
  $(TOP)/ext/misc/unionvtab.c \
@@ -913,7 +913,6 @@ TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
 TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
 TESTFIXTURE_FLAGS += -DTCLSH_INIT_PROC=sqlite3TestInit
-TESTFIXTURE_FLAGS += -DSQLITE_CKSUMVFS_STATIC

 testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
 	$(TCCX) $(TCL_FLAGS) $(TESTFIXTURE_FLAGS)                            \
@@ -1,13 +1,13 @@
-C Version\s3.34.1
-D 2021-01-20T14:10:07.150
+C Add\stests\sfor\svirtual\stable\sshmlock.
+D 2020-09-02T16:14:17.011
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 0e88f5d095213a9ccd45c5bbd871c8ead498f886dff4493471fbf48b1f867f9d
+F Makefile.in 19374a5db06c3199ec1bab71ab74a103d8abf21053c05e9389255dc58083f806
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc dd10dbf63b2f8ac3e2f0542963a21bc69058976ac4355165f212a31c83d17f44
+F Makefile.msc 48f5a3fc32672c09ad73795749f6253e406a31526935fbbffd8f021108d54574
 F README.md 1514a365ffca3c138e00c5cc839906108a01011a6b082bad19b09781e3aa498a
-F VERSION 9633e2edacc7963299a285b89cbeb832f73316c9ccc58f9a70701a5e8b16513c
+F VERSION 4027b9aea92d64385570778ebd14388c0b23e92aafda15e7b89c45886c9b920a
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
 F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@ -28,20 +28,19 @@ F autoconf/tea/license.terms 13bd403c9610fd2b76ece0ab50c4c5eda933d523
 F autoconf/tea/pkgIndex.tcl.in 3ef61715cf1c7bdcff56947ffadb26bc991ca39d
 F autoconf/tea/tclconfig/install-sh bdd5e293591621ae60d9824d86a4b1c5f22c3d00
 F autoconf/tea/tclconfig/tcl.m4 66ddf0a5d5e4b1d29bff472c0985fd7fa89d0fb5
-F autoconf/tea/win/makefile.vc a5ff708245260c2794c6aaa0151efe5403d5896566eaf096747be0d9075284e4
+F autoconf/tea/win/makefile.vc 71915591c07cd5137711dc40ba3e127deb3f4531b9aad220b724cf5b451362bd
 F autoconf/tea/win/nmakehlp.c 247538ad8e8c508f33c03ec1fbd67d3a07ef6291
 F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.h.in 6376abec766e9a0785178b1823b5a587e9f1ccbc
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure 10bbf6fa13320dc9b6197aa9574bd7360f379f904a53ad632ddb310099cf148d x
-F configure.ac 73545c21eebcef9398d85c982c7be260f07708256778221b541f83ae8c6f61eb
+F configure 63af83d31b9fdf304f2dbb1e1638530d4ceff31702d1e19550d1fbf3bdf9471e x
+F configure.ac 40d01e89cb325c28b33f5957e61fede0bd17da2b5e37d9b223a90c8a318e88d4
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/lemon.html c5d8ba85ac1daef7be8c2d389899480eb62451ff5c09b0c28ff8157bb8770746
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
 F doc/trusted-schema.md 33625008620e879c7bcfbbfa079587612c434fa094d338b08242288d358c3e8a
-F doc/vdbesort-memory.md 4da2639c14cd24a31e0af694b1a8dd37eaf277aff3867e9a8cc14046bc49df56
 F doc/vfs-shm.txt e101f27ea02a8387ce46a05be2b1a902a021d37a
 F doc/wal-lock.md 781726aaba20bafeceb7ba9f91d5c98c6731691b30c954e37cf0b49a053d461d
 F ext/README.md fd5f78013b0a2bc6f0067afb19e6ad040e89a10179b4f6f03eee58fac5f169bd
@@ -50,8 +49,8 @@ F ext/async/sqlite3async.c 6f247666b495c477628dd19364d279c78ea48cd90c72d9f9b98ad
 F ext/async/sqlite3async.h 46b47c79357b97ad85d20d2795942c0020dc20c532114a49808287f04aa5309a
 F ext/expert/README.md b321c2762bb93c18ea102d5a5f7753a4b8bac646cb392b3b437f633caf2020c3
 F ext/expert/expert.c d548d603a4cc9e61f446cc179c120c6713511c413f82a4a32b1e1e69d3f086a4
-F ext/expert/expert1.test dba6e752cc701621771f925f3872b183fa688f7b4a9f4822631fc02bdbffc45a
-F ext/expert/sqlite3expert.c 216e250acc54b8aaa9ff5c1e1b2256788abc3994dd1d757626102718122e6a91
+F ext/expert/expert1.test 2e10ff875c31c9e6fc5e324767624181273859771fe34c5daeeadf3f2974a4f7
+F ext/expert/sqlite3expert.c b5eae75862d34a204d16c45dcb813888b5f86bdc156c6136b0f79094c0da4f79
 F ext/expert/sqlite3expert.h ca81efc2679a92373a13a3e76a6138d0310e32be53d6c3bfaedabd158ea8969b
 F ext/expert/test_expert.c d56c194b769bdc90cf829a14c9ecbc1edca9c850b837a4d0b13be14095c32a72
 F ext/fts1/README.txt 20ac73b006a70bcfd80069bdaf59214b6cf1db5e
@@ -109,24 +108,24 @@ F ext/fts3/tool/fts3cov.sh c331d006359456cf6f8f953e37f2b9c7d568f3863f00bb5f7eb87
 F ext/fts3/tool/fts3view.c 413c346399159df81f86c4928b7c4a455caab73bfbc8cd68f950f632e5751674
 F ext/fts3/unicode/CaseFolding.txt 8c678ca52ecc95e16bc7afc2dbf6fc9ffa05db8c
 F ext/fts3/unicode/UnicodeData.txt cd07314edb62d49fde34debdaf92fa2aa69011e7
-F ext/fts3/unicode/mkunicode.tcl d5aebf022fa4577ee8cdf27468f0d847879993959101f6dbd6348ef0cfc324a7
+F ext/fts3/unicode/mkunicode.tcl bf7fcaa6d68e6d38223467983785d054f1cff4d9e3905dd51f6ed8801bb590d5
 F ext/fts3/unicode/parseunicode.tcl a981bd6466d12dd17967515801c3ff23f74a281be1a03cf1e6f52a6959fc77eb
 F ext/fts5/extract_api_docs.tcl a36e54ec777172ddd3f9a88daf593b00848368e0
 F ext/fts5/fts5.h c132a9323f22a972c4c93a8d5a3d901113a6e612faf30ca8e695788438c5ca2a
-F ext/fts5/fts5Int.h 26c74dd5776f798436fbf604a0bf0e8de263b35b5060b05c15f9085845d9fda2
-F ext/fts5/fts5_aux.c f558e1fb9f0f86a4f7489e258c162e1f947de5ff2709087fbb465fddb7092f98
+F ext/fts5/fts5Int.h d7cbc214ee167496f70905667e18f73ea0402f7ef09236ce305e117e0efc866a
+F ext/fts5/fts5_aux.c dcc627d8b6e3fc773db528ff67b39955dab7b51628f9dba8e15849e5bedfd7fa
 F ext/fts5/fts5_buffer.c 5a5fe0159752c0fb0a5a93c722e9db2662822709490769d482b76a6dc8aaca70
-F ext/fts5/fts5_config.c be54f44fca491e96c6923a4b9a736f2da2b13811600eb6e38d1bcc91c4ea2e61
-F ext/fts5/fts5_expr.c e527e3a7410393075598cec544e3831798a8c88b3e8878e2cfb7cb147113e925
-F ext/fts5/fts5_hash.c 1aa93c9b5f461afba66701ee226297dc78402b3bdde81e90a10de5fe3df14959
-F ext/fts5/fts5_index.c 9f152a596df3a2227ddd59adb82549c2b6858ab36bc1d26fd8933f43d3d63d36
-F ext/fts5/fts5_main.c b4e4931c7fcc9acfa0c3b8b5e5e80b5b424b8d9207aae3a22b674bd35ccf149d
-F ext/fts5/fts5_storage.c 58ba71e6cd3d43a5735815e7956ee167babb4d2cbfe206905174792af4d09d75
+F ext/fts5/fts5_config.c b447948f35ad3354e8fe5e242e0a7e7b5b941555400b9404259944e3aa570037
+F ext/fts5/fts5_expr.c 6393974bd3968280fa5275c26a41d837701d27793a2f025b9e7329bdbfbb274a
+F ext/fts5/fts5_hash.c 1cc0095646f5f3b46721aa112fb4f9bf29ae175cb5338f89dcec66ed97acfe75
+F ext/fts5/fts5_index.c de14c9a30f45e2b847ff9284b14776d9d07961e545e8f1546a6aa3f915af721f
+F ext/fts5/fts5_main.c e881a2ea0bf01b3a3ff0bc1b31373c58fd54b6c9f3c43ea3d431bea4e5d4025e
+F ext/fts5/fts5_storage.c 3ecda8edadc1f62a355d6789776be0da609f8658c50d72e422674093ab7e1528
 F ext/fts5/fts5_tcl.c 39bcbae507f594aad778172fa914cad0f585bf92fd3b078c686e249282db0d95
 F ext/fts5/fts5_test_mi.c 08c11ec968148d4cb4119d96d819f8c1f329812c568bac3684f5464be177d3ee
 F ext/fts5/fts5_test_tok.c f96c6e193c466711d6d7828d5f190407fe7ab897062d371426dd3036f01258e7
-F ext/fts5/fts5_tokenize.c 5e251efb0f1af99a25ed50010ba6b1ad1250aca5921af1988fdcabe5ebc3cb43
-F ext/fts5/fts5_unicode2.c eca63dbc797f8ff0572e97caf4631389c0ab900d6364861b915bdd4735973f00
+F ext/fts5/fts5_tokenize.c 2e508c6a3bd8ee56c48e98a38052e1a650e49b32a484cce9b189984114bc3b88
+F ext/fts5/fts5_unicode2.c 8bd0cd07396b74c1a05590e4070d635bccfc849812c305619f109e6c0485e250
 F ext/fts5/fts5_varint.c e64d2113f6e1bfee0032972cffc1207b77af63319746951bf1d09885d1dadf80
 F ext/fts5/fts5_vocab.c 7a071833064dc8bca236c3c323e56aac36f583aa2c46ce916d52e31ce87462c9
 F ext/fts5/fts5parse.y eb526940f892ade5693f22ffd6c4f2702543a9059942772526eac1fde256bb05
@@ -160,9 +159,9 @@ F ext/fts5/test/fts5connect.test 08030168fc96fc278fa81f28654fb7e90566f33aff269c0
 F ext/fts5/test/fts5content.test 213506436fb2c87567b8e31f6d43ab30aab99354cec74ed679f22aad0cdbf283
 F ext/fts5/test/fts5corrupt.test 77ae6f41a7eba10620efb921cf7dbe218b0ef232b04519deb43581cb17a57ebe
 F ext/fts5/test/fts5corrupt2.test 7453752ba12ce91690c469a6449d412561cc604b1dec994e16ab132952e7805f
-F ext/fts5/test/fts5corrupt3.test dd5435659d5363fc3b3ac32175e2fc793fdc17980b47e3d598695d867eaa77a2
+F ext/fts5/test/fts5corrupt3.test 7afe0fea5b2160798fdc3306395048768c6fc13acefc0e7129d4075b6e1bb224
 F ext/fts5/test/fts5corrupt4.test ea805c4d7c68b5f185b9db5d2060a7ae5875339738dd48203c92162f41e7ca91
-F ext/fts5/test/fts5delete.test 4a15fb03b6c7eac62ac807a3a32b7f0dc74f0d479c410e3e3568ae96b9469290
+F ext/fts5/test/fts5delete.test cbf87e3b8867c4d5cfcaed975c7475fd3f99d072bce2075fcedf43d1f82af775
 F ext/fts5/test/fts5detail.test 31b240dbf6d44ac3507e2f8b65f29fdc12465ffd531212378c7ce1066766f54e
 F ext/fts5/test/fts5determin.test 1b77879b2ae818b5b71c859e534ee334dac088b7cf3ff3bf76a2c82b1c788d11
 F ext/fts5/test/fts5dlidx.test b90852c55881b29dbac6380b274de27beae623ac4b6d567c6c8fb9cdc315a86e
@@ -180,13 +179,12 @@ F ext/fts5/test/fts5fault8.test 318238659d35f82ad215ecb57ca4c87486ea85d45dbeedae
 F ext/fts5/test/fts5fault9.test 098e6b894bbdf9b2192f994a30f4043673fb3f338b6b8ab1624c704422f39119
 F ext/fts5/test/fts5faultA.test be4487576bff8c22cee6597d1893b312f306504a8c6ccd3c53ca85af12290c8c
 F ext/fts5/test/fts5faultB.test d606bdb8e81aaeb6f41de3fc9fc7ae315733f0903fbff05cf54f5b045b729ab5
-F ext/fts5/test/fts5faultD.test e7ed7895abfe6bc98a5e853826f6b74956e7ba7f594f1860bbf9e504b9647996
-F ext/fts5/test/fts5faultE.test 844586ce71dab4be85bb86880e87b624d089f851654cd22e4710c77eb8ce7075
+F ext/fts5/test/fts5faultD.test cc5d1225556e356615e719c612e845d41bff7d5a
 F ext/fts5/test/fts5first.test 3fcf2365c00a15fc9704233674789a3b95131d12de18a9b996159f6909dc8079
 F ext/fts5/test/fts5full.test e1701a112354e0ff9a1fdffb0c940c576530c33732ee20ac5e8361777070d717
 F ext/fts5/test/fts5fuzz1.test 238d8c45f3b81342aa384de3e581ff2fa330bf922a7b69e484bbc06051a1080e
-F ext/fts5/test/fts5hash.test dc7bc7e0cdeb42cfce31294ad2f8fcf43192bfd0145bb7f3ecc5465d8c72696f
-F ext/fts5/test/fts5integrity.test e387b2bd1c83e50f4a12f58a5fd399111bbab36be2f1c9fd5bb974be08a32de6
+F ext/fts5/test/fts5hash.test a4cf51acad99bfc43c16fb74f9d22495dc221ae0701fc5e908ca963a9b26a02b
+F ext/fts5/test/fts5integrity.test 8ffabcd91b058d812aba3e3e0a06f76ce165ba402a18cca20e34204a7feec92e
 F ext/fts5/test/fts5interrupt.test 09613247b273a99889808ef852898177e671406fe71fdde7ea00e78ea283d227
 F ext/fts5/test/fts5lastrowid.test be98fe3e03235296585b72daad7aed5717ba0062bae5e5c18dd6e04e194c6b28
 F ext/fts5/test/fts5leftjoin.test c0b4cafb9661379e576dc4405c0891d8fcc2782680740513c4d1fc114b43d4ad
@@ -200,7 +198,7 @@ F ext/fts5/test/fts5near.test 211477940142d733ac04fad97cb24095513ab2507073a99c27
 F ext/fts5/test/fts5onepass.test f9b7d9b2c334900c6542a869760290e2ab5382af8fbd618834bf1fcc3e7b84da
 F ext/fts5/test/fts5optimize.test 36a752d24c818792032e4ff502936fc9cc5ef938721696396fdc79214b2717f1
 F ext/fts5/test/fts5phrase.test 13e5d8e9083077b3d9c74315b3c92ec723cc6eb37c8155e0bfe1bba00559f07b
-F ext/fts5/test/fts5plan.test 79d35b5e83bbdcba48d946a7f008df161f6b0ede1a966892d0aa6c8dd0b6e773
+F ext/fts5/test/fts5plan.test 771b999d161e24fd803ce0290adb7c6e7c9b9cc2c6a0adb344813fb89473aa32
 F ext/fts5/test/fts5porter.test 8d08010c28527db66bc3feebd2b8767504aaeb9b101a986342fa7833d49d0d15
 F ext/fts5/test/fts5porter2.test 0d251a673f02fa13ca7f011654873b3add20745f7402f108600a23e52d8c7457
 F ext/fts5/test/fts5prefix.test a0fa67b06650f2deaa7bf27745899d94e0fb547ad9ecbd08bfad98c04912c056
@@ -215,10 +213,9 @@ F ext/fts5/test/fts5simple2.test 258a1b0c590409bfa5271e872c79572b319d2a56554d058
 F ext/fts5/test/fts5simple3.test d5c74a9d3ca71bd5dd5cacb7c55b86ea12cdddfc8b1910e3de2995206898380f
 F ext/fts5/test/fts5synonym.test 1651815b8008de170e8e600dcacc17521d765482ea8f074ae82cfa870d8bb7fb
 F ext/fts5/test/fts5synonym2.test b54cce5c34ec08ed616f646635538ae82e34a0e28f947ec60b6fadbc4b3fb17a
-F ext/fts5/test/fts5tok1.test 1f7817499f5971450d8c4a652114b3d833393c8134e32422d0af27884ffe9cef
+F ext/fts5/test/fts5tok1.test ce6551e41ff56f30b69963577324624733bed0d1753589f06120d664d9cd45c9
 F ext/fts5/test/fts5tok2.test dcacb32d4a2a3f0dd3215d4a3987f78ae4be21a2
 F ext/fts5/test/fts5tokenizer.test ac3c9112b263a639fb0508ae73a3ee886bf4866d2153771a8e8a20c721305a43
-F ext/fts5/test/fts5trigram.test e2ce256fd0ccd6707e740aa3596206aedb0d5834b100c0cb49e344dcd1d8463c
 F ext/fts5/test/fts5umlaut.test a42fe2fe6387c40c49ab27ccbd070e1ae38e07f38d05926482cc0bccac9ad602
 F ext/fts5/test/fts5unicode.test 17056f4efe6b0a5d4f41fdf7a7dc9af2873004562eaa899d40633b93dc95f5a9
 F ext/fts5/test/fts5unicode2.test 9b3df486de05fb4bde4aa7ee8de2e6dae1df6eb90e3f2e242c9383b95d314e3e
@@ -230,7 +227,7 @@ F ext/fts5/test/fts5version.test c8f2cc105f0abf0224965f93e584633dee3e06c91478bc6
 F ext/fts5/test/fts5vocab.test 7ed80d9af1ddaaa1637da05e406327b5aac250848bc604c1c1cc667908b87760
 F ext/fts5/test/fts5vocab2.test e0fdc3a3095f6eda68ac9bf9a443ff929a124d46f00af19933604085712e9d47
 F ext/fts5/tool/fts5speed.tcl b0056f91a55b2d1a3684ec05729de92b042e2f85
-F ext/fts5/tool/fts5txt2db.tcl c0d43c8590656f8240e622b00957b3a0facc49482411a9fdc2870b45c0c82f9f
+F ext/fts5/tool/fts5txt2db.tcl 526a9979c963f1c54fd50976a05a502e533a4c59
 F ext/fts5/tool/loadfts5.tcl 95b03429ee6b138645703c6ca192c3ac96eaf093
 F ext/fts5/tool/mkfts5c.tcl d1c2a9ab8e0ec690a52316f33dd9b1d379942f45
 F ext/fts5/tool/showfts5.tcl d54da0e067306663e2d5d523965ca487698e722c
@@ -288,13 +285,12 @@ F ext/misc/anycollseq.c 5ffdfde9829eeac52219136ad6aa7cd9a4edb3b15f4f2532de52f4a2
 F ext/misc/appendvfs.c 55121d311d408ba9c62c3cfa367408887638f02f9522dd9859891d0ee69a7eba
 F ext/misc/blobio.c a867c4c4617f6ec223a307ebfe0eabb45e0992f74dd47722b96f3e631c0edb2a
 F ext/misc/btreeinfo.c d28ce349b40054eaa9473e835837bad7a71deec33ba13e39f963d50933bfa0f9
-F ext/misc/carray.c b75a0f207391038bf1540d3372f482a95c3613511c7c474db51ede1196321c7c
-F ext/misc/carray.h de74ac70b2338f416723f7d538026e8ec0b7f1d388319f8f140c9a4d7677f02e
-F ext/misc/cksumvfs.c c4e7ebeae5aa578df98f23bddb63ecbcbe913ee3c32b8b769525af100d752061
+F ext/misc/carray.c 91e9a7f512fda934894bed30464552fffa7d3073b5be04189ae0bd0c59f26bfd
+F ext/misc/cksumvfs.c 0f022867786b615d7f68fb3ab3a16627fe6a730442abf804735e18a73f835a83
 F ext/misc/closure.c dbfd8543b2a017ae6b1a5843986b22ddf99ff126ec9634a2f4047cd14c85c243
 F ext/misc/completion.c 6dafd7f4348eecc7be9e920d4b419d1fb2af75d938cd9c59a20cfe8beb2f22b9
 F ext/misc/compress.c 3354c77a7c8e86e07d849916000cdac451ed96500bfb5bd83b20eb61eee012c9
-F ext/misc/csv.c 53b3338d4fa812eda51a2637df30233a4dae16b964ee5666e2051b9672ed8bb4
+F ext/misc/csv.c 3ed979c1eb35e35a98b30ef545a2facf62994594217681d9138b4b75faf6b0d7
 F ext/misc/dbdata.c e316fba936571584e55abd5b974a32a191727a6b746053a0c9d439bd2cf93940
 F ext/misc/dbdump.c b8592f6f2da292c62991a13864a60d6c573c47a9cc58362131b9e6a64f823e01
 F ext/misc/decimal.c 3ddbf8162015be4d5ec2395dee4538f1e638bb517174bb148274b132df6e1d08
@@ -318,9 +314,10 @@ F ext/misc/regexp.c 246244c714267f303df76acf73dcf110cf2eaf076896aaaba8db6d6d21a1
 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c
 F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c
 F ext/misc/scrub.c 2a44b0d44c69584c0580ad2553f6290a307a49df4668941d2812135bfb96a946
-F ext/misc/series.c fbb8e6be97b54d10d2f235e163fa2f53a8f4421c66ebd532a233fd1c69c3f522
+F ext/misc/series.c 4057dda3579b38ff88b2d3b13b4dd92dbd9d6f90dac2b55c19b0a8ed87ee4959
 F ext/misc/sha1.c c8f2253c8792ffab9517695ea7d88c079f0395a5505eefef5c8198fe184ed5ac
-F ext/misc/shathree.c 86bee126b89dc7f3a9edc6d31497588a0f1e78ab867025a766b67f52bcf1f656
+F ext/misc/shathree.c 135b7c145db4a09b1650c3e7aff9cb538763a9a361e834c015dd1aaf8d5c9a00
+F ext/misc/shmlockvtab.c d218fd9eeacd8406b72cb12d4b80409734415350d3c1dfc3b504ce10cb01f072
 F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52
 F ext/misc/spellfix.c 94df9bbfa514a563c1484f684a2df3d128a2f7209a84ca3ca100c68a0163e29f
 F ext/misc/sqlar.c 0ace5d3c10fe736dc584bf1159a36b8e2e60fab309d310cd8a0eecd9036621b6
@@ -391,8 +388,8 @@ F ext/repair/test/checkfreelist01.test 3e8aa6aeb4007680c94a8d07b41c339aa635cc782
 F ext/repair/test/checkindex01.test b530f141413b587c9eb78ff734de6bb79bc3515c335096108c12c01bddbadcec
 F ext/repair/test/test.tcl 686d76d888dffd021f64260abf29a55c57b2cedfa7fc69150b42b1d6119aac3c
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/geopoly.c 1b1ddecb79877b12331d35de9f393b80bbb731e0bf6db6c572f23191987ea803
-F ext/rtree/rtree.c 60f6f1675134201974be4189dbd219494c13e1ed30e80bd92ae0dcc86df1b035
+F ext/rtree/geopoly.c f15cc6845d64a629035627d863cbe3eadc9cb30f9ca77bd823b0ca8a5a3f8b00
+F ext/rtree/rtree.c f87ffcc91f49272862119cfdd256b02514351893786a710d88f85933790608d4
 F ext/rtree/rtree.h 4a690463901cb5e6127cf05eb8e642f127012fd5003830dbc974eca5802d9412
 F ext/rtree/rtree1.test 00792b030a4e188ff1b22e8530e8aa0452bb5dd81c2b18cb004afc7dc63e040e
 F ext/rtree/rtree2.test 9d9deddbb16fd0c30c36e6b4fdc3ee3132d765567f0f9432ee71e1303d32603d
@@ -454,14 +451,14 @@ F ext/session/sessionstat1.test 218d351cf9fcd6648f125a26b607b140310160184723c266
 F ext/session/sessionwor.test 67b5ab91d4f93ce65ff1f58240ac5ddf73f8670facc1ffa49cef56293d52818d
 F ext/session/sqlite3session.c 2c76b8c3a5d6dab736686f8a48833b8bdac0871ecc6f447f9839d28bd4a63d6c
 F ext/session/sqlite3session.h a2db5b72b938d12c727b4b4ec632254ca493670a9c0de597af3271a7f774fc57
-F ext/session/test_session.c 24286d958dc6f4ca4d7e710f09bc0fa9d50956a40dd99fd8223e7488024c71fe
+F ext/session/test_session.c 98797aba475a799376c9a42214f2d1debf2d0c3cb657d9c8bbf4f70bf3fb4aec
 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3
 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04
 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 57451ea5b3d5cd86e9c5324b10c9de184b12e8dcccc31c65d24fbcb55ccd9c53
+F main.mk 9702e0f4d4c530f3516fc062255c0874e5044000bfb81a5210507399ca2054ac
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -473,28 +470,28 @@ F spec.template 86a4a43b99ebb3e75e6b9a735d5fd293a24e90ca
 F sqlite.pc.in 42b7bf0d02e08b9e77734a47798d1a55a9e0716b
 F sqlite3.1 fc7ad8990fc8409983309bb80de8c811a7506786
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
-F src/alter.c b6de60d59419e34f5b48ff2b21fe0f9bb66fc714e5545a6ac790ac7a0c46548c
-F src/analyze.c 01c6c6765cb4d40b473b71d85535093730770bb186f2f473abac25f07fcdee5c
+F src/alter.c 805de23ddca536181f8f0439df989fdd4a2f76c40bc305ec9fe2f211f68c89e8
+F src/analyze.c 5cffff3d355858cd22bfc6e20ac7203510d2e1cc935086eb06f4abb2f579f628
 F src/attach.c 0f497c15c4cfe3bdcb214f0dbdbbb6c5ed7e8a9308ac445c7959f5e5780437a9
 F src/auth.c a3d5bfdba83d25abed1013a8c7a5f204e2e29b0c25242a56bc02bb0c07bf1e06
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c ee14224322b9e4172d01e691e2f289f6c630ae39b7906f84b72dc780b9e42a76
-F src/btree.h dcdff4037d75b3f032a5de0d922fcfaf35d48589417f634fa8627362709315f9
+F src/btree.c 87f2c3f1812b49fbb700fefc4852216af2904016b42b22c2cd5b9c254cc6665a
+F src/btree.h c64f1439377e2edf31f7c3a562586a96b71f8d0ca47e65756e7d122fd8f06928
 F src/btreeInt.h ffd66480520d9d70222171b3a026d78b80833b5cea49c89867949f3e023d5f43
-F src/build.c f6449d4e85e998e14d3f537e8ea898dca2fcb83c277db3e60945af9b9177db81
+F src/build.c 92b61c2be1e35a619391f17c2d1b108901ad5e4df99becc0b064a934e6ec662a
 F src/callback.c d0b853dd413255d2e337b34545e54d888ea02f20da5ad0e63585b389624c4a6c
 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
 F src/ctime.c e98518d2d3d4029a13c805e07313fb60c877be56db76e90dd5f3af73085d0ce6
 F src/date.c dace306a10d9b02ee553d454c8e1cf8d3c9b932e137738a6b15b90253a9bfc10
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 3aa79fc3aed7ce906e4ea6c10e85d657299e304f6049861fe300053ac57de36c
-F src/delete.c 927cf8f900583e79aca8f1a321979e0a8f053babd9a690b44b38f79de2cc09fe
-F src/expr.c 0d196ed5a2ebf96be7e8df88add4fabfad0dce16c0fed81a4b8f6a26e259797f
+F src/delete.c a2a603ab07cced8560065b0e2c4c9c842f2c5a2fd43d87355f95eb53bae7fe21
+F src/expr.c 4c8b9c2942adb896b9d1613794bd00cbf98c94e38c41cd5720b78bcdc21a965d
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 83372403298e6a7dd989a47aaacdbaa5b4307b5199dbd56e07d4896066b3de72
-F src/func.c 574f7e5a67e4b7a7855cf3478037717c8f44686c0cd727e1d7f7773414165c03
+F src/func.c 2333eb4277f55a5efdc12ef754e7d7ec9105d257b2fd00301d23ce1e8fa67dc0
 F src/global.c 943256ac44f333039d35a9830c18d075a81fa6b6bf2af05771494a9acfb9a40b
 F src/hash.c 8d7dda241d0ebdafb6ffdeda3149a412d7df75102cecfc1021c98d6219823b19
 F src/hash.h 9d56a9079d523b648774c1784b74b89bd93fac7b365210157482e4319a468f38
@@ -502,15 +499,15 @@ F src/hwtime.h cb1d7e3e1ed94b7aa6fde95ae2c2daccc3df826be26fc9ed7fd90d1750ae6144
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 7e081d33aab4a9d761c39dccf3c3872c35501565d2ed9db66301918d23bc7901
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
-F src/loadext.c 8c9c8cd2bd8eecdb06d9b6e89de7e9e65bae45cc8fc33609cc74023a5c296067
-F src/main.c 54d61d1e94f225636053c862c930d7dd7b29162b93d3f3ecb00439910ccba02a
-F src/malloc.c c1af4ac5a463648cd2953fd4ac679b3ba9022ce5ec794a60806150ad69dfd33a
+F src/loadext.c 436af4968c6954d304fce9efa12719367bd8f37b19b93b71d6ad607e85adbb47
+F src/main.c 1b7b95b6168e29c8235042b0b7102ecbb9e6765bbc82b74f2b96294b230f60f3
+F src/malloc.c 22d5bdd9fe88ae4fad1b91a1b9735104b82853ffef868f1f05517d60dc1875f5
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c b93b8762ab999a29ae7751532dadf0a1ac78040308a5fb1d17fcc365171d67eb
 F src/mem3.c 30301196cace2a085cbedee1326a49f4b26deff0af68774ca82c1f7c06fda4f6
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-F src/memdb.c ab0632d42407e866d2b616bd19d4211ac0ad1b430f04c4e187d60005b8700b98
+F src/memdb.c d58e398e315e88f95f8d07d17e80ab11259ebd6d1a10397434329eeabd1985e3
 F src/memjournal.c 90b2ca7e2f465d57c16b69d15a9f3e3294af61088eb4938f2f7664d5ac50f813
 F src/msvc.h 3a15918220367a8876be3fa4f2abe423a861491e84b864fb2b7426bf022a28f8
 F src/mutex.c 5e3409715552348732e97b9194abe92fdfcd934cfb681df4ba0ab87ac6c18d25
@@ -523,38 +520,38 @@ F src/os.c 80e4cf3e5da06be03ca641661e331ce60eeeeabf0d7354dbb1c0e166d0eedbbe
 F src/os.h 48388821692e87da174ea198bf96b1b2d9d83be5dfc908f673ee21fafbe0d432
 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85
 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586
-F src/os_unix.c adbbcea4c63d3b400d405f60a5da4c01433753ec4a12e2dc695beb2bbd671fe9
-F src/os_win.c 77d39873836f1831a9b0b91894fec45ab0e9ca8e067dc8c549e1d1eca1566fe9
+F src/os_unix.c 695560d6427b8d45d1bb0595c4ec9ce944d0b1cbb8bc97d9345141301abf28d2
+F src/os_win.c a2149ff0a85c1c3f9cc102a46c673ce87e992396ba3411bfb53db66813b32f1d
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
-F src/pager.c c49952ac5e9cc536778eff528091d79d38b3e45cbeeed4695dc05e207dc6547d
+F src/pager.c 3700a1c55427a3d4168ad1f1b8a8b0cb9ace1d107e4506e30a8f1e66d8a1195e
 F src/pager.h 4bf9b3213a4b2bebbced5eaa8b219cf25d4a82f385d093cd64b7e93e5285f66f
 F src/parse.y 9ce4dfb772608ed5bd3c32f33e943e021e3b06cfd2c01932d4280888fdd2ebed
 F src/pcache.c 385ff064bca69789d199a98e2169445dc16e4291fa807babd61d4890c3b34177
 F src/pcache.h 4f87acd914cef5016fae3030343540d75f5b85a1877eed1a2a19b9f284248586
 F src/pcache1.c 6596e10baf3d8f84cc1585d226cf1ab26564a5f5caf85a15757a281ff977d51a
-F src/pragma.c 6daaaecc26a4b09481d21722525b079ce756751a43a79cc1d8f122d686806193
+F src/pragma.c 5435b9fe17f7728bd460f52d6d9388e7e45658c6f5549f28fc2d408be9efd2d5
 F src/pragma.h 8dc78ab7e9ec6ce3ded8332810a2066f1ef6267e2e03cd7356ee00276125c6cf
-F src/prepare.c 270170a239c0f66bd3c228f373afe24447c2614a6829ae22080babc64f241931
+F src/prepare.c 38ae9c2e3550bfa496886a862a5344c420ded052fd92294f409a07a53f372ffe
 F src/printf.c 30e92b638fac71dcd85cdea1d12ecfae354c9adee2c71e8e1ae4727cde7c91ed
 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
-F src/resolve.c 1948a92ca9eab776632816b97e57c61d933474a78aad4f4ef835c916a83dbb1c
+F src/resolve.c 97b91fb25d86881ff20c9ad2ad98412c6c1bb5f7d6c9bb044db250cbc9cfcd4b
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 847062694ac9a6add162d39182584b7ca53948ad821c52512a125cd845904e71
-F src/shell.c.in 55113760ae91a05c6ce4558714a1c8fc7a44bf266f735de6e71ea40f79e69830
-F src/sqlite.h.in 843471c794810d090b7bc1a31ff1d7c6fed5d029dc47ccc54605bd418df5d294
+F src/select.c 233e884d7da6601486c7b93aedb97fd29302ae5c03742d0e0eccb4790638bb77
+F src/shell.c.in 9bae0c8397e7b592fb404678c4c1fc7944d9dc798a928d1eb40bcd608c33d21b
+F src/sqlite.h.in 7c248cbaedb64e39071cda07e7ff7ab47a4bbebc279ccb1676f47b353a89360d
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
-F src/sqlite3ext.h 61b38c073d5e1e96a3d45271b257aef27d0d13da2bea5347692ae579475cd95e
-F src/sqliteInt.h c01115c8dd967f7d334a98ba37ac821eafb04144c8085a795daaf2185743d27a
+F src/sqlite3ext.h 2d1af80082edffd71c6f96f70ad1ce6a4fb46615ad10291fc77fe0dea9ff0197
+F src/sqliteInt.h d8d69318b1ba3906d4860da1cd1c6b3650b81c9595e5bc360c6469a1e54e09e1
 F src/sqliteLimit.h d7323ffea5208c6af2734574bae933ca8ed2ab728083caa117c9738581a31657
 F src/status.c 4b8bc2a6905163a38b739854a35b826c737333fab5b1f8e03fa7eb9a4799c4c1
 F src/table.c 0f141b58a16de7e2fbe81c308379e7279f4c6b50eb08efeec5892794a0ba30d1
 F src/tclsqlite.c 986b6391f02cd9b53c1d688be55899f6ffddeb8e8014cd83c1b73ff912579a71
-F src/test1.c 465b7a35b7e231bf2833e47c1371b5dfc99bd803ebe73783862399d479d696a5
+F src/test1.c 1cfa55932b81c8f3980f6983b3f77a7836c2f8e53da1d39d7e831444e714f8a3
 F src/test2.c 3efb99ab7f1fc8d154933e02ae1378bac9637da5
 F src/test3.c 61798bb0d38b915067a8c8e03f5a534b431181f802659a6616f9b4ff7d872644
 F src/test4.c 7c4420e01c577b5c4add2cb03119743b1a357543d347773b9e717195ea967159
 F src/test5.c 328aae2c010c57a9829d255dc099d6899311672d
-F src/test6.c ae73a3a42bbc982fb9e301b84d30bda65a307be48c6dff20aba1461e17a9b0ce
+F src/test6.c e8d839fbc552ce044bec8234561a2d5b8819b48e29548ad0ba400471697946a8
 F src/test7.c 5612e9aecf934d6df7bba6ce861fdf5ba5456010
 F src/test8.c 7fb971777c2c79c734bb52757191d68d4af659b8de9b4a071be3f527a9d19a02
 F src/test9.c 12e5ba554d2d1cbe0158f6ab3f7ffcd7a86ee4e5
@@ -567,7 +564,7 @@ F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274
 F src/test_config.c 5ea19bf0972a9d91728518b4d30e91477acce80496003ecbef3a7fb18d0bd081
 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f
 F src/test_demovfs.c 86142ba864d4297d54c5b2e972e74f3141ae4b30f05b3a95824184ed2d3d7f91
-F src/test_devsym.c aff2255ea290d7718da08af30cdf18e470ff7325a5eff63e0057b1496ed66593
+F src/test_devsym.c 6109b45c3db3ef7b002320947ed448c027356ab8b885156ff535fd8684d4a571
 F src/test_fs.c ba1e1dc18fd3159fdba0b9c4256f14032159785320dfbd6776eb9973cb75d480
 F src/test_func.c 181f992e5495644434c4f0e3cc72362a78c295eb2cf3ff4d02498b8bde7aa276
 F src/test_hexio.c 9478e56a0f08e07841a014a93b20e4ba2709ab56d039d1ca8020e26846aa19bd
@@ -596,7 +593,7 @@ F src/test_tclsh.c eeafce33ad2136d57e5dec10f1e9a4347447eb72ffd504a1c7b9c6bfe2e71
 F src/test_tclvar.c 33ff42149494a39c5fbb0df3d25d6fafb2f668888e41c0688d07273dcb268dfc
 F src/test_thread.c 269ea9e1fa5828dba550eb26f619aa18aedbc29fd92f8a5f6b93521fbb74a61c
 F src/test_vdbecov.c f60c6f135ec42c0de013a1d5136777aa328a776d33277f92abac648930453d43
-F src/test_vfs.c 2cc38a79892017702d13da79ad5152c196eec19bbd67fbde4d88065aac894a84
+F src/test_vfs.c 36822d696789535bdd0260f07d2c9a46546082fea8bb1d0a7354c7f9366e37ea
 F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
 F src/test_windirent.c a895e2c068a06644eef91a7f0a32182445a893b9a0f33d0cdb4283dca2486ac1
 F src/test_windirent.h 90dfbe95442c9762357fe128dc7ae3dc199d006de93eb33ba3972e0a90484215
@@ -605,20 +602,20 @@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c
 F src/tokenize.c 4dc01b267593537e2a0d0efe9f80dabe24c5b6f7627bc6971c487fa6a1dacbbf
 F src/treeview.c 4b92992176fb2caefbe06ba5bd06e0e0ebcde3d5564758da672631f17aa51cda
-F src/trigger.c 515e79206d40d1d4149129318582e79a6e9db590a7b74e226fdb5b2a6c7e1b10
-F src/update.c 9f126204a6acb96bbe47391ae48e0fc579105d8e76a6d9c4fab3271367476580
+F src/trigger.c ef67bde309a831515dc3c2173d792574309f2f42d45f8c078743fae9f7f98c75
+F src/update.c 55a6203008d033fc1a9c125d7a0a61efdb79bbb2e6db427b917d1d427b4639be
 F src/upsert.c 2920de71b20f04fe25eb00b655d086f0ba60ea133c59d7fa3325c49838818e78
 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0
 F src/util.c c0c7977de7ef9b8cb10f6c85f2d0557889a658f817b0455909a49179ba4c8002
 F src/vacuum.c 492422c1463c076473bae1858799c7a0a5fe87a133d1223239447c422cd26286
-F src/vdbe.c d24a43b6b1ed2dba893636a14f5e56001444ab3fd5465e3bca8ab01799840acd
+F src/vdbe.c 6430a540012b8b4c81076565804fcb979040e1b1a43ce76d2381863884155d84
 F src/vdbe.h 83603854bfa5851af601fc0947671eb260f4363e62e960e8a994fb9bbcd2aaa1
 F src/vdbeInt.h 3ca5e9fd6e095a8b6cf6bc3587a46fc93499503b2fe48951e1034ba9e2ce2f6e
 F src/vdbeapi.c c5e7cb2ab89a24d7f723e87b508f21bfb1359a04db5277d8a99fd1e015c12eb9
-F src/vdbeaux.c c76b7e96e189f5056d1de914d33d07bd03d3b88741f75375c8e18c9b11ffd379
+F src/vdbeaux.c b39d2e0e7126cd4629874dd7b67162b9f0d200b620d2b4c16d400949a2f1094b
 F src/vdbeblob.c 253ed82894924c362a7fa3079551d3554cd1cdace39aa833da77d3bc67e7c1b1
 F src/vdbemem.c 947f2a65910edb4014dc981d33e414a68c51f169f9df8c4c493a0ba840b6eb1f
-F src/vdbesort.c f5b5e473a7cee44e47a94817b042fd7172cf3aa2c0a7928a8339d612bcfdec5a
+F src/vdbesort.c 2be76d26998ce2b3324cdcc9f6443728e54b6c7677c553ad909c7d7cfab587df
 F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
 F src/vtab.c 5f5fc793092f53bbdfde296c50f563fb7bda58cf48e9cf6a8bdfbc5abd409845
@@ -626,14 +623,14 @@ F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9
 F src/wal.c 69e770e96fd56cc21608992bf2c6f1f3dc5cf2572d0495c6a643b06c3a679f14
 F src/wal.h c3aa7825bfa2fe0d85bef2db94655f99870a285778baa36307c0a16da32b226a
 F src/walker.c 3df26a33dc4f54e8771600fb7fdebe1ece0896c2ad68c30ab40b017aa4395049
-F src/where.c ad738741bf45999188a3047f6277063e3f6843304d581e3ad5875419afdeb6b2
-F src/whereInt.h 59077fbd0b3d01bc8715e746c86a99ebf4c85bde8a57077ec04d2a23e59666ec
-F src/wherecode.c a3a1aff30fe99a818d8e7c607980f033f40c68d890e03ed25838b9dbb7908bee
-F src/whereexpr.c 3a463e156ea388083c501502229c2c7f4f5c6b5330ea59bdf40d6eb6e155a25f
+F src/where.c 23f47e845e304a41d0b221bf67bd170014ae08b673076813fcd945dda1a3d4af
+F src/whereInt.h eb8c2847fb464728533777efec1682b3c074224293b2da73513c61a609efbeab
+F src/wherecode.c 8b1176a3b7d4d61f78b0516bb7f6bb3803c658a6565663b8414c3b5d37a02eaa
+F src/whereexpr.c 264d58971eaf8256eb5b0917bcd7fc7a1f1109fdda183a8382308a1b18a2dce7
 F src/window.c edd6f5e25a1e8f2b6f5305b7f5f7da7bb35f07f0d432b255b1d4c2fcab4205aa
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/affinity2.test ce1aafc86e110685b324e9a763eab4f2a73f737842ec3b687bd965867de90627
-F test/affinity3.test eecb0dabee4b7765a8465439d5e99429279ffba23ca74a7eae270a452799f9e7
+F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 2f65ec8132e0ca896de550b9908094d49ad65a99116a9d79deeb6017604ad4f6
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
@@ -648,9 +645,9 @@ F test/altercol.test 1d6a6fe698b81e626baea4881f5717f9bc53d7d07f1cd23ee7ad1b931f1
 F test/alterlegacy.test 82022721ce0de29cedc9a7af63bc9fcc078b0ee000f8283b4b6ea9c3eab2f44b
 F test/altermalloc.test 167a47de41b5c638f5f5c6efb59784002b196fff70f98d9b4ed3cd74a3fb80c9
 F test/altermalloc2.test fa7b1c1139ea39b8dec407cf1feb032ca8e0076bd429574969b619175ad0174b
-F test/altertab.test 6d7bbac2c4a6ef71b775094a3298fa3a92274d95034ee23157ffba92768e47e6
+F test/altertab.test b8b2104212e8ea87c75c3cbe3cb78ed7236a6c828ee2e59ed09d3dbe9812d002
 F test/altertab2.test b0d62f323ca5dab42b0bc028c52e310ebdd13e655e8fac070fe622bad7852c2b
-F test/altertab3.test 1db384eb85b4a30b0b332842f5c596b0dc0126f7c61959be3f85ae8b1c271d9a
+F test/altertab3.test d0d51e652aaa11e37de1f1215181d88334fefcb185f3b9bd91e06e98260c4694
 F test/amatch1.test b5ae7065f042b7f4c1c922933f4700add50cdb9f
 F test/analyze.test 547bb700f903107b38611b014ca645d6b5bb819f5210d7bf39c40802aafeb7d7
 F test/analyze3.test fca2a9de0017becfdcc201647f03b1cfd5ba0e7b5b5c852936e4ec62780cde49
@@ -732,7 +729,7 @@ F test/btree01.test e08b3613540145b353f20c81cb18ead54ff12e0f
 F test/btree02.test 7555a5440453d900410160a52554fe6478af4faf53098f7235f1f443d5a1d6cc
 F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
 F test/busy.test 510dc6daaad18bcbbc085bcc6217d6dc418def5e73f72ce1475eea0cb7834727
-F test/busy2.test 0a1633fef7987fc8ea25ed5838f7eef2f08fc6d2a3dcc77d23e6402e53946a7a
+F test/busy2.test 2499cb62c9e58e18335892602c158cb35639c411803adca6423401b31e46c503
 F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 F test/cacheflush.test af25bb1509df04c1da10e38d8f322d66eceedf61
 F test/cachespill.test 895997f84a25b323b166aecb69baab2d6380ea98f9e0bcc688c4493c535cfab9
@@ -742,8 +739,7 @@ F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
 F test/capi3c.test 54e2dc0c8fd7c34ad1590d1be6864397da2438c95a9f5aee2f8fbc60c112e44b
 F test/capi3d.test aba917805573a03deed961a21f07a5a84505ad0a616f7e3fc1508844a15bccc4
 F test/capi3e.test 3d49c01ef2a1a55f41d73cba2b23b5059ec460fe
-F test/carray01.test 3f2658bbddd75a013735a296ae2178ff441aca3f00ba623cfbae00b732ede792
-F test/cast.test 336fa21989b5170ebcaf90c24266be22dd97b3e23d1fad5ecf6ad4efb04c4423
+F test/cast.test 2906ccab6a3ebd147ffa63304b635be903ce58264110d0a0eb4fd9939422bb53
 F test/cffault.test 9d6b20606afe712374952eec4f8fd74b1a8097ef
 F test/check.test 4a2a91ed67eee84a6be16057c48d5198b6fb24849cd6da6cd855981de3fbb416
 F test/checkfault.test da6cb3d50247169efcb20bdf57863a3ccfa1d27d9e55cd324f0680096970f014
@@ -833,7 +829,7 @@ F test/descidx2.test a0ba347037ff3b811f4c6ceca5fd0f9d5d72e74e59f2d9de346a9d2f6ad
 F test/descidx3.test 953c831df7ea219c73826dfbf2f6ee02d95040725aa88ccb4fa43d1a1999b926
 F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
 F test/distinct.test e7d0cf371944dd0cbedff86420744e2f1ea2b528156451c97eb6ff41a99b9236
-F test/distinct2.test cd1d15a4a2abf579298f7161e821ed50c0119136fe0424db85c52cf0adc230d1
+F test/distinct2.test 11b0594c932098e969d084ba45ab81d5040f4d4e766db65d49146705a305ed98
 F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
 F test/e_blobbytes.test 439a945953b35cb6948a552edaec4dc31fd70a05
 F test/e_blobclose.test 4b3c8c60c2171164d472059c73e9f3c1844bb66d
@@ -844,7 +840,7 @@ F test/e_createtable.test 7107f5deda2324ea12dbf105044dc9265195401e9dbb3eead6a2c1
 F test/e_delete.test ab39084f26ae1f033c940b70ebdbbd523dc4962e
 F test/e_droptrigger.test 235c610f8bf8ec44513e222b9085c7e49fad65ad0c1975ac2577109dd06fd8fa
 F test/e_dropview.test 74e405df7fa0f762e0c9445b166fe03955856532e2bb234c372f7c51228d75e7
-F test/e_expr.test 6ba7a51ece7b3e7fc145f14f924eed25ebb5a24e7b8596c78f3838d372cf0385
+F test/e_expr.test 62000e6675d5bcf4b09276fe011a27779629ff8f6678ba5937fb6f1b78d645ff
 F test/e_fkey.test 0b458b85f192cdb9e9933d5891848bb19bcc44d3f49faf111a375f2844a164d3
 F test/e_fts3.test 17ba7c373aba4d4f5696ba147ee23fd1a1ef70782af050e03e262ca187c5ee07
 F test/e_insert.test f02f7f17852b2163732c6611d193f84fc67bc641fb4882c77a464076e5eba80e
@@ -1032,7 +1028,7 @@ F test/fuzz3.test 9c813e6613b837cb7a277b0383cd66bfa07042b4cf0317157c35852f30043c
 F test/fuzz4.test c229bcdb45518a89e1d208a21343e061503460ac69fae1539320a89f572eb634
 F test/fuzz_common.tcl b7197de6ed1ee8250a4f82d67876f4561b42ee8cbbfc6160dcb66331bad3f830
 F test/fuzz_malloc.test f348276e732e814802e39f042b1f6da6362a610af73a528d8f76898fde6b22f2
-F test/fuzzcheck.c 5f81f2cc65f13068620245f2e2c6059657d3b26be476df379ae2da539f17676d
+F test/fuzzcheck.c 656ee850f331872a784e7d6a10649efe2af123bdaacb728b5a03e4faee8b959c
 F test/fuzzdata1.db d36e88741b4f23bcbaaf55b006290669d03c6c891cf13c7b3a53bc1b097b693f
 F test/fuzzdata2.db 128b3feeb78918d075c9b14b48610145a0dd4c8d6f1ca7c2870c7e425f5bf31f
 F test/fuzzdata3.db c6586d3e3cef0fbc18108f9bb649aa77bfc38aba
@@ -1040,14 +1036,14 @@ F test/fuzzdata4.db b502c7d5498261715812dd8b3c2005bad08b3a26e6489414bd13926cd3e4
 F test/fuzzdata5.db e35f64af17ec48926481cfaf3b3855e436bd40d1cfe2d59a9474cb4b748a52a5
 F test/fuzzdata6.db 92a80e4afc172c24f662a10a612d188fb272de4a9bd19e017927c95f737de6d7
 F test/fuzzdata7.db 0166b56fd7a6b9636a1d60ef0a060f86ddaecf99400a666bb6e5bbd7199ad1f2
-F test/fuzzdata8.db f8451a1fd38efbea8c1a7cdf5d02259c4702446a9fabf566becd306b64a50236
+F test/fuzzdata8.db 99f99201280962430f3287e879e050ba88fe458d05cbf28e37ecab369ffe2e86
 F test/fuzzer1.test 3d4c4b7e547aba5e5511a2991e3e3d07166cfbb8
 F test/fuzzer2.test a85ef814ce071293bce1ad8dffa217cbbaad4c14
 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
 F test/gcfault.test dd28c228a38976d6336a3fc42d7e5f1ad060cb8c
 F test/gencol1.test b05e6c5edb9b10d48efb634ed07342441bddc89d225043e17095c36e567521a0
 F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
-F test/having.test ea5cb01cdf3d90fd1b516ef36b1fbde518dbbd61c50141f5eb830d8101844040
+F test/having.test e4098a4b8962f9596035c3b87a8928a10648acc509f1bb8d6f96413bbf79a1b3
 F test/hexlit.test 4a6a5f46e3c65c4bf1fa06f5dd5a9507a5627751
 F test/hidden.test 23c1393a79e846d68fd902d72c85d5e5dcf98711
 F test/hook.test e97382e68e4379838e888756d653afd159f5f14780315ff97b70360d3d8485bc
@@ -1107,12 +1103,12 @@ F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
 F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
 F test/istrue.test 9619a2d77580f676048aaff7a16a0bcfea2b96c6c660dfaded2e53c873418899
-F test/join.test 25da4f53523a4aa17c893134b47fba6aa4799bb33350517b157785878290e238
+F test/join.test bca044589e94bb466e4c1e91fb6fecdc3f3326ca6b3f590f555f1958156eb321
 F test/join2.test 21fc30e54ab35ed66bf51b89cec18729205497f5cc43c83bc042f96a73721593
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
 F test/join4.test 1a352e4e267114444c29266ce79e941af5885916
 F test/join5.test 3a96dc62f0b45402d7207e22d1993fe0c2fce1c57644a11439891dd62b990eb7
-F test/join6.test f809c025fa253f9e150c0e9afd4cef8813257bceeb6f46e04041228c9403cc2c
+F test/join6.test cfe6503791ceb0cbb509966740286ec423cbf10b
 F test/journal1.test c7b768041b7f494471531e17abc2f4f5ebf9e5096984f43ed17c4eb80ba34497
 F test/journal2.test 9dac6b4ba0ca79c3b21446bbae993a462c2397c4
 F test/journal3.test 7c3cf23ffc77db06601c1fcfc9743de8441cb77db9d1aa931863d94f5ffa140e
@@ -1212,7 +1208,7 @@ F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
 F test/notify2.test 2ecabaa1305083856b7c39cf32816b612740c161
 F test/notify3.test 10ff25cde502e72a92053a2f215d64bece4ef934
 F test/notnull.test a37b663d5bb728d66fc182016613fb8e4a0a4bbf3d75b8876a7527f7d4ed3f18
-F test/null.test b7ff206a1c60fe01aa2abd33ef9ea83c93727d993ca8a613de86e925c9f2bc6f
+F test/null.test 0dcce4f04284ec66108c503327ad6d224c0752b3
 F test/nulls1.test 82c5bc33148405f21205865abf13c786084438d573a4ac4e87e11b6091cde526
 F test/numcast.test 5d126f7f581432e86a90d1e35cac625164aec4a1
 F test/numindex1.test 20a5450d4b056e48cd5db30e659f13347a099823
@@ -1317,7 +1313,7 @@ F test/schema6.test e4bd1f23d368695eb9e7b51ef6e02ca0642ea2ab4a52579959826b5e7dce
 F test/schemafault.test 1936bceca55ac82c5efbcc9fc91a1933e45c8d1e1d106b9a7e56c972a5a2a51e
 F test/securedel.test 2f70b2449186a1921bd01ec9da407fbfa98c3a7a5521854c300c194b2ff09384
 F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5
-F test/select1.test 0ed936740777f52858b6607f39ffac4b2b63b8fc7edf3ab2ebad3c3553ceecee
+F test/select1.test 009a6d8eacd9684d046302b8d13b50846a87e39d6f08e92178aa13e95ea29a2d
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test c49fbb758903f3718e2de5aa4655eda4838131cbea24a86db908f8b6889aa68c
 F test/select4.test e8a2502e3623f3058871030599a48abb35789d2244d5b380ecf3696873fdd4a4
@@ -1337,9 +1333,9 @@ F test/server1.test c2b00864514a68a0e6fd518659dc95d0050307a357a08969872bef027d78
 F test/session.test 78fa2365e93d3663a6e933f86e7afc395adf18be
 F test/sessionfuzz-data1.db 1f8d5def831f19b1c74571037f0d53a588ea49a6c4ca2a028fc0c27ef896dbcb
 F test/sessionfuzz.c f74c4e806bab5a093fb9c11b6123d17a6e0cf73fb7a0f49b12f5a75bf0b7b1a8
-F test/shared.test f022874d9d299fe913529dc10f52ad5a386e4e7ff709270b9b1111b3a0f3420a
+F test/shared.test 1826673eb5eb745fb91a3bdac99a7737057742ae38dcb0fe076a384d6727578b
 F test/shared2.test 03eb4a8d372e290107d34b6ce1809919a698e879
-F test/shared3.test f8cd07c1a2b7cdb315c01671a0b2f8e3830b11ef31da6baa9a9cd8da88965403
+F test/shared3.test ab693f9b6e156b8bfb2a0ad94f29fe69602a5d38
 F test/shared4.test c75f476804e76e26bf6fa0e7b421fb0ca7d07558
 F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
 F test/shared7.test a81e99f83e6c51b02ac99c96fb3a2a7b5978c956
@@ -1349,7 +1345,7 @@ F test/sharedA.test 49d87ec54ab640fbbc3786ee3c01de94aaa482a3a9f834ad3fe92770eb69
 F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell1.test 0ba53c72545de142e1b76fa793ee33293134aa02abb9b50b35398670481ea661
+F test/shell1.test 1305efc92f132a1fcf97c00ac02b1b192865b4d33d44cab499e0bdcff71ce045
 F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b
 F test/shell3.test ac8c2b744014c3e9a0e26bfd829ab65f00923dc1a91ffd044863e9423cc91494
 F test/shell4.test 1c6aef11daaa2d6830acaba3ac9cbec93fbc1c3d5530743a637f39b3987d08ce
@@ -1358,6 +1354,7 @@ F test/shell6.test 1ceb51b2678c472ba6cf1e5da96679ce8347889fe2c3bf93a0e0fa73f00b0
 F test/shell7.test 115132f66d0463417f408562cc2cf534f6bbc6d83a6d50f0072a9eb171bae97f
 F test/shell8.test 96be02ea0c21f05b24c1883d7b711a1fa8525a68ab7b636aacf6057876941013
 F test/shmlock.test 3dbf017d34ab0c60abe6a44e447d3552154bd0c87b41eaf5ceacd408dd13fda5
+F test/shmlockvtab.test b5f78b3de4bf111c173fd494ef1d962333f6afd4d6ccbfbef0425cf71aed3178
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5
 F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce
@@ -1365,7 +1362,7 @@ F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
 F test/skipscan1.test ed524bc86f27646b3a297f45d6557b55db338977b6838f8064b196b35848b31b
 F test/skipscan2.test 3eb703ce794f139e7b83567911046298bcde29606116727f9b700ce34f559d2d
 F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5
-F test/skipscan5.test 980875ad45d8aacfe7bdec7c288343520cd1d14e84befdcfe50c785f9e6c8709
+F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2
 F test/skipscan6.test 0b4cd1b4ac9f84d91454df513c99a4932fa07e8f27b8049bea605068b3e34ac7
 F test/snapshot.test a504f2e7009f512ef66c719f0ea1c55a556bdaf1e1312c80a04d46fc1a3e9632
 F test/snapshot2.test 8d6ff5dd9cc503f6e12d408a30409c3f9c653507b24408d9cd7195931c89bc54
@@ -1390,7 +1387,7 @@ F test/speed3.test 694affeb9100526007436334cf7d08f3d74b85ef
 F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715
 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 377a0c48e5a92e0b11c1c5ebb1bc9d83a7312c922bc0cb05970ef5d6a96d1f0c
-F test/speedtest1.c 849dbcb0bded9f966e43f28e8ce824b2915cb5dd0031a2e85996f7e3de36c2b1
+F test/speedtest1.c ac0e6ebadb97b54b7ac45288d1beea633a219d5fb98aa3395cb8364c31c985cb
 F test/spellfix.test 951a6405d49d1a23d6b78027d3877b4a33eeb8221dcab5704b499755bb4f552e
 F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
@@ -1406,7 +1403,7 @@ F test/subjournal.test 8d4e2572c0ee9a15549f0d8e40863161295107e52f07a3e8012a2e1fd
 F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
 F test/subquery2.test 90cf944b9de8204569cf656028391e4af1ccc8c0cc02d4ef38ee3be8de1ffb12
 F test/subselect.test 0966aa8e720224dbd6a5e769a3ec2a723e332303
-F test/substr.test a673e3763e247e9b5e497a6cacbaf3da2bd8ec8921c0677145c109f2e633f36b
+F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
 F test/subtype1.test 7fe09496352f97053af1437150751be2d0a0cae8
 F test/superlock.test ec94f0556b6488d97f71c79f9061ae08d9ab8f12
 F test/swarmvtab.test 9a3fd5ab3e9b3c976ad1b3d7646aab725114f2ac26b59395d0778b33bab6cdaf
@@ -1431,7 +1428,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl 754521f0db534d51ab504b2d14fe0bdca1f1c15de731ceb8ee5bfd78372a2a5f
+F test/tester.tcl 6417cbb60c4169804e2e1b36ce1a840c9f33d0b0d97956e058f3cc49ed3904f0
 F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1442,7 +1439,7 @@ F test/thread2.test f35d2106452b77523b3a2b7d1dcde2e5ee8f9e46
 F test/thread_common.tcl 334639cadcb9f912bf82aa73f49efd5282e6cadd
 F test/threadtest1.c 6029d9c5567db28e6dc908a0c63099c3ba6c383b
 F test/threadtest2.c a70a8e94bef23339d34226eb9521015ef99f4df8
-F test/threadtest3.c e63013af10cf236c7610eb06d33bde08c861806dc64be811940ff4d9ddd34a4f
+F test/threadtest3.c 38a612ea62854349ed66372f330a40d73c5cf956
 F test/threadtest4.c c1e67136ceb6c7ec8184e56ac61db28f96bd2925
 F test/time-wordcount.sh 8e0b0f8109367827ad5d58f5cc849705731e4b90
 F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
@@ -1538,7 +1535,7 @@ F test/tkt2817.test f31839e01f4243cff7399ef654d3af3558cb8d8d
 F test/tkt2820.test 39940276b3436d125deb7d8ebeee053e4cf13213
 F test/tkt2822.test f391776423a7c0d0949edfce375708bfb0f3141e
 F test/tkt2832.test a9b0b74a02dca166a04d9e37739c414b10929caa
-F test/tkt2854.test 47a2ae03bf36812f675ec06806a7b958e0de75312261dd8280c187f4a4a8281a
+F test/tkt2854.test e432965db29e27e16f539b2ba7f502eb2ccc49af
 F test/tkt2920.test a8737380e4ae6424e00c0273dc12775704efbebf
 F test/tkt2927.test 4752868b9eeeb07a217f7f19f4cbaac98d6d086d
 F test/tkt2942.test c5c87d179799ca6d1fbe83c815510b87cd5ec7ce
@@ -1572,8 +1569,8 @@ F test/tkt3761.test b95ea9c98f21cf91325f18a984887e62caceab33
 F test/tkt3762.test 4d439ff7abdc8d9323150269d182c37c2d514576
 F test/tkt3773.test 7bca904d2a647a6a4a291bd86d7fd7c73855b789
 F test/tkt3791.test a6624b9a80b216a26cf473607f42f3e51898c267
-F test/tkt3793.test 9ee9c6f300adce634e8990a131ad5e20e22241643a1240c6b372b351205ef7cb
-F test/tkt3810.test 3a3be9965d1861bd84019875851ad5ea90fd8d76b638361514a36a48ea53191b
+F test/tkt3793.test d90ffd75c52413908d15e1c44fc2ea9c80fcc449
+F test/tkt3810.test 09608d81c63a6ff3aaf7bc70717909c51f5f4048
 F test/tkt3824.test 150aa00bb6220672e5f0eb14dc8eaa36750425f0
 F test/tkt3832.test 2300d10d57562b89875b72148338ac3e14f8847d
 F test/tkt3838.test 292e72489101cd1320d7278dc111c173ebf334d4
@@ -1618,7 +1615,6 @@ F test/trustschema1.test 4e970aef0bfe0cee139703cc7209d0e0f07725d999b180ba50770f4
 F test/tt3_checkpoint.c 9e75cf7c1c364f52e1c47fd0f14c4340a9db0fe1
 F test/tt3_index.c 39eec10a35f57672225be4d182862152896dee4a
 F test/tt3_lookaside1.c 0377e202c3c2a50d688cb65ba203afeda6fafeb9
-F test/tt3_shared.c b37d22defc944a2ac4c91c927fd06c1d48cd51e2ce9d004fe868625bd2399f93
 F test/tt3_stress.c f9a769ca8b026ecc76ee93ca8c9700a5619f8e51c581107c4053ba6ac97f616f
 F test/tt3_vacuum.c 1753f45917699c9c1f66b64c717a717c9379f776
 F test/types.test bf816ce73c7dfcfe26b700c19f97ef4050d194ff
@@ -1655,7 +1651,7 @@ F test/vacuum5.test 263b144d537e92ad8e9ca8a73cc6e1583f41cfd0dda9432b87f7806174a2
 F test/vacuummem.test 7b42abb3208bd82dd23a7536588396f295a314f2
 F test/varint.test bbce22cda8fc4d135bcc2b589574be8410614e62
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
-F test/view.test fd48eddb32a35a98c3de70062ebac66ebf4a2bbfc75a1cc1109159ef8bfc47a9
+F test/view.test 10ea54300a097d7c0337fd104abffe4a4786d1598b94017a37efe0e0d3e04dd5
 F test/vtab1.test c5d9e90ed02bcacd776dcbb7360199d290f7f53c26b484ddece543060c54319f
 F test/vtab2.test 14d4ab26cee13ba6cf5c5601b158e4f57552d3b055cdd9406cf7f711e9c84082
 F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
@@ -1673,7 +1669,7 @@ F test/vtabE.test 2a143fe75a11275781d1fd1988d86b66a3f69cb98f4add62e3da8fd0f637b4
 F test/vtabF.test 1918844c7c902f6a16c8dacf1ec8f84886d6e78b
 F test/vtabH.test 2efb5a24b0bb50796b21eca23032cfb77abfa4b0c03938e38ce5897abac404ca
 F test/vtabI.test 751b07636700dbdea328e4265b6077ccd6811a3f
-F test/vtabJ.test a6aef49d558af90fae10565b29501f82a95781cb4f797f2d13e2d19f9b6bc77b
+F test/vtabJ.test d7b73675708cf63cfcb9d443bb451fc01a028347275b7311e51f9fdf3ca6757f
 F test/vtab_alter.test 736e66fb5ec7b4fee58229aa3ada2f27ec58bc58c00edae4836890c3784c6783
 F test/vtab_err.test dcc8b7b9cb67522b3fe7a272c73856829dae4ab7fdb30399aea1b6981bda2b65
 F test/vtab_shared.test 5253bff2355a9a3f014c15337da7e177ab0ef8ad
@@ -1725,13 +1721,13 @@ F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
 F test/where7.test 75722434c486ac9e74718caa6cce234f45ba34c0b6c0f9555b29eb8bb5f6ade1
 F test/where8.test 461ca40265ed996a6305da99bb024b0e41602bb586acf544c08f95922358e49f
 F test/where9.test 8e3e0ff42cc17156f52361a1c012281550d0d632912fec92d1d6df74db7a8e6d
-F test/whereA.test 9d1077b117f1b68d5f739d94f36956c36cf995eb87bb19b77b2e81af020edd20
+F test/whereA.test 6c6a420ca7d313242f9b1bd471dc80e4d0f8323700ba9c78df0bb843d4daa3b4
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/whereC.test cae295158703cb3fc23bf1a108a9ab730efff0f6
 F test/whereD.test c1c335e914e28b122e000e9310f02d2be83e1c9dbca2e29f46bd732703944d1b
 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
 F test/whereF.test 3d9412b1199d3e2bed34fcb76b4c48d0bf4df95d27e3f8dd27b6f8b4716d0d89
-F test/whereG.test 77127a4d214bb21da3b5c695cf4106cd9e418c60d9c24471ba55d3772067cd35
+F test/whereG.test 9363b2a97d914cb1b81aff5069ef0cf2a071a67e2b604eac6fe9c0114017d9aa
 F test/whereH.test e4b07f7a3c2f5d31195cd33710054c78667573b2
 F test/whereI.test a2874062140ed4aba9ffae76e6190a3df6fc73d1373fdfa8fd632945082a5364
 F test/whereJ.test 88287550f6ee604422403b053455b1ad894eeaa5c35d348532dfa1439286cb9a
@@ -1764,11 +1760,10 @@ F test/windowB.test 7a983ea1cc1cf72be7f378e4b32f6cb2d73014c5cd8b25aaee825164cd42
 F test/windowerr.tcl f5acd6fbc210d7b5546c0e879d157888455cd4a17a1d3f28f07c1c8a387019e0
 F test/windowerr.test a8b752402109c15aa1c5efe1b93ccb0ce1ef84fa964ae1cd6684dd0b3cc1819b
 F test/windowfault.test 72375ae71031eabf96bc88d0af128c8628a091ddc99b5a394e848b3df5fc17ad
-F test/with1.test 780be387f01e290e768bdfd1827280f9e37ba37223eb4736aba386864fac5a94
+F test/with1.test 584580a5ae79868a91873863f8cb2d00040006dc1e4c332ef1d8642f2815dc6e
 F test/with2.test e0030e2f0267a910d6c0e4f46f2dfe941c1cc0d4f659ba69b3597728e7e8f1ab
-F test/with3.test a261f0ea225c4af0ce6447f1157bb603959b2a665f14a03951c2883d2ef1c0f0
+F test/with3.test 13b3336739da648a9e4dfa11bb04e73a920c97620041007c5f75d5d14084c346
 F test/with4.test 257be66c0c67fee1defbbac0f685c3465e2cad037f21ce65f23f86084f198205
-F test/with5.test 6248213c41fab36290b5b73aa3f937309dfba337004d9d8434c3fabc8c7d4be8
 F test/withM.test 693b61765f2b387b5e3e24a4536e2e82de15ff64
 F test/without_rowid1.test e4034c0849ccc2e8bb749c69f15bd69bb9fcf8fe77e8d17ce02369604242fe83
 F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99
@@ -1785,7 +1780,7 @@ F test/zipfile.test 429cb81c518487fa1b644b6b04b6e9af704a4fa767bd1a110204c5f03b2e
 F test/zipfile2.test 9903388a602a3834189857a985106ff95c3bba6a3969e0134127df991889db5d
 F test/zipfilefault.test 44d4d7a7f7cca7521d569d7f71026b241d65a6b1757aa409c1a168827edbbc2c
 F tool/GetFile.cs 47852aa0d806fe47ed1ac5138bdce7f000fe87aaa7f28107d0cb1e26682aeb44
-F tool/GetTclKit.bat e95747c0f7a9fe279a9979178b71f6431a21f945b390fc3120244897ff3f5135
+F tool/GetTclKit.bat 8995df40c4209808b31f24de0b58f90930239a234f7591e3675d45bfbb990c5d
 F tool/Replace.cs 02c67258801c2fb5f63231e0ac0f220b4b36ba91
 F tool/build-all-msvc.bat c12328d06c45fec8baada5949e3d5af54bf8c887 x
 F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
@@ -1805,8 +1800,8 @@ F tool/genfkey.test b6afd7b825d797a1e1274f519ab5695373552ecad5cd373530c63533638a
 F tool/getlock.c f4c39b651370156cae979501a7b156bdba50e7ce
 F tool/index_usage.c f62a0c701b2c7ff2f3e21d206f093c123f222dbf07136a10ffd1ca15a5c706c5
 F tool/kvtest-speed.sh 4761a9c4b3530907562314d7757995787f7aef8f
-F tool/lemon.c 70eedc31614a58fe31a71025c17ebd1502a6ce9cfef0ed5e33acb0b5b737b291
-F tool/lempar.c 0e1d5eeb9736108d3dba782a9dd56f4e7cb69006b6ee181308b7ebfb15313a12
+F tool/lemon.c 01eff5008ba46e98f4b954317bfe57ea29b836e6d3e72e1bbdaad4ca3db501b3
+F tool/lempar.c dc1f5e8a0847c2257b0b069c61e290227062c4d75f5b5a0797b75b08b1c00405
 F tool/libvers.c caafc3b689638a1d88d44bc5f526c2278760d9b9
 F tool/loadfts.c c3c64e4d5e90e8ba41159232c2189dba4be7b862
 F tool/logest.c 11346aa019e2e77a00902aa7d0cabd27bd2e8cca
@@ -1824,7 +1819,7 @@ F tool/mkshellc.tcl 70a9978e363b0f3280ca9ce1c46d72563ff479c1930a12a7375e3881b732
 F tool/mksourceid.c 36aa8020014aed0836fd13c51d6dc9219b0df1761d6b5f58ff5b616211b079b9
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 4f7cfef5152b0c91920355cbfc1d608a4ad242cb819f1aea07f6d0274f584a7f
-F tool/mksqlite3c.tcl 00c4c0382eb000153182da2bee2547ca05554eeeed10177efe5894c54e4e6d4d
+F tool/mksqlite3c.tcl f4ef476510eca4124c874a72029f1e01bc54a896b1724e8f9eef0d8bfae0e84c
 F tool/mksqlite3h.tcl 1f5e4a1dbbbc43c83cc6e74fe32c6c620502240b66c7c0f33a51378e78fc4edf
 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
 F tool/mkvsix.tcl b9e0777a213c23156b6542842c238479e496ebf5
@@ -1851,7 +1846,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 7ce07da76b5e745783e703a834417d725b7d45fd
 F tool/split-sqlite3c.tcl 3efcd4240b738f6bb2b5af0aea7e1e0ef9bc1c61654f645076cec883030b710c
-F tool/sqldiff.c 4151108387cb56c08906e5ac8d6a353dcfe8fc6014eeded0f0910e2230ea0f5b
+F tool/sqldiff.c a3362140091b6d8a0771a589aaff147c114b13eb915927390587f0fa78c2040d
 F tool/sqlite3_analyzer.c.in 7eeaae8b0d7577662acaabbb11107af0659d1b41bc1dfdd4d91422de27127968
 F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
 F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
@@ -1886,10 +1881,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P a1a7a5f238fcfdcd56faba063e381258c9e2944d9b02b31d402a4207a607fc1c
-R 58ed0e2a70acf908b3c6a7c54bbafc77
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-3.34.1 *
-U drh
-Z 11054c73a336ca8fa32ae8cddcafd46b
+P 459de23e869c79357221100e81d2c8e0b812ed3260e58d7d7acb3419876f41a3
+R 637719ed77f67752632996ec57ddfff5
+U dan
+Z 75180f503b9702867928ecc1ca309dda
@@ -1 +1 @@
-10e20c0b43500cfb9bbc0eaa061c57514f715d87238f4d835880cd846b9ebd1f
+1c6a8442735e9f6117d7a8f1d88630958ec8fdb25a75cc392af1e8511a5fc56d
@@ -1196,21 +1196,13 @@ static int renameResolveTrigger(Parse *pParse){
        int i;
        for(i=0; i<pSrc->nSrc && rc==SQLITE_OK; i++){
          struct SrcList_item *p = &pSrc->a[i];
+          p->pTab = sqlite3LocateTableItem(pParse, 0, p);
          p->iCursor = pParse->nTab++;
-          if( p->pSelect ){
-            sqlite3SelectPrep(pParse, p->pSelect, 0);
-            sqlite3ExpandSubquery(pParse, p);
-            assert( i>0 );
-            assert( pStep->pFrom->a[i-1].pSelect );
-            sqlite3SelectPrep(pParse, pStep->pFrom->a[i-1].pSelect, 0);
+          if( p->pTab==0 ){
+            rc = SQLITE_ERROR;
          }else{
-            p->pTab = sqlite3LocateTableItem(pParse, 0, p);
-            if( p->pTab==0 ){
-              rc = SQLITE_ERROR;
-            }else{
-              p->pTab->nTabRef++;
-              rc = sqlite3ViewGetColumnNames(pParse, p->pTab);
-            }
+            p->pTab->nTabRef++;
+            rc = sqlite3ViewGetColumnNames(pParse, p->pTab);
          }
        }
        sNC.pSrcList = pSrc;
@@ -1272,12 +1264,6 @@ static void renameWalkTrigger(Walker *pWalker, Trigger *pTrigger){
      sqlite3WalkExpr(pWalker, pUpsert->pUpsertWhere);
      sqlite3WalkExpr(pWalker, pUpsert->pUpsertTargetWhere);
    }
-    if( pStep->pFrom ){
-      int i;
-      for(i=0; i<pStep->pFrom->nSrc; i++){
-        sqlite3WalkSelect(pWalker, pStep->pFrom->a[i].pSelect);
-      }
-    }
  }
 }

@@ -1772,7 +1772,6 @@ static int loadStatTbl(
    }
    pSpace = (tRowcnt*)&pIdx->aSample[nSample];
    pIdx->aAvgEq = pSpace; pSpace += nIdxCol;
-    pIdx->pTable->tabFlags |= TF_HasStat4;
    for(i=0; i<nSample; i++){
      pIdx->aSample[i].anEq = pSpace; pSpace += nIdxCol;
      pIdx->aSample[i].anLt = pSpace; pSpace += nIdxCol;
@@ -114,7 +114,7 @@ int sqlite3_enable_shared_cache(int enable){

 #ifdef SQLITE_DEBUG
 /*
-** Return and reset the seek counter for a Btree object.
+** Return an reset the seek counter for a Btree object.
 */
 sqlite3_uint64 sqlite3BtreeSeekCount(Btree *pBt){
  u64 n =  pBt->nSeek;
@@ -2616,7 +2616,7 @@ btree_open_out:
    ** do not change the pager-cache size.
    */
    if( sqlite3BtreeSchema(p, 0, 0)==0 ){
-      sqlite3BtreeSetCacheSize(p, SQLITE_DEFAULT_CACHE_SIZE);
+      sqlite3PagerSetCachesize(p->pBt->pPager, SQLITE_DEFAULT_CACHE_SIZE);
    }

    pFile = sqlite3PagerFile(pBt->pPager);
@@ -5750,7 +5750,7 @@ static SQLITE_NOINLINE int btreeNext(BtCursor *pCur){

  pPage = pCur->pPage;
  idx = ++pCur->ix;
-  if( !pPage->isInit || sqlite3FaultSim(412) ){
+  if( !pPage->isInit ){
    /* The only known way for this to happen is for there to be a
    ** recursive SQL function that does a DELETE operation as part of a
    ** SELECT which deletes content out from under an active cursor
@@ -87,22 +87,13 @@ int sqlite3BtreeBeginStmt(Btree*,int);
 int sqlite3BtreeCreateTable(Btree*, Pgno*, int flags);
 int sqlite3BtreeTxnState(Btree*);
 int sqlite3BtreeIsInBackup(Btree*);
-
 void *sqlite3BtreeSchema(Btree *, int, void(*)(void *));
 int sqlite3BtreeSchemaLocked(Btree *pBtree);
 #ifndef SQLITE_OMIT_SHARED_CACHE
 int sqlite3BtreeLockTable(Btree *pBtree, int iTab, u8 isWriteLock);
 #endif
-
-/* Savepoints are named, nestable SQL transactions mostly implemented */ 
-/* in vdbe.c and pager.c See https://sqlite.org/lang_savepoint.html */
 int sqlite3BtreeSavepoint(Btree *, int, int);

-/* "Checkpoint" only refers to WAL. See https://sqlite.org/wal.html#ckpt */
-#ifndef SQLITE_OMIT_WAL
-  int sqlite3BtreeCheckpoint(Btree*, int, int *, int *);  
-#endif
-
 const char *sqlite3BtreeGetFilename(Btree *);
 const char *sqlite3BtreeGetJournalname(Btree *);
 int sqlite3BtreeCopyFile(Btree *, Btree *);
@@ -1656,7 +1656,7 @@ void sqlite3AddCollateType(Parse *pParse, Token *pToken){
  char *zColl;              /* Dequoted name of collation sequence */
  sqlite3 *db;

-  if( (p = pParse->pNewTable)==0 || IN_RENAME_OBJECT ) return;
+  if( (p = pParse->pNewTable)==0 ) return;
  i = p->nCol-1;
  db = pParse->db;
  zColl = sqlite3NameFromToken(db, pToken);
@@ -1891,15 +1891,12 @@ static int resizeIndexObject(sqlite3 *db, Index *pIdx, int N){
  int nByte;
  if( pIdx->nColumn>=N ) return SQLITE_OK;
  assert( pIdx->isResized==0 );
-  nByte = (sizeof(char*) + sizeof(LogEst) + sizeof(i16) + 1)*N;
+  nByte = (sizeof(char*) + sizeof(i16) + 1)*N;
  zExtra = sqlite3DbMallocZero(db, nByte);
  if( zExtra==0 ) return SQLITE_NOMEM_BKPT;
  memcpy(zExtra, pIdx->azColl, sizeof(char*)*pIdx->nColumn);
  pIdx->azColl = (const char**)zExtra;
  zExtra += sizeof(char*)*N;
-  memcpy(zExtra, pIdx->aiRowLogEst, sizeof(LogEst)*(pIdx->nKeyCol+1));
-  pIdx->aiRowLogEst = (LogEst*)zExtra;
-  zExtra += sizeof(LogEst)*N;
  memcpy(zExtra, pIdx->aiColumn, sizeof(i16)*pIdx->nColumn);
  pIdx->aiColumn = (i16*)zExtra;
  zExtra += sizeof(i16)*N;
@@ -4460,7 +4457,7 @@ void sqlite3SrcListAssignCursors(Parse *pParse, SrcList *pList){
  assert(pList || pParse->db->mallocFailed );
  if( pList ){
    for(i=0, pItem=pList->a; i<pList->nSrc; i++, pItem++){
-      if( pItem->iCursor>=0 ) continue;
+      if( pItem->iCursor>=0 ) break;
      pItem->iCursor = pParse->nTab++;
      if( pItem->pSelect ){
        sqlite3SrcListAssignCursors(pParse, pItem->pSelect->pSrc);
@@ -4657,16 +4654,7 @@ void sqlite3BeginTransaction(Parse *pParse, int type){
  if( !v ) return;
  if( type!=TK_DEFERRED ){
    for(i=0; i<db->nDb; i++){
-      int eTxnType;
-      Btree *pBt = db->aDb[i].pBt;
-      if( pBt && sqlite3BtreeIsReadonly(pBt) ){
-        eTxnType = 0;  /* Read txn */
-      }else if( type==TK_EXCLUSIVE ){
-        eTxnType = 2;  /* Exclusive txn */
-      }else{
-        eTxnType = 1;  /* Write txn */
-      }
-      sqlite3VdbeAddOp2(v, OP_Transaction, i, eTxnType);
+      sqlite3VdbeAddOp2(v, OP_Transaction, i, (type==TK_EXCLUSIVE)+1);
      sqlite3VdbeUsesBtree(v, i);
    }
  }
@@ -942,6 +942,10 @@ int sqlite3GenerateIndexKey(
  }
  if( regOut ){
    sqlite3VdbeAddOp3(v, OP_MakeRecord, regBase, nCol, regOut);
+    if( pIdx->pTable->pSelect ){
+      const char *zAff = sqlite3IndexAffinityStr(pParse->db, pIdx);
+      sqlite3VdbeChangeP4(v, -1, zAff, P4_TRANSIENT);
+    }
  }
  sqlite3ReleaseTempRange(pParse, regBase, nCol);
  return regBase;
@@ -45,9 +45,7 @@ char sqlite3TableColumnAffinity(Table *pTab, int iCol){
 char sqlite3ExprAffinity(const Expr *pExpr){
  int op;
  while( ExprHasProperty(pExpr, EP_Skip|EP_IfNullRow) ){
-    assert( pExpr->op==TK_COLLATE
-         || pExpr->op==TK_IF_NULL_ROW
-         || (pExpr->op==TK_REGISTER && pExpr->op2==TK_IF_NULL_ROW) );
+    assert( pExpr->op==TK_COLLATE || pExpr->op==TK_IF_NULL_ROW );
    pExpr = pExpr->pLeft;
    assert( pExpr!=0 );
  }
@@ -3623,7 +3621,6 @@ void sqlite3ExprCodeMove(Parse *pParse, int iFrom, int iTo, int nReg){
 */
 static void exprToRegister(Expr *pExpr, int iReg){
  Expr *p = sqlite3ExprSkipCollateAndLikely(pExpr);
-  if( NEVER(p==0) ) return;
  p->op2 = p->op;
  p->op = TK_REGISTER;
  p->iTable = iReg;
@@ -4611,7 +4608,6 @@ int sqlite3ExprCodeTemp(Parse *pParse, Expr *pExpr, int *pReg){
  int r2;
  pExpr = sqlite3ExprSkipCollateAndLikely(pExpr);
  if( ConstFactorOk(pParse)
-   && ALWAYS(pExpr!=0)
   && pExpr->op!=TK_REGISTER
   && sqlite3ExprIsConstantNotJoin(pExpr)
  ){
@@ -1995,8 +1995,6 @@ void sqlite3RegisterBuiltinFunctions(void){
    FUNCTION(zeroblob,           1, 0, 0, zeroblobFunc     ),
    FUNCTION(substr,             2, 0, 0, substrFunc       ),
    FUNCTION(substr,             3, 0, 0, substrFunc       ),
-    FUNCTION(substring,          2, 0, 0, substrFunc       ),
-    FUNCTION(substring,          3, 0, 0, substrFunc       ),
    WAGGREGATE(sum,   1,0,0, sumStep, sumFinalize, sumFinalize, sumInverse, 0),
    WAGGREGATE(total, 1,0,0, sumStep,totalFinalize,totalFinalize,sumInverse, 0),
    WAGGREGATE(avg,   1,0,0, sumStep, avgFinalize, avgFinalize, sumInverse, 0),
@@ -478,8 +478,6 @@ static const sqlite3_api_routines sqlite3Apis = {
  sqlite3_create_filename,
  sqlite3_free_filename,
  sqlite3_database_file_object,
-  /* Version 3.34.0 and later */
-  sqlite3_txn_state,
 };

 /* True if x is the directory separator character
@@ -3852,9 +3852,7 @@ int sqlite3_file_control(sqlite3 *db, const char *zDbName, int op, void *pArg){
      }
      rc = SQLITE_OK;
    }else{
-      int nSave = db->busyHandler.nBusy;
      rc = sqlite3OsFileControl(fd, op, pArg);
-      db->busyHandler.nBusy = nSave;
    }
    sqlite3BtreeLeave(pBtree);
  }
@@ -474,17 +474,12 @@ void *sqlite3Realloc(void *pOld, u64 nBytes){
  if( nOld==nNew ){
    pNew = pOld;
  }else if( sqlite3GlobalConfig.bMemstat ){
-    sqlite3_int64 nUsed;
    sqlite3_mutex_enter(mem0.mutex);
    sqlite3StatusHighwater(SQLITE_STATUS_MALLOC_SIZE, (int)nBytes);
    nDiff = nNew - nOld;
-    if( nDiff>0 && (nUsed = sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED)) >= 
+    if( nDiff>0 && sqlite3StatusValue(SQLITE_STATUS_MEMORY_USED) >= 
          mem0.alarmThreshold-nDiff ){
      sqlite3MallocAlarm(nDiff);
-      if( mem0.hardLimit>0 && nUsed >= mem0.hardLimit - nDiff ){
-        sqlite3_mutex_leave(mem0.mutex);
-        return 0;
-      }
    }
    pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
 #ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT
@@ -791,15 +786,12 @@ void sqlite3OomClear(sqlite3 *db){
 }

 /*
-** Take actions at the end of an API call to deal with error codes.
+** Take actions at the end of an API call to indicate an OOM error
 */
-static SQLITE_NOINLINE int apiHandleError(sqlite3 *db, int rc){
-  if( db->mallocFailed || rc==SQLITE_IOERR_NOMEM ){
-    sqlite3OomClear(db);
-    sqlite3Error(db, SQLITE_NOMEM);
-    return SQLITE_NOMEM_BKPT;
-  }
-  return rc & db->errMask;
+static SQLITE_NOINLINE int apiOomError(sqlite3 *db){
+  sqlite3OomClear(db);
+  sqlite3Error(db, SQLITE_NOMEM);
+  return SQLITE_NOMEM_BKPT;
 }

 /*
@@ -821,8 +813,8 @@ int sqlite3ApiExit(sqlite3* db, int rc){
  */
  assert( db!=0 );
  assert( sqlite3_mutex_held(db->mutex) );
-  if( db->mallocFailed || rc ){
-    return apiHandleError(db, rc);
+  if( db->mallocFailed || rc==SQLITE_IOERR_NOMEM ){
+    return apiOomError(db);
  }
  return rc & db->errMask;
 }
@@ -126,14 +126,11 @@ static const sqlite3_io_methods memdb_io_methods = {
 ** Close an memdb-file.
 **
 ** The pData pointer is owned by the application, so there is nothing
-** to free.  Unless the SQLITE_DESERIALIZE_FREEONCLOSE flag is set,
-** in which case we own the pData pointer and need to free it.
+** to free.
 */
 static int memdbClose(sqlite3_file *pFile){
  MemFile *p = (MemFile *)pFile;
-  if( p->mFlags & SQLITE_DESERIALIZE_FREEONCLOSE ){
-    sqlite3_free(p->aData);
-  }
+  if( p->mFlags & SQLITE_DESERIALIZE_FREEONCLOSE ) sqlite3_free(p->aData);
  return SQLITE_OK;
 }

@@ -576,12 +573,8 @@ int sqlite3_deserialize(
    goto end_deserialize;
  }    
  zSql = sqlite3_mprintf("ATTACH x AS %Q", zSchema);
-  if( zSql==0 ){
-    rc = SQLITE_NOMEM;
-  }else{
-    rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
-    sqlite3_free(zSql);
-  }
+  rc = sqlite3_prepare_v2(db, zSql, -1, &pStmt, 0);
+  sqlite3_free(zSql);
  if( rc ) goto end_deserialize;
  db->init.iDb = (u8)iDb;
  db->init.reopenMemdb = 1;
@@ -596,7 +589,6 @@ int sqlite3_deserialize(
    rc = SQLITE_ERROR;
  }else{
    p->aData = pData;
-    pData = 0;
    p->sz = szDb;
    p->szAlloc = szBuf;
    p->szMax = szBuf;
@@ -609,9 +601,6 @@ int sqlite3_deserialize(

 end_deserialize:
  sqlite3_finalize(pStmt);
-  if( pData && (mFlags & SQLITE_DESERIALIZE_FREEONCLOSE)!=0 ){
-    sqlite3_free(pData);
-  }
  sqlite3_mutex_leave(db->mutex);
  return rc;
 }
@@ -229,6 +229,7 @@ struct unixFile {
  const char *zPath;                  /* Name of the file */
  unixShm *pShm;                      /* Shared memory segment information */
  int szChunk;                        /* Configured by FCNTL_CHUNK_SIZE */
+  char *zShmlockName;
 #if SQLITE_MAX_MMAP_SIZE>0
  int nFetchOut;                      /* Number of outstanding xFetch refs */
  sqlite3_int64 mmapSize;             /* Usable size of mapping at pMapRegion */
@@ -1545,9 +1546,6 @@ static int unixCheckReservedLock(sqlite3_file *id, int *pResOut){
  return rc;
 }

-/* Forward declaration*/
-static int unixSleep(sqlite3_vfs*,int);
-
 /*
 ** Set a posix-advisory-lock.
 **
@@ -1577,7 +1575,7 @@ static int osSetPosixAdvisoryLock(
    ** generic posix, however, there is no such API.  So we simply try the
    ** lock once every millisecond until either the timeout expires, or until
    ** the lock is obtained. */
-    unixSleep(0,1000);
+    usleep(1000);
    rc = osFcntl(h,F_SETLK,pLock);
    tm--;
  }
@@ -2115,6 +2113,7 @@ static int closeUnixFile(sqlite3_file *id){
  OSTRACE(("CLOSE   %-3d\n", pFile->h));
  OpenCounter(-1);
  sqlite3_free(pFile->pPreallocatedUnused);
+  sqlite3_free(pFile->zShmlockName);
  memset(pFile, 0, sizeof(unixFile));
  return SQLITE_OK;
 }
@@ -2148,7 +2147,6 @@ static int unixClose(sqlite3_file *id){
  }
  sqlite3_mutex_leave(pInode->pLockMutex);
  releaseInodeInfo(pFile);
-  assert( pFile->pShm==0 );
  rc = closeUnixFile(id);
  unixLeaveMutex();
  return rc;
@@ -3375,24 +3373,7 @@ static int unixRead(
  if( got==amt ){
    return SQLITE_OK;
  }else if( got<0 ){
-    /* pFile->lastErrno has been set by seekAndRead().
-    ** Usually we return SQLITE_IOERR_READ here, though for some
-    ** kinds of errors we return SQLITE_IOERR_CORRUPTFS.  The
-    ** SQLITE_IOERR_CORRUPTFS will be converted into SQLITE_CORRUPT
-    ** prior to returning to the application by the sqlite3ApiExit()
-    ** routine.
-    */
-    switch( pFile->lastErrno ){
-      case ERANGE:
-      case EIO:
-#ifdef ENXIO
-      case ENXIO:
-#endif
-#ifdef EDEVERR
-      case EDEVERR:
-#endif
-        return SQLITE_IOERR_CORRUPTFS;
-    }
+    /* lastErrno set by seekAndRead */
    return SQLITE_IOERR_READ;
  }else{
    storeLastErrno(pFile, 0);   /* not a system error */
@@ -3949,8 +3930,10 @@ static void unixModeBit(unixFile *pFile, unsigned char mask, int *pArg){
  }
 }

-/* Forward declaration */
+/* Forward declarations used by file-control implementations */
 static int unixGetTempname(int nBuf, char *zBuf);
+static int unixFcntlShmlockGet(unixFile *pFile, char **pzOut);
+static int unixFcntlShmlockName(unixFile *pFile, const char *zName);

 /*
 ** Information and control of an open file handle.
@@ -4067,6 +4050,16 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
      return proxyFileControl(id,op,pArg);
    }
 #endif /* SQLITE_ENABLE_LOCKING_STYLE && defined(__APPLE__) */
+#ifndef SQLITE_OMIT_WAL
+    case SQLITE_FCNTL_SHMLOCK_GET: {
+      char **pzOut = (char**)pArg;
+      return unixFcntlShmlockGet((unixFile*)id, pzOut);
+    }
+    case SQLITE_FCNTL_SHMLOCK_NAME: {
+      char *zName = (char*)pArg;
+      return unixFcntlShmlockName((unixFile*)id, zName);
+    }
+#endif
  }
  return SQLITE_NOTFOUND;
 }
@@ -4304,6 +4297,7 @@ struct unixShm {
  u8 id;                     /* Id of this connection within its unixShmNode */
  u16 sharedMask;            /* Mask of shared locks held */
  u16 exclMask;              /* Mask of exclusive locks held */
+  const char *zShmlockName;  /* Name to use for FCNTL_SHMLOCK_GET */
 };

 /*
@@ -4312,6 +4306,113 @@ struct unixShm {
 #define UNIX_SHM_BASE   ((22+SQLITE_SHM_NLOCK)*4)         /* first lock byte */
 #define UNIX_SHM_DMS    (UNIX_SHM_BASE+SQLITE_SHM_NLOCK)  /* deadman switch */

+/*
+** This is the implementation of the SQLITE_FCNTL_SHMLOCK_NAME file-control.
+*/
+static int unixFcntlShmlockName(unixFile *pFile, const char *zName){
+  int rc = SQLITE_OK;
+  assert( !pFile->pShm || pFile->pShm->zShmlockName==pFile->zShmlockName );
+  if( pFile->pShm ){
+    sqlite3_mutex_enter(pFile->pShm->pShmNode->pShmMutex);
+  }
+  sqlite3_free(pFile->zShmlockName);
+  pFile->zShmlockName = sqlite3_mprintf("%s", zName);
+  if( pFile->zShmlockName==0 ){
+    rc = SQLITE_NOMEM;
+  }
+  if( pFile->pShm ){
+    pFile->pShm->zShmlockName = pFile->zShmlockName;
+    sqlite3_mutex_leave(pFile->pShm->pShmNode->pShmMutex);
+  }
+  return rc;
+}
+
+/*
+** This is the implementation of the SQLITE_FCNTL_SHMLOCK_GET file-control.
+*/
+static int unixFcntlShmlockGet(unixFile *pFile, char **pzOut){
+  int rc = SQLITE_OK;
+  unixShm *p = pFile->pShm;
+  const char *aLockName[] = {
+    "WRITE", "CHECKPOINT", "RECOVER", 
+    "READ(0)", "READ(1)", "READ(2)", "READ(3)", "READ(4)"
+  };
+  assert( ArraySize(aLockName)==SQLITE_SHM_NLOCK );
+  if( p ){
+    sqlite3_str *pStr = sqlite3_str_new(0);
+    if( pStr==0 ){
+      rc = SQLITE_NOMEM_BKPT;
+    }else{
+      int nRow;
+      int i;
+      u32 aReadMark[5];
+      char *zOut = 0;
+      unixShm *pX = 0;
+      unixShmNode *pShmNode = p->pShmNode;
+      sqlite3_mutex_enter(pShmNode->pShmMutex);
+      memcpy(aReadMark, &(pShmNode->apRegion[0])[100], sizeof(aReadMark));
+      for(pX=pShmNode->pFirst; pX; pX=pX->pNext){
+        if( pX->exclMask|pX->sharedMask ){
+          char zBuf[32];
+          const char *zName = pX->zShmlockName;
+          if( zName==0 ){
+            sqlite3_snprintf(sizeof(zBuf), zBuf, "%p", (void*)pX);
+            zName = zBuf;
+          }
+          assert( (pX->exclMask & pX->sharedMask)==0 );
+          for(i=0; i<SQLITE_SHM_NLOCK; i++){
+            if( (1<<i) & (pX->exclMask|pX->sharedMask) ){
+              int bWrite = (1<<i) & pX->exclMask;
+              if( bWrite==0 && i>=3 ){
+                sqlite3_str_appendf(pStr, "%Q %Q 'R' '%d'\n", 
+                    zName, aLockName[i], aReadMark[i-3]
+                );
+              }else{
+                sqlite3_str_appendf(pStr, "%Q %Q %Q\n", 
+                    zName, aLockName[i], bWrite ? "W" : "R"
+                );
+              }
+              nRow++;
+            }
+          }
+        }
+      }
+      for(i=0; i<SQLITE_SHM_NLOCK; i++){
+        if( pShmNode->aLock[i]>=0 ){
+          struct flock lock;
+          lock.l_whence = SEEK_SET;
+          lock.l_start = UNIX_SHM_BASE+i;
+          lock.l_len = 1;
+          lock.l_type = F_WRLCK;
+          if( osFcntl(pShmNode->hShm, F_GETLK, &lock) ){
+            rc = SQLITE_IOERR_LOCK;
+          }else if( lock.l_type!=F_UNLCK ){
+            if( lock.l_type==F_RDLCK && i>=3 ){
+              sqlite3_str_appendf(pStr, "'pid.%d' %Q 'R' '%d'\n", 
+                  lock.l_pid, aLockName[i], aReadMark[i-3]
+              );
+            }else{
+              sqlite3_str_appendf(pStr, "'pid.%d' %Q %Q\n", 
+                  lock.l_pid, aLockName[i], lock.l_type==F_WRLCK ? "W" : "R"
+              );
+            }
+            nRow++;
+          }
+        }
+      }
+      sqlite3_mutex_leave(pShmNode->pShmMutex);
+      if( rc!=SQLITE_OK ){
+        sqlite3_free(sqlite3_str_finish(pStr));
+      }else{
+        rc = sqlite3_str_errcode(pStr);
+        zOut = sqlite3_str_finish(pStr);
+      }
+      *pzOut = zOut;
+    }
+  }
+  return rc;
+}
+
 /*
 ** Apply posix advisory locks for all bytes from ofst through ofst+n-1.
 **
@@ -4650,6 +4751,7 @@ static int unixOpenSharedMemory(unixFile *pDbFd){
  ** pShmNode->pShmMutex.
  */
  sqlite3_mutex_enter(pShmNode->pShmMutex);
+  p->zShmlockName = pDbFd->zShmlockName;
  p->pNext = pShmNode->pFirst;
  pShmNode->pFirst = p;
  sqlite3_mutex_leave(pShmNode->pShmMutex);
@@ -4924,7 +5026,7 @@ static int unixShmLock(
        if( rc==SQLITE_OK ){
          memset(&aLock[ofst], 0, sizeof(int)*n);
        }
-      }else if( ALWAYS(p->sharedMask & (1<<ofst)) ){
+      }else if( p->sharedMask & (1<<ofst) ){
        assert( n==1 && aLock[ofst]>1 );
        aLock[ofst]--;
      }
@@ -4957,7 +5059,7 @@ static int unixShmLock(
    int ii;
    for(ii=ofst; ii<ofst+n; ii++){
      assert( (p->sharedMask & mask)==0 );
-      if( ALWAYS((p->exclMask & (1<<ii))==0) && aLock[ii] ){
+      if( (p->exclMask & (1<<ii))==0 && aLock[ii] ){
        rc = SQLITE_BUSY;
        break;
      }
@@ -6353,26 +6455,7 @@ static int unixAccess(
 }

 /*
-** If the last component of the pathname in z[0]..z[j-1] is something
-** other than ".." then back it out and return true.  If the last
-** component is empty or if it is ".." then return false.
-*/
-static int unixBackupDir(const char *z, int *pJ){
-  int j = *pJ;
-  int i;
-  if( j<=0 ) return 0;
-  for(i=j-1; ALWAYS(i>0) && z[i-1]!='/'; i--){}
-  if( z[i]=='.' && i==j-2 && z[i+1]=='.' ) return 0;
-  *pJ = i-1;
-  return 1;
-}
-
-/*
-** Convert a relative pathname into a full pathname.  Also
-** simplify the pathname as follows:
 **
-**    Remove all instances of /./
-**    Remove all isntances of /X/../ for any X
 */
 static int mkFullPathname(
  const char *zPath,              /* Input path */
@@ -6381,7 +6464,6 @@ static int mkFullPathname(
 ){
  int nPath = sqlite3Strlen30(zPath);
  int iOff = 0;
-  int i, j;
  if( zPath[0]!='/' ){
    if( osGetcwd(zOut, nOut-2)==0 ){
      return unixLogError(SQLITE_CANTOPEN_BKPT, "getcwd", zPath);
@@ -6396,41 +6478,6 @@ static int mkFullPathname(
    return SQLITE_CANTOPEN_BKPT;
  }
  sqlite3_snprintf(nOut-iOff, &zOut[iOff], "%s", zPath);
-
-  /* Remove duplicate '/' characters.  Except, two // at the beginning
-  ** of a pathname is allowed since this is important on windows. */
-  for(i=j=1; zOut[i]; i++){
-    zOut[j++] = zOut[i];
-    while( zOut[i]=='/' && zOut[i+1]=='/' ) i++;
-  }
-  zOut[j] = 0;
-
-  assert( zOut[0]=='/' );
-  for(i=j=0; zOut[i]; i++){
-    if( zOut[i]=='/' ){
-      /* Skip over internal "/." directory components */
-      if( zOut[i+1]=='.' && zOut[i+2]=='/' ){
-        i += 1;
-        continue;
-      }
-
-      /* If this is a "/.." directory component then back out the
-      ** previous term of the directory if it is something other than "..".
-      */
-      if( zOut[i+1]=='.'
-       && zOut[i+2]=='.'
-       && zOut[i+3]=='/'
-       && unixBackupDir(zOut, &j)
-      ){
-        i += 2;
-        continue;
-      }
-    }
-    if( ALWAYS(j>=0) ) zOut[j] = zOut[i];
-    j++;
-  }
-  if( NEVER(j==0) ) zOut[j++] = '/';
-  zOut[j] = 0;
  return SQLITE_OK;
 }

@@ -6651,8 +6698,7 @@ static int unixSleep(sqlite3_vfs *NotUsed, int microseconds){
  UNUSED_PARAMETER(NotUsed);
  return microseconds;
 #elif defined(HAVE_USLEEP) && HAVE_USLEEP
-  if( microseconds>=1000000 ) sleep(microseconds/1000000);
-  if( microseconds%1000000 ) usleep(microseconds%1000000);
+  usleep(microseconds);
  UNUSED_PARAMETER(NotUsed);
  return microseconds;
 #else
@@ -7225,7 +7271,7 @@ static int proxyConchLock(unixFile *pFile, uuid_t myHostID, int lockType){
      
      if( nTries==1 ){
        conchModTime = buf.st_mtimespec;
-        unixSleep(0,500000); /* wait 0.5 sec and try the lock again*/
+        usleep(500000); /* wait 0.5 sec and try the lock again*/
        continue;  
      }

@@ -7251,7 +7297,7 @@ static int proxyConchLock(unixFile *pFile, uuid_t myHostID, int lockType){
          /* don't break the lock on short read or a version mismatch */
          return SQLITE_BUSY;
        }
-        unixSleep(0,10000000); /* wait 10 sec and try the lock again */
+        usleep(10000000); /* wait 10 sec and try the lock again */
        continue; 
      }
      
@@ -5126,11 +5126,7 @@ static int winOpen(
    dwCreationDisposition = OPEN_EXISTING;
  }

-  if( 0==sqlite3_uri_boolean(zName, "exclusive", 0) ){
-    dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;
-  }else{
-    dwShareMode = 0;
-  }
+  dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE;

  if( isDelete ){
 #if SQLITE_OS_WINCE
@@ -2486,7 +2486,6 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
  i64 nSuperJournal;        /* Size of super-journal file */
  char *zJournal;           /* Pointer to one journal within MJ file */
  char *zSuperPtr;          /* Space to hold super-journal filename */
-  char *zFree = 0;          /* Free this buffer */
  int nSuperPtr;            /* Amount of space allocated to zSuperPtr[] */

  /* Allocate space for both the pJournal and pSuper file descriptors.
@@ -2511,13 +2510,11 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
  rc = sqlite3OsFileSize(pSuper, &nSuperJournal);
  if( rc!=SQLITE_OK ) goto delsuper_out;
  nSuperPtr = pVfs->mxPathname+1;
-  zFree = sqlite3Malloc(4 + nSuperJournal + nSuperPtr + 2);
-  if( !zFree ){
+  zSuperJournal = sqlite3Malloc(nSuperJournal + nSuperPtr + 2);
+  if( !zSuperJournal ){
    rc = SQLITE_NOMEM_BKPT;
    goto delsuper_out;
  }
-  zFree[0] = zFree[1] = zFree[2] = zFree[3] = 0;
-  zSuperJournal = &zFree[4];
  zSuperPtr = &zSuperJournal[nSuperJournal+2];
  rc = sqlite3OsRead(pSuper, zSuperJournal, (int)nSuperJournal, 0);
  if( rc!=SQLITE_OK ) goto delsuper_out;
@@ -2565,7 +2562,7 @@ static int pager_delsuper(Pager *pPager, const char *zSuper){
  rc = sqlite3OsDelete(pVfs, zSuper, 0);

 delsuper_out:
-  sqlite3_free(zFree);
+  sqlite3_free(zSuperJournal);
  if( pSuper ){
    sqlite3OsClose(pSuper);
    assert( !isOpen(pJournal) );
@@ -2903,11 +2900,7 @@ end_playback:
  pPager->changeCountDone = pPager->tempFile;

  if( rc==SQLITE_OK ){
-    /* Leave 4 bytes of space before the super-journal filename in memory.
-    ** This is because it may end up being passed to sqlite3OsOpen(), in
-    ** which case it requires 4 0x00 bytes in memory immediately before
-    ** the filename. */
-    zSuper = &pPager->pTmpSpace[4];
+    zSuper = pPager->pTmpSpace;
    rc = readSuperJournal(pPager->jfd, zSuper, pPager->pVfs->mxPathname+1);
    testcase( rc!=SQLITE_OK );
  }
@@ -2924,8 +2917,6 @@ end_playback:
    /* If there was a super-journal and this routine will return success,
    ** see if it is possible to delete the super-journal.
    */
-    assert( zSuper==&pPager->pTmpSpace[4] );
-    memset(&zSuper[-4], 0, 4);
    rc = pager_delsuper(pPager, zSuper);
    testcase( rc!=SQLITE_OK );
  }
@@ -1453,7 +1453,7 @@ void sqlite3Pragma(
        aiCols = 0;
        if( pParent ){
          x = sqlite3FkLocateIndex(pParse, pParent, pFK, &pIdx, &aiCols);
-          assert( x==0 || db->mallocFailed );
+          assert( x==0 );
        }
        addrOk = sqlite3VdbeMakeLabel(pParse);

@@ -1478,7 +1478,7 @@ void sqlite3Pragma(
          int jmp = sqlite3VdbeCurrentAddr(v)+2;
          sqlite3VdbeAddOp3(v, OP_SeekRowid, i, jmp, regRow); VdbeCoverage(v);
          sqlite3VdbeGoto(v, addrOk);
-          assert( pFK->nCol==1 || db->mallocFailed );
+          assert( pFK->nCol==1 );
        }

        /* Generate code to report an FK violation to the caller. */
@@ -746,7 +746,6 @@ static int sqlite3LockAndPrepare(
  sqlite3BtreeLeaveAll(db);
  rc = sqlite3ApiExit(db, rc);
  assert( (rc&db->errMask)==rc );
-  db->busyHandler.nBusy = 0;
  sqlite3_mutex_leave(db->mutex);
  return rc;
 }
@@ -1284,7 +1284,6 @@ static int resolveCompoundOrderBy(
      Expr *pE, *pDup;
      if( pItem->done ) continue;
      pE = sqlite3ExprSkipCollateAndLikely(pItem->pExpr);
-      if( NEVER(pE==0) ) continue;
      if( sqlite3ExprIsInteger(pE, &iCol) ){
        if( iCol<=0 || iCol>pEList->nExpr ){
          resolveOutOfRangeError(pParse, "ORDER", i+1, pEList->nExpr);
@@ -1464,7 +1463,6 @@ static int resolveOrderGroupBy(
  for(i=0, pItem=pOrderBy->a; i<pOrderBy->nExpr; i++, pItem++){
    Expr *pE = pItem->pExpr;
    Expr *pE2 = sqlite3ExprSkipCollateAndLikely(pE);
-    if( NEVER(pE2==0) ) continue;
    if( zType[0]!='G' ){
      iCol = resolveAsName(pParse, pSelect->pEList, pE2);
      if( iCol>0 ){
@@ -1972,7 +1972,6 @@ int sqlite3ColumnsFromExprList(
  char *zName;                /* Column name */
  int nName;                  /* Size of name in zName[] */
  Hash ht;                    /* Hash table of column names */
-  Table *pTab;

  sqlite3HashInit(&ht);
  if( pEList ){
@@ -1995,13 +1994,15 @@ int sqlite3ColumnsFromExprList(
      /* If the column contains an "AS <name>" phrase, use <name> as the name */
    }else{
      Expr *pColExpr = sqlite3ExprSkipCollateAndLikely(pEList->a[i].pExpr);
-      while( ALWAYS(pColExpr!=0) && pColExpr->op==TK_DOT ){
+      while( pColExpr->op==TK_DOT ){
        pColExpr = pColExpr->pRight;
        assert( pColExpr!=0 );
      }
-      if( pColExpr->op==TK_COLUMN && (pTab = pColExpr->y.pTab)!=0 ){
+      if( pColExpr->op==TK_COLUMN ){
        /* For columns use the column name name */
        int iCol = pColExpr->iColumn;
+        Table *pTab = pColExpr->y.pTab;
+        assert( pTab!=0 );
        if( iCol<0 ) iCol = pTab->iPKey;
        zName = iCol>=0 ? pTab->aCol[iCol].zName : "rowid";
      }else if( pColExpr->op==TK_ID ){
@@ -2339,7 +2340,6 @@ static void generateWithRecursiveQuery(
  int nCol = p->pEList->nExpr;  /* Number of columns in the recursive table */
  Vdbe *v = pParse->pVdbe;      /* The prepared statement under construction */
  Select *pSetup = p->pPrior;   /* The setup query */
-  Select *pFirstRec;            /* Left-most recursive term */
  int addrTop;                  /* Top of the loop */
  int addrCont, addrBreak;      /* CONTINUE and BREAK addresses */
  int iCurrent = 0;             /* The Current table */
@@ -2415,25 +2415,7 @@ static void generateWithRecursiveQuery(
  /* Detach the ORDER BY clause from the compound SELECT */
  p->pOrderBy = 0;

-  /* Figure out how many elements of the compound SELECT are part of the
-  ** recursive query.  Make sure no recursive elements use aggregate
-  ** functions.  Mark the recursive elements as UNION ALL even if they
-  ** are really UNION because the distinctness will be enforced by the
-  ** iDistinct table.  pFirstRec is left pointing to the left-most
-  ** recursive term of the CTE.
-  */
-  pFirstRec = p;
-  for(pFirstRec=p; ALWAYS(pFirstRec!=0); pFirstRec=pFirstRec->pPrior){
-    if( pFirstRec->selFlags & SF_Aggregate ){
-      sqlite3ErrorMsg(pParse, "recursive aggregate queries not supported");
-      goto end_of_recursive_query;
-    }
-    pFirstRec->op = TK_ALL;
-    if( (pFirstRec->pPrior->selFlags & SF_Recursive)==0 ) break;
-  }
-
  /* Store the results of the setup-query in Queue. */
-  pSetup = pFirstRec->pPrior;
  pSetup->pNext = 0;
  ExplainQueryPlan((pParse, 1, "SETUP"));
  rc = sqlite3Select(pParse, pSetup, &destQueue);
@@ -2466,11 +2448,15 @@ static void generateWithRecursiveQuery(
  /* Execute the recursive SELECT taking the single row in Current as
  ** the value for the recursive-table. Store the results in the Queue.
  */
-  pFirstRec->pPrior = 0;
-  ExplainQueryPlan((pParse, 1, "RECURSIVE STEP"));
-  sqlite3Select(pParse, p, &destQueue);
-  assert( pFirstRec->pPrior==0 );
-  pFirstRec->pPrior = pSetup;
+  if( p->selFlags & SF_Aggregate ){
+    sqlite3ErrorMsg(pParse, "recursive aggregate queries not supported");
+  }else{
+    p->pPrior = 0;
+    ExplainQueryPlan((pParse, 1, "RECURSIVE STEP"));
+    sqlite3Select(pParse, p, &destQueue);
+    assert( p->pPrior==0 );
+    p->pPrior = pSetup;
+  }

  /* Keep running the loop until the Queue is empty */
  sqlite3VdbeGoto(v, addrTop);
@@ -2539,16 +2525,6 @@ static int multiSelectValues(
  return rc;
 }

-/*
-** Return true if the SELECT statement which is known to be the recursive
-** part of a recursive CTE still has its anchor terms attached.  If the
-** anchor terms have already been removed, then return false.
-*/
-static int hasAnchor(Select *p){
-  while( p && (p->selFlags & SF_Recursive)!=0 ){ p = p->pPrior; }
-  return p!=0;
-}
-
 /*
 ** This routine is called to process a compound query form from
 ** two or more separate queries using UNION, UNION ALL, EXCEPT, or
@@ -2634,7 +2610,7 @@ static int multiSelect(
  assert( p->pEList->nExpr==pPrior->pEList->nExpr );

 #ifndef SQLITE_OMIT_CTE
-  if( (p->selFlags & SF_Recursive)!=0 && hasAnchor(p) ){
+  if( p->selFlags & SF_Recursive ){
    generateWithRecursiveQuery(pParse, p, &dest);
  }else
 #endif
@@ -2725,7 +2701,6 @@ static int multiSelect(
          findRightmost(p)->selFlags |= SF_UsesEphemeral;
          assert( p->pEList );
        }
-          
  
        /* Code the SELECT statements to our left
        */
@@ -3540,7 +3515,8 @@ static Expr *substExpr(
          ExprSetProperty(pNew, EP_CanBeNull);
        }
        if( pNew && ExprHasProperty(pExpr,EP_FromJoin) ){
-          sqlite3SetJoinExpr(pNew, pExpr->iRightJoinTable);
+          pNew->iRightJoinTable = pExpr->iRightJoinTable;
+          ExprSetProperty(pNew, EP_FromJoin);
        }
        sqlite3ExprDelete(db, pExpr);
        pExpr = pNew;
@@ -4819,10 +4795,8 @@ static int withExpand(
    ExprList *pEList;
    Select *pSel;
    Select *pLeft;                /* Left-most SELECT statement */
-    Select *pRecTerm;             /* Left-most recursive term */
    int bMayRecursive;            /* True if compound joined by UNION [ALL] */
    With *pSavedWith;             /* Initial value of pParse->pWith */
-    int iRecTab = -1;             /* Cursor for recursive table */

    /* If pCte->zCteErr is non-NULL at this point, then this is an illegal
    ** recursive reference to CTE pCte. Leave an error in pParse and return
@@ -4847,48 +4821,44 @@ static int withExpand(
    assert( pFrom->pSelect );

    /* Check if this is a recursive CTE. */
-    pRecTerm = pSel = pFrom->pSelect;
+    pSel = pFrom->pSelect;
    bMayRecursive = ( pSel->op==TK_ALL || pSel->op==TK_UNION );
-    while( bMayRecursive && pRecTerm->op==pSel->op ){
+    if( bMayRecursive ){
      int i;
-      SrcList *pSrc = pRecTerm->pSrc;
-      assert( pRecTerm->pPrior!=0 );
+      SrcList *pSrc = pFrom->pSelect->pSrc;
      for(i=0; i<pSrc->nSrc; i++){
        struct SrcList_item *pItem = &pSrc->a[i];
        if( pItem->zDatabase==0 
         && pItem->zName!=0 
         && 0==sqlite3StrICmp(pItem->zName, pCte->zName)
-        ){
+          ){
          pItem->pTab = pTab;
-          pTab->nTabRef++;
          pItem->fg.isRecursive = 1;
-          if( pRecTerm->selFlags & SF_Recursive ){
-            sqlite3ErrorMsg(pParse,
-               "multiple references to recursive table: %s", pCte->zName
-            );
-            return SQLITE_ERROR;
-          }
-          pRecTerm->selFlags |= SF_Recursive;
-          if( iRecTab<0 ) iRecTab = pParse->nTab++;
-          pItem->iCursor = iRecTab;
+          pTab->nTabRef++;
+          pSel->selFlags |= SF_Recursive;
        }
      }
-      if( (pRecTerm->selFlags & SF_Recursive)==0 ) break;
-      pRecTerm = pRecTerm->pPrior;
    }

+    /* Only one recursive reference is permitted. */ 
+    if( pTab->nTabRef>2 ){
+      sqlite3ErrorMsg(
+          pParse, "multiple references to recursive table: %s", pCte->zName
+      );
+      return SQLITE_ERROR;
+    }
+    assert( pTab->nTabRef==1 || 
+            ((pSel->selFlags&SF_Recursive) && pTab->nTabRef==2 ));
+
    pCte->zCteErr = "circular reference: %s";
    pSavedWith = pParse->pWith;
    pParse->pWith = pWith;
-    if( pSel->selFlags & SF_Recursive ){
-      assert( pRecTerm!=0 );
-      assert( (pRecTerm->selFlags & SF_Recursive)==0 );
-      assert( pRecTerm->pNext!=0 );
-      assert( (pRecTerm->pNext->selFlags & SF_Recursive)!=0 );
-      assert( pRecTerm->pWith==0 );
-      pRecTerm->pWith = pSel->pWith;
-      sqlite3WalkSelect(pWalker, pRecTerm);
-      pRecTerm->pWith = 0;
+    if( bMayRecursive ){
+      Select *pPrior = pSel->pPrior;
+      assert( pPrior->pWith==0 );
+      pPrior->pWith = pSel->pWith;
+      sqlite3WalkSelect(pWalker, pPrior);
+      pPrior->pWith = 0;
    }else{
      sqlite3WalkSelect(pWalker, pSel);
    }
@@ -5615,9 +5585,7 @@ static void explainSimpleCount(
 static int havingToWhereExprCb(Walker *pWalker, Expr *pExpr){
  if( pExpr->op!=TK_AND ){
    Select *pS = pWalker->u.pSelect;
-    if( sqlite3ExprIsConstantOrGroupBy(pWalker->pParse, pExpr, pS->pGroupBy) 
-     && ExprAlwaysFalse(pExpr)==0
-    ){
+    if( sqlite3ExprIsConstantOrGroupBy(pWalker->pParse, pExpr, pS->pGroupBy) ){
      sqlite3 *db = pWalker->pParse->db;
      Expr *pNew = sqlite3Expr(db, TK_INTEGER, "1");
      if( pNew ){
@@ -5840,11 +5808,13 @@ int sqlite3Select(
  assert( p->pOrderBy==0 || pDest->eDest!=SRT_Fifo );
  assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistQueue );
  assert( p->pOrderBy==0 || pDest->eDest!=SRT_Queue );
-  if( IgnorableDistinct(pDest) ){
-    assert(pDest->eDest==SRT_Exists     || pDest->eDest==SRT_Union || 
-           pDest->eDest==SRT_Except     || pDest->eDest==SRT_Discard ||
-           pDest->eDest==SRT_DistQueue  || pDest->eDest==SRT_DistFifo );
-    /* All of these destinations are also able to ignore the ORDER BY clause */
+  if( IgnorableOrderby(pDest) ){
+    assert(pDest->eDest==SRT_Exists || pDest->eDest==SRT_Union || 
+           pDest->eDest==SRT_Except || pDest->eDest==SRT_Discard ||
+           pDest->eDest==SRT_Queue  || pDest->eDest==SRT_DistFifo ||
+           pDest->eDest==SRT_DistQueue || pDest->eDest==SRT_Fifo);
+    /* If ORDER BY makes no difference in the output then neither does
+    ** DISTINCT so it can be removed too. */
    sqlite3ExprListDelete(db, p->pOrderBy);
    p->pOrderBy = 0;
    p->selFlags &= ~SF_Distinct;
@@ -553,6 +553,8 @@ static void utf8_width_print(FILE *pOut, int w, const char *zUtf){
  int i;
  int n;
  int aw = w<0 ? -w : w;
+  char zBuf[1000];
+  if( aw>(int)sizeof(zBuf)/3 ) aw = (int)sizeof(zBuf)/3;
  for(i=n=0; zUtf[i]; i++){
    if( (zUtf[i]&0xc0)!=0x80 ){
      n++;
@@ -1184,8 +1186,6 @@ struct ShellState {
 #define SHFLG_CountChanges   0x00000020 /* .changes setting */
 #define SHFLG_Echo           0x00000040 /* .echo or --echo setting */
 #define SHFLG_HeaderSet      0x00000080 /* .header has been used */
-#define SHFLG_DumpDataOnly   0x00000100 /* .dump show data only */
-#define SHFLG_DumpNoSys      0x00000200 /* .dump omits system tables */

 /*
 ** Macros for testing and setting shellFlgs
@@ -3706,25 +3706,19 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azNotUsed){
  const char *zType;
  const char *zSql;
  ShellState *p = (ShellState *)pArg;
-  int dataOnly;
-  int noSys;

  UNUSED_PARAMETER(azNotUsed);
  if( nArg!=3 || azArg==0 ) return 0;
  zTable = azArg[0];
  zType = azArg[1];
  zSql = azArg[2];
-  dataOnly = (p->shellFlgs & SHFLG_DumpDataOnly)!=0;
-  noSys    = (p->shellFlgs & SHFLG_DumpNoSys)!=0;

-  if( strcmp(zTable, "sqlite_sequence")==0 && !noSys ){
-    if( !dataOnly ) raw_printf(p->out, "DELETE FROM sqlite_sequence;\n");
-  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 && !noSys ){
-    if( !dataOnly ) raw_printf(p->out, "ANALYZE sqlite_schema;\n");
+  if( strcmp(zTable, "sqlite_sequence")==0 ){
+    raw_printf(p->out, "DELETE FROM sqlite_sequence;\n");
+  }else if( sqlite3_strglob("sqlite_stat?", zTable)==0 ){
+    raw_printf(p->out, "ANALYZE sqlite_schema;\n");
  }else if( strncmp(zTable, "sqlite_", 7)==0 ){
    return 0;
-  }else if( dataOnly ){
-    /* no-op */
  }else if( strncmp(zSql, "CREATE VIRTUAL TABLE", 20)==0 ){
    char *zIns;
    if( !p->writableSchema ){
@@ -3897,10 +3891,8 @@ static const char *(azHelp[]) = {
  ".dbinfo ?DB?             Show status information about the database",
  ".dump ?TABLE?            Render database content as SQL",
  "   Options:",
-  "     --data-only            Output only INSERT statements",
-  "     --newlines             Allow unescaped newline characters in output",
-  "     --nosys                Omit system tables (ex: \"sqlite_stat1\")",
  "     --preserve-rowids      Include ROWID values in the output",
+  "     --newlines             Allow unescaped newline characters in output",
  "   TABLE is a LIKE pattern for the tables to dump",
  "   Additional LIKE patterns can be given in subsequent arguments",
  ".echo on|off             Turn command echo on or off",
@@ -4025,9 +4017,8 @@ static const char *(azHelp[]) = {
  ".save FILE               Write in-memory database into FILE",
  ".scanstats on|off        Turn sqlite3_stmt_scanstatus() metrics on or off",
  ".schema ?PATTERN?        Show the CREATE statements matching PATTERN",
-  "   Options:",
-  "      --indent             Try to pretty-print the schema",
-  "      --nosys              Omit objects whose names start with \"sqlite_\"",
+  "     Options:",
+  "         --indent            Try to pretty-print the schema",
  ".selftest ?OPTIONS?      Run tests defined in the SELFTEST table",
  "    Options:",
  "       --init               Create a new SELFTEST table",
@@ -4436,20 +4427,6 @@ static void shellIdQuote(
  }
 }

-/*
-** Scalar function "usleep(X)" invokes sqlite3_sleep(X) and returns X.
-*/
-static void shellUSleepFunc(
-  sqlite3_context *context, 
-  int argcUnused, 
-  sqlite3_value **argv
-){
-  int sleep = sqlite3_value_int(argv[0]);
-  (void)argcUnused;
-  sqlite3_sleep(sleep/1000);
-  sqlite3_result_int(context, sleep);
-}
-
 /*
 ** Scalar function "shell_escape_crnl" used by the .recover command.
 ** The argument passed to this function is the output of built-in
@@ -4634,8 +4611,6 @@ static void open_db(ShellState *p, int openFlags){
                            shellInt32, 0, 0);
    sqlite3_create_function(p->db, "shell_idquote", 1, SQLITE_UTF8, 0,
                            shellIdQuote, 0, 0);
-    sqlite3_create_function(p->db, "usleep",1,SQLITE_UTF8,0,
-                            shellUSleepFunc, 0, 0);
 #ifndef SQLITE_NOHAVE_SYSTEM
    sqlite3_create_function(p->db, "edit", 1, SQLITE_UTF8, 0,
                            editFunc, 0, 0);
@@ -7703,9 +7678,7 @@ static int do_meta_command(char *zLine, ShellState *p){
    int i;
    int savedShowHeader = p->showHeader;
    int savedShellFlags = p->shellFlgs;
-    ShellClearFlag(p, 
-       SHFLG_PreserveRowid|SHFLG_Newlines|SHFLG_Echo
-       |SHFLG_DumpDataOnly|SHFLG_DumpNoSys);
+    ShellClearFlag(p, SHFLG_PreserveRowid|SHFLG_Newlines|SHFLG_Echo);
    for(i=1; i<nArg; i++){
      if( azArg[i][0]=='-' ){
        const char *z = azArg[i]+1;
@@ -7724,12 +7697,6 @@ static int do_meta_command(char *zLine, ShellState *p){
        if( strcmp(z,"newlines")==0 ){
          ShellSetFlag(p, SHFLG_Newlines);
        }else
-        if( strcmp(z,"data-only")==0 ){
-          ShellSetFlag(p, SHFLG_DumpDataOnly);
-        }else
-        if( strcmp(z,"nosys")==0 ){
-          ShellSetFlag(p, SHFLG_DumpNoSys);
-        }else
        {
          raw_printf(stderr, "Unknown option \"%s\" on \".dump\"\n", azArg[i]);
          rc = 1;
@@ -7746,13 +7713,11 @@ static int do_meta_command(char *zLine, ShellState *p){

    open_db(p, 0);

-    if( (p->shellFlgs & SHFLG_DumpDataOnly)==0 ){
-      /* When playing back a "dump", the content might appear in an order
-      ** which causes immediate foreign key constraints to be violated.
-      ** So disable foreign-key constraint enforcement to prevent problems. */
-      raw_printf(p->out, "PRAGMA foreign_keys=OFF;\n");
-      raw_printf(p->out, "BEGIN TRANSACTION;\n");
-    }
+    /* When playing back a "dump", the content might appear in an order
+    ** which causes immediate foreign key constraints to be violated.
+    ** So disable foreign-key constraint enforcement to prevent problems. */
+    raw_printf(p->out, "PRAGMA foreign_keys=OFF;\n");
+    raw_printf(p->out, "BEGIN TRANSACTION;\n");
    p->writableSchema = 0;
    p->showHeader = 0;
    /* Set writable_schema=ON since doing so forces SQLite to initialize
@@ -7770,16 +7735,14 @@ static int do_meta_command(char *zLine, ShellState *p){
    );
    run_schema_dump_query(p,zSql);
    sqlite3_free(zSql);
-    if( (p->shellFlgs & SHFLG_DumpDataOnly)==0 ){
-      zSql = sqlite3_mprintf(
-        "SELECT sql FROM sqlite_schema "
-        "WHERE (%s) AND sql NOT NULL"
-        "  AND type IN ('index','trigger','view')",
-        zLike
-      );
-      run_table_dump_query(p, zSql);
-      sqlite3_free(zSql);
-    }
+    zSql = sqlite3_mprintf(
+      "SELECT sql FROM sqlite_schema "
+      "WHERE (%s) AND sql NOT NULL"
+      "  AND type IN ('index','trigger','view')",
+      zLike
+    );
+    run_table_dump_query(p, zSql);
+    sqlite3_free(zSql);
    sqlite3_free(zLike);
    if( p->writableSchema ){
      raw_printf(p->out, "PRAGMA writable_schema=OFF;\n");
@@ -7787,9 +7750,7 @@ static int do_meta_command(char *zLine, ShellState *p){
    }
    sqlite3_exec(p->db, "PRAGMA writable_schema=OFF;", 0, 0, 0);
    sqlite3_exec(p->db, "RELEASE dump;", 0, 0, 0);
-    if( (p->shellFlgs & SHFLG_DumpDataOnly)==0 ){
-      raw_printf(p->out, p->nErr?"ROLLBACK; -- due to errors\n":"COMMIT;\n");
-    }
+    raw_printf(p->out, p->nErr?"ROLLBACK; -- due to errors\n":"COMMIT;\n");
    p->showHeader = savedShowHeader;
    p->shellFlgs = savedShellFlags;
  }else
@@ -8228,7 +8189,7 @@ static int do_meta_command(char *zLine, ShellState *p){
    while( (nSkip--)>0 ){
      while( xRead(&sCtx) && sCtx.cTerm==sCtx.cColSep ){}
    }
-    zSql = sqlite3_mprintf("SELECT * FROM \"%w\"", zTable);
+    zSql = sqlite3_mprintf("SELECT * FROM %s", zTable);
    if( zSql==0 ){
      import_cleanup(&sCtx);
      shell_out_of_memory();
@@ -8237,7 +8198,7 @@ static int do_meta_command(char *zLine, ShellState *p){
    rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, 0);
    import_append_char(&sCtx, 0);    /* To ensure sCtx.z is allocated */
    if( rc && sqlite3_strglob("no such table: *", sqlite3_errmsg(p->db))==0 ){
-      char *zCreate = sqlite3_mprintf("CREATE TABLE \"%w\"", zTable);
+      char *zCreate = sqlite3_mprintf("CREATE TABLE %s", zTable);
      char cSep = '(';
      while( xRead(&sCtx) ){
        zCreate = sqlite3_mprintf("%z%c\n  \"%w\" TEXT", zCreate, cSep, sCtx.z);
@@ -8258,7 +8219,7 @@ static int do_meta_command(char *zLine, ShellState *p){
      rc = sqlite3_exec(p->db, zCreate, 0, 0, 0);
      sqlite3_free(zCreate);
      if( rc ){
-        utf8_printf(stderr, "CREATE TABLE \"%s\"(...) failed: %s\n", zTable,
+        utf8_printf(stderr, "CREATE TABLE %s(...) failed: %s\n", zTable,
                sqlite3_errmsg(p->db));
        import_cleanup(&sCtx);
        rc = 1;
@@ -9114,7 +9075,6 @@ static int do_meta_command(char *zLine, ShellState *p){
    const char *zName = 0;
    int iSchema = 0;
    int bDebug = 0;
-    int bNoSystemTabs = 0;
    int ii;

    open_db(p, 0);
@@ -9127,16 +9087,10 @@ static int do_meta_command(char *zLine, ShellState *p){
        data.cMode = data.mode = MODE_Pretty;
      }else if( optionMatch(azArg[ii],"debug") ){
        bDebug = 1;
-      }else if( optionMatch(azArg[ii],"nosys") ){
-        bNoSystemTabs = 1;
-      }else if( azArg[ii][0]=='-' ){
-        utf8_printf(stderr, "Unknown option: \"%s\"\n", azArg[ii]);
-        rc = 1;
-        goto meta_command_exit;
      }else if( zName==0 ){
        zName = azArg[ii];
      }else{
-        raw_printf(stderr, "Usage: .schema ?--indent? ?--nosys? ?LIKE-PATTERN?\n");
+        raw_printf(stderr, "Usage: .schema ?--indent? ?LIKE-PATTERN?\n");
        rc = 1;
        goto meta_command_exit;
      }
@@ -9222,10 +9176,7 @@ static int do_meta_command(char *zLine, ShellState *p){
        appendText(&sSelect, " AND ", 0);
        sqlite3_free(zQarg);
      }
-      if( bNoSystemTabs ){
-        appendText(&sSelect, "name NOT LIKE 'sqlite_%%' AND ", 0);
-      }
-      appendText(&sSelect, "sql IS NOT NULL"
+      appendText(&sSelect, "type!='meta' AND sql IS NOT NULL"
                           " ORDER BY snum, rowid", 0);
      if( bDebug ){
        utf8_printf(p->out, "SQL: %s;\n", sSelect.z);
@@ -10644,11 +10595,8 @@ static void process_sqliterc(
    if( stdin_is_interactive ){
      utf8_printf(stderr,"-- Loading resources from %s\n",sqliterc);
    }
-    if( process_input(p) && bail_on_error ) exit(1);
+    process_input(p);
    fclose(p->in);
-  }else if( sqliterc_override!=0 ){
-    utf8_printf(stderr,"cannot open: \"%s\"\n", sqliterc);
-    if( bail_on_error ) exit(1);
  }
  p->in = inSaved;
  p->lineno = savedLineno;
@@ -10707,7 +10655,6 @@ static const char zOptions[] =
 #endif
  "   -stats               print memory stats before each finalize\n"
  "   -table               set output mode to 'table'\n"
-  "   -tabs                set output mode to 'tabs'\n"
  "   -version             show SQLite version\n"
  "   -vfs NAME            use NAME as the default VFS\n"
 #ifdef SQLITE_ENABLE_VFSTRACE
@@ -10965,14 +10912,11 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
      (void)cmdline_option_value(argc, argv, ++i);
 #endif
    }else if( strcmp(z,"-pagecache")==0 ){
-      sqlite3_int64 n, sz;
-      sz = integerValue(cmdline_option_value(argc,argv,++i));
+      int n, sz;
+      sz = (int)integerValue(cmdline_option_value(argc,argv,++i));
      if( sz>70000 ) sz = 70000;
      if( sz<0 ) sz = 0;
-      n = integerValue(cmdline_option_value(argc,argv,++i));
-      if( sz>0 && n>0 && 0xffffffffffffLL/sz<n ){
-        n = 0xffffffffffffLL/sz;
-      }
+      n = (int)integerValue(cmdline_option_value(argc,argv,++i));
      sqlite3_config(SQLITE_CONFIG_PAGECACHE,
                    (n>0 && sz>0) ? malloc(n*sz) : 0, sz, n);
      data.shellFlgs |= SHFLG_Pagecache;
@@ -11034,8 +10978,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
 #endif
    }else if( strcmp(z, "-memtrace")==0 ){
      sqlite3MemTraceActivate(stderr);
-    }else if( strcmp(z,"-bail")==0 ){
-      bail_on_error = 1;
    }
  }
  verify_uninitialized();
@@ -11145,12 +11087,10 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
      data.openFlags |= SQLITE_OPEN_NOFOLLOW;
    }else if( strcmp(z,"-ascii")==0 ){
      data.mode = MODE_Ascii;
-      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator, SEP_Unit);
-      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator, SEP_Record);
-    }else if( strcmp(z,"-tabs")==0 ){
-      data.mode = MODE_List;
-      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator, SEP_Tab);
-      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator, SEP_Row);
+      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
+                       SEP_Unit);
+      sqlite3_snprintf(sizeof(data.rowSeparator), data.rowSeparator,
+                       SEP_Record);
    }else if( strcmp(z,"-separator")==0 ){
      sqlite3_snprintf(sizeof(data.colSeparator), data.colSeparator,
                       "%s",cmdline_option_value(argc,argv,++i));
@@ -11182,7 +11122,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
      */
      ShellSetFlag(&data, SHFLG_Backslash);
    }else if( strcmp(z,"-bail")==0 ){
-      /* No-op.  The bail_on_error flag should already be set. */
+      bail_on_error = 1;
    }else if( strcmp(z,"-version")==0 ){
      printf("%s %s\n", sqlite3_libversion(), sqlite3_sourceid());
      return 0;
@@ -11270,25 +11210,20 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
    for(i=0; i<nCmd; i++){
      if( azCmd[i][0]=='.' ){
        rc = do_meta_command(azCmd[i], &data);
-        if( rc ){
-          free(azCmd);
-          return rc==2 ? 0 : rc;
-        }
+        if( rc ) return rc==2 ? 0 : rc;
      }else{
        open_db(&data, 0);
        rc = shell_exec(&data, azCmd[i], &zErrMsg);
-        if( zErrMsg || rc ){
-          if( zErrMsg!=0 ){
-            utf8_printf(stderr,"Error: %s\n", zErrMsg);
-          }else{
-            utf8_printf(stderr,"Error: unable to process SQL: %s\n", azCmd[i]);
-          }
-          sqlite3_free(zErrMsg);
-          free(azCmd);
+        if( zErrMsg!=0 ){
+          utf8_printf(stderr,"Error: %s\n", zErrMsg);
          return rc!=0 ? rc : 1;
+        }else if( rc!=0 ){
+          utf8_printf(stderr,"Error: unable to process SQL: %s\n", azCmd[i]);
+          return rc;
        }
      }
    }
+    free(azCmd);
  }else{
    /* Run commands received from standard input
    */
@@ -11334,7 +11269,6 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
      rc = process_input(&data);
    }
  }
-  free(azCmd);
  set_table_name(&data, 0);
  if( data.db ){
    session_close_all(&data);
@@ -504,7 +504,6 @@ int sqlite3_exec(
 #define SQLITE_IOERR_COMMIT_ATOMIC     (SQLITE_IOERR | (30<<8))
 #define SQLITE_IOERR_ROLLBACK_ATOMIC   (SQLITE_IOERR | (31<<8))
 #define SQLITE_IOERR_DATA              (SQLITE_IOERR | (32<<8))
-#define SQLITE_IOERR_CORRUPTFS         (SQLITE_IOERR | (33<<8))
 #define SQLITE_LOCKED_SHAREDCACHE      (SQLITE_LOCKED |  (1<<8))
 #define SQLITE_LOCKED_VTAB             (SQLITE_LOCKED |  (2<<8))
 #define SQLITE_BUSY_RECOVERY           (SQLITE_BUSY   |  (1<<8))
@@ -1127,6 +1126,24 @@ struct sqlite3_io_methods {
 ** in wal mode after the client has finished copying pages from the wal
 ** file to the database file, but before the *-shm file is updated to
 ** record the fact that the pages have been checkpointed.
+**
+** <li>[[SQLITE_FCNTL_SHMLOCK_GET]]
+** This file-control is currently only supported by the "unix" VFS. The
+** (void*) argument passed with this file-control must actually be
+** a (char**) pointer. If the database is in wal-mode, the target of the
+** pointer is set to point to a human readable description of all the
+** wal-mode locks held on the database, by the current and external 
+** processes. It is the responsibility of the caller to eventually free 
+** this string using sqlite3_free(). See also the virtual table module in 
+** file "shmlockvtab.c" of the source distribution.
+** </ul>
+**
+** <li>[[SQLITE_FCNTL_SHMLOCK_NAME]]
+** This file-control is currently only supported by the "unix" VFS. The
+** (void*) argument passed with this file-control should point to a
+** nul-terminated string. A copy of this string will be used in reports
+** returned by future calls to SQLITE_FCNTL_SHMLOCK_GET within the current
+** process to identify this connection.
 ** </ul>
 */
 #define SQLITE_FCNTL_LOCKSTATE               1
@@ -1168,6 +1185,9 @@ struct sqlite3_io_methods {
 #define SQLITE_FCNTL_RESERVE_BYTES          38
 #define SQLITE_FCNTL_CKPT_START             39

+#define SQLITE_FCNTL_SHMLOCK_GET            40
+#define SQLITE_FCNTL_SHMLOCK_NAME           41
+
 /* deprecated names */
 #define SQLITE_GET_LOCKPROXYFILE      SQLITE_FCNTL_GET_LOCKPROXYFILE
 #define SQLITE_SET_LOCKPROXYFILE      SQLITE_FCNTL_SET_LOCKPROXYFILE
@@ -3697,7 +3717,7 @@ sqlite3_file *sqlite3_database_file_object(const char*);
 ** If the Y parameter to sqlite3_free_filename(Y) is anything other
 ** than a NULL pointer or a pointer previously acquired from
 ** sqlite3_create_filename(), then bad things such as heap
-** corruption or segfaults may occur. The value Y should not be 
+** corruption or segfaults may occur. The value Y should be 
 ** used again after sqlite3_free_filename(Y) has been called.  This means
 ** that if the [sqlite3_vfs.xOpen()] method of a VFS has been called using Y,
 ** then the corresponding [sqlite3_module.xClose() method should also be
@@ -6193,14 +6213,14 @@ int sqlite3_db_readonly(sqlite3 *db, const char *zDbName);
 **
 ** ^The sqlite3_txn_state(D,S) interface returns the current
 ** [transaction state] of schema S in database connection D.  ^If S is NULL,
-** then the highest transaction state of any schema on database connection D
+** then the highest transaction state of any schema on databse connection D
 ** is returned.  Transaction states are (in order of lowest to highest):
 ** <ol>
 ** <li value="0"> SQLITE_TXN_NONE
 ** <li value="1"> SQLITE_TXN_READ
 ** <li value="2"> SQLITE_TXN_WRITE
 ** </ol>
-** ^If the S argument to sqlite3_txn_state(D,S) is not the name of
+** ^If the S argument to sqlite3_txn_state(D,S) is in the name of
 ** a valid schema, then -1 is returned.
 */
 int sqlite3_txn_state(sqlite3*,const char *zSchema);
@@ -7740,6 +7760,7 @@ int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_PRNG_SAVE                5
 #define SQLITE_TESTCTRL_PRNG_RESTORE             6
 #define SQLITE_TESTCTRL_PRNG_RESET               7  /* NOT USED */
+#define SQLITE_TESTCTRL_SEEK_COUNT               7
 #define SQLITE_TESTCTRL_BITVEC_TEST              8
 #define SQLITE_TESTCTRL_FAULT_INSTALL            9
 #define SQLITE_TESTCTRL_BENIGN_MALLOC_HOOKS     10
@@ -7764,8 +7785,7 @@ int sqlite3_test_control(int op, ...);
 #define SQLITE_TESTCTRL_RESULT_INTREAL          27
 #define SQLITE_TESTCTRL_PRNG_SEED               28
 #define SQLITE_TESTCTRL_EXTRA_SCHEMA_CHECKS     29
-#define SQLITE_TESTCTRL_SEEK_COUNT              30
-#define SQLITE_TESTCTRL_LAST                    30  /* Largest TESTCTRL */
+#define SQLITE_TESTCTRL_LAST                    29  /* Largest TESTCTRL */

 /*
 ** CAPI3REF: SQL Keyword Checking
@@ -9245,11 +9265,10 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
 ** CAPI3REF: Determine If Virtual Table Column Access Is For UPDATE
 **
 ** If the sqlite3_vtab_nochange(X) routine is called within the [xColumn]
-** method of a [virtual table], then it might return true if the
+** method of a [virtual table], then it returns true if and only if the
 ** column is being fetched as part of an UPDATE operation during which the
-** column value will not change.  The virtual table implementation can use
-** this hint as permission to substitute a return value that is less
-** expensive to compute and that the corresponding
+** column value will not change.  Applications might use this to substitute
+** a return value that is less expensive to compute and that the corresponding
 ** [xUpdate] method understands as a "no-change" value.
 **
 ** If the [xColumn] method calls sqlite3_vtab_nochange() and finds that
@@ -9258,12 +9277,6 @@ int sqlite3_vtab_on_conflict(sqlite3 *);
 ** any of the [sqlite3_result_int|sqlite3_result_xxxxx() interfaces].
 ** In that case, [sqlite3_value_nochange(X)] will return true for the
 ** same column in the [xUpdate] method.
-**
-** The sqlite3_vtab_nochange() routine is an optimization.  Virtual table
-** implementations should continue to give a correct answer even if the
-** sqlite3_vtab_nochange() interface were to always return false.  In the
-** current implementation, the sqlite3_vtab_nochange() interface does always
-** returns false for the enhanced [UPDATE FROM] statement.
 */
 int sqlite3_vtab_nochange(sqlite3_context*);

@@ -9479,7 +9492,7 @@ int sqlite3_db_cacheflush(sqlite3*);
 ** seventh parameter is the final rowid value of the row being inserted
 ** or updated. The value of the seventh parameter passed to the callback
 ** function is not defined for operations on WITHOUT ROWID tables, or for
-** DELETE operations on rowid tables.
+** INSERT operations on rowid tables.
 **
 ** The [sqlite3_preupdate_old()], [sqlite3_preupdate_new()],
 ** [sqlite3_preupdate_count()], and [sqlite3_preupdate_depth()] interfaces
@@ -335,8 +335,6 @@ struct sqlite3_api_routines {
                           int,const char**);
  void (*free_filename)(char*);
  sqlite3_file *(*database_file_object)(const char*);
-  /* Version 3.34.0 and later */
-  int (*txn_state)(sqlite3*,const char*);
 };

 /*
@@ -641,8 +639,6 @@ typedef int (*sqlite3_loadext_entry)(
 #define sqlite3_create_filename        sqlite3_api->create_filename
 #define sqlite3_free_filename          sqlite3_api->free_filename
 #define sqlite3_database_file_object   sqlite3_api->database_file_object
-/* Version 3.34.0 and later */
-#define sqlite3_txn_state              sqlite3_api->txn_state
 #endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */

 #if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
@@ -2187,7 +2187,6 @@ struct Table {
 #define TF_OOOHidden       0x0400    /* Out-of-Order hidden columns */
 #define TF_HasNotNull      0x0800    /* Contains NOT NULL constraints */
 #define TF_Shadow          0x1000    /* True for a shadow table */
-#define TF_HasStat4        0x2000    /* STAT4 info available for this table */

 /*
 ** Test to see whether or not a table is a virtual table.  This is
@@ -3153,6 +3152,9 @@ struct Select {
 **                     statements within triggers whose only purpose is
 **                     the side-effects of functions.
 **
+** All of the above are free to ignore their ORDER BY clause. Those that
+** follow must honor the ORDER BY clause.
+**
 **     SRT_Output      Generate a row of output (using the OP_ResultRow
 **                     opcode) for each row in the result set.
 **
@@ -3209,18 +3211,13 @@ struct Select {
 #define SRT_Except       2  /* Remove result from a UNION index */
 #define SRT_Exists       3  /* Store 1 if the result is not empty */
 #define SRT_Discard      4  /* Do not save the results anywhere */
-#define SRT_DistFifo     5  /* Like SRT_Fifo, but unique results only */
-#define SRT_DistQueue    6  /* Like SRT_Queue, but unique results only */
-
-/* The DISTINCT clause is ignored for all of the above.  Not that
-** IgnorableDistinct() implies IgnorableOrderby() */
-#define IgnorableDistinct(X) ((X->eDest)<=SRT_DistQueue)
-
+#define SRT_Fifo         5  /* Store result as data with an automatic rowid */
+#define SRT_DistFifo     6  /* Like SRT_Fifo, but unique results only */
 #define SRT_Queue        7  /* Store result in an queue */
-#define SRT_Fifo         8  /* Store result as data with an automatic rowid */
+#define SRT_DistQueue    8  /* Like SRT_Queue, but unique results only */

 /* The ORDER BY clause is ignored for all of the above */
-#define IgnorableOrderby(X) ((X->eDest)<=SRT_Fifo)
+#define IgnorableOrderby(X) ((X->eDest)<=SRT_DistQueue)

 #define SRT_Output       9  /* Output each row of result */
 #define SRT_Mem         10  /* Store result in a memory cell */
@@ -3940,7 +3940,7 @@ static int SQLITE_TCLAPI test_bind_blob(
    char zBuf[200];
    sqlite3_snprintf(sizeof(zBuf), zBuf,
                     "cannot use %d blob bytes, have %d", bytes, len);
-    Tcl_AppendResult(interp, zBuf, (char*)0);
+    Tcl_AppendResult(interp, zBuf, -1);
    return TCL_ERROR;
  }

@@ -3953,195 +3953,6 @@ static int SQLITE_TCLAPI test_bind_blob(
  return TCL_OK;
 }

-
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-/*
-** sqlite3_carray_bind [options...] STMT NAME VALUE ...
-**
-** Options:
-**    -transient
-**    -static
-**    -int32
-**    -int64
-**    -double
-**    -text
-**
-** Each call clears static data.  Called with no options does nothing
-** but clear static data.
-*/
-static int SQLITE_TCLAPI test_carray_bind(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  sqlite3_stmt *pStmt;
-  int eType = 0;   /* CARRAY_INT32 */
-  int nData = 0;
-  void *aData = 0;
-  int isTransient = 0;
-  int isStatic = 0;
-  int idx;
-  int i, j;
-  int rc;
-  void (*xDel)(void*) = sqlite3_free;
-  static void *aStaticData = 0;
-  static int nStaticData = 0;
-  static int eStaticType = 0;
-  extern int sqlite3_carray_bind(
-    sqlite3_stmt *pStmt,
-    int i,
-    void *aData,
-    int nData,
-    int mFlags,
-    void (*xDestroy)(void*)
-  );
-  
-  if( aStaticData ){
-    /* Always clear preexisting static data on every call */
-    if( eStaticType==3 ){
-      for(i=0; i<nStaticData; i++){
-        sqlite3_free(((char**)aStaticData)[i]);
-      }
-    }
-    sqlite3_free(aStaticData);
-    aStaticData = 0;
-    nStaticData = 0;
-    eStaticType = 0;
-  }
-  if( objc==1 ) return TCL_OK;
-
-  for(i=1; i<objc && Tcl_GetString(objv[i])[0]=='-'; i++){
-    const char *z = Tcl_GetString(objv[i]);
-    if( strcmp(z, "-transient")==0 ){
-      isTransient = 1;
-      xDel = SQLITE_TRANSIENT;
-    }else
-    if( strcmp(z, "-static")==0 ){
-      isStatic = 1;
-      xDel = SQLITE_STATIC;
-    }else
-    if( strcmp(z, "-int32")==0 ){
-      eType = 0;  /* CARRAY_INT32 */
-    }else
-    if( strcmp(z, "-int64")==0 ){
-      eType = 1;  /* CARRAY_INT64 */
-    }else
-    if( strcmp(z, "-double")==0 ){
-      eType = 2;  /* CARRAY_DOUBLE */
-    }else
-    if( strcmp(z, "-text")==0 ){
-      eType = 3;  /* CARRAY_TEXT */
-    }else
-    if( strcmp(z, "--")==0 ){
-      break;
-    }else
-    {
-      Tcl_AppendResult(interp, "unknown option: ", z, (char*)0);
-      return TCL_ERROR;
-    }
-  }
-  if( eType==3 && !isStatic && !isTransient ){
-    Tcl_AppendResult(interp, "text data must be either -static or -transient",
-                     (char*)0);
-    return TCL_ERROR;
-  }
-  if( isStatic && isTransient ){
-    Tcl_AppendResult(interp, "cannot be both -static and -transient",
-                     (char*)0);
-    return TCL_ERROR;
-  }
-  if( objc-i < 2 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "[OPTIONS] STMT IDX VALUE ...");
-    return TCL_ERROR;
-  }
-  if( getStmtPointer(interp, Tcl_GetString(objv[i]), &pStmt) ) return TCL_ERROR;
-  i++;
-  if( Tcl_GetIntFromObj(interp, objv[i], &idx) ) return TCL_ERROR;
-  i++;
-  nData = objc - i;
-  switch( eType + 4*(nData<=0) ){
-    case 0: { /* INT32 */
-      int *a = sqlite3_malloc( sizeof(int)*nData );
-      if( a==0 ){ rc = SQLITE_NOMEM; goto carray_bind_done; }
-      for(j=0; j<nData; j++){
-        int v;
-        if( Tcl_GetIntFromObj(interp, objv[i+j], &v) ){
-          sqlite3_free(a);
-          return TCL_ERROR;
-        }
-        a[j] = v;
-      }
-      aData = a;
-      break;
-    }
-    case 1: { /* INT64 */
-      sqlite3_int64 *a = sqlite3_malloc( sizeof(sqlite3_int64)*nData );
-      if( a==0 ){ rc = SQLITE_NOMEM; goto carray_bind_done; }
-      for(j=0; j<nData; j++){
-        Tcl_WideInt v;
-        if( Tcl_GetWideIntFromObj(interp, objv[i+j], &v) ){
-          sqlite3_free(a);
-          return TCL_ERROR;
-        }
-        a[j] = v;
-      }
-      aData = a;
-      break;
-    }
-    case 2: { /* DOUBLE */
-      double *a = sqlite3_malloc( sizeof(double)*nData );
-      if( a==0 ){ rc = SQLITE_NOMEM; goto carray_bind_done; }
-      for(j=0; j<nData; j++){
-        double v;
-        if( Tcl_GetDoubleFromObj(interp, objv[i+j], &v) ){
-          sqlite3_free(a);
-          return TCL_ERROR;
-        }
-        a[j] = v;
-      }
-      aData = a;
-      break;
-    }
-    case 3: { /* TEXT */
-      char **a = sqlite3_malloc( sizeof(char*)*nData );
-      if( a==0 ){ rc = SQLITE_NOMEM; goto carray_bind_done; }
-      for(j=0; j<nData; j++){
-        const char *v = Tcl_GetString(objv[i+j]);
-        a[j] = sqlite3_mprintf("%s", v);
-      }
-      aData = a;
-      break;
-    }
-    case 4: { /* nData==0 */
-      aData = "";
-      xDel = SQLITE_STATIC;
-      isTransient = 0;
-      isStatic = 0;
-      break;
-    }
-  }
-  if( isStatic ){
-    aStaticData = aData;
-    nStaticData = nData;
-    eStaticType = eType;
-  }
-  rc = sqlite3_carray_bind(pStmt, idx, aData, nData, eType, xDel);
-  if( isTransient ){
-    if( eType==3 ){
-      for(i=0; i<nData; i++) sqlite3_free(((char**)aData)[i]);
-    }
-    sqlite3_free(aData);
-  }
-carray_bind_done:
-  if( rc ){
-    Tcl_AppendResult(interp, sqlite3_errstr(rc), (char*)0);
-    return TCL_ERROR;
-  }
-  return TCL_OK;
-}
-#endif /* SQLITE_OMIT_VIRTUALTABLE */
-
 /*
 ** Usage:   sqlite3_bind_parameter_count  STMT
 **
@@ -6428,36 +6239,6 @@ static int SQLITE_TCLAPI file_control_vfsname(
  return TCL_OK;  
 }

-/*
-** tclcmd:   file_control_reservebytes DB N
-*/
-static int SQLITE_TCLAPI file_control_reservebytes(
-  ClientData clientData, /* Pointer to sqlite3_enable_XXX function */
-  Tcl_Interp *interp,    /* The TCL interpreter that invoked this command */
-  int objc,              /* Number of arguments */
-  Tcl_Obj *CONST objv[]  /* Command arguments */
-){
-  sqlite3 *db;
-  const char *zDbName = "main";
-  int n = 0;
-  int rc;
-
-  if( objc!=3 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "DB N");
-    return TCL_ERROR;
-  }
-  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db)
-   || Tcl_GetIntFromObj(interp, objv[2], &n) 
-  ){
-    return TCL_ERROR;
-  }
-
-  rc = sqlite3_file_control(db, zDbName, SQLITE_FCNTL_RESERVE_BYTES, (void*)&n);
-  Tcl_SetObjResult(interp, Tcl_NewStringObj(sqlite3ErrName(rc), -1));
-  return TCL_OK;  
-}
-
-
 /*
 ** tclcmd:   file_control_tempfilename DB ?AUXDB?
 **
@@ -6490,6 +6271,35 @@ static int SQLITE_TCLAPI file_control_tempfilename(
  return TCL_OK;  
 }

+/*
+** tclcmd:   file_control_shmlock_name DB DBNAME SHMLOCKNAME
+**
+** Return a string that is a temporary filename
+*/
+static int SQLITE_TCLAPI file_control_shmlock_name(
+  ClientData clientData, /* Pointer to sqlite3_enable_XXX function */
+  Tcl_Interp *interp,    /* The TCL interpreter that invoked this command */
+  int objc,              /* Number of arguments */
+  Tcl_Obj *CONST objv[]  /* Command arguments */
+){
+  sqlite3 *db;
+  const char *zDbName = "main";
+  char *zName = 0;
+
+  if( objc!=4 ){
+    Tcl_WrongNumArgs(interp, 1, objv, "DB DBNAME SHMLOCKNAME");
+    return TCL_ERROR;
+  }
+  if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ){
+    return TCL_ERROR;
+  }
+  zDbName = Tcl_GetString(objv[2]);
+  zName = Tcl_GetString(objv[3]);
+
+  sqlite3_file_control(db, zDbName, SQLITE_FCNTL_SHMLOCK_NAME, (void*)zName);
+  return TCL_OK;  
+}
+

 /*
 ** tclcmd:   sqlite3_vfs_list
@@ -7511,6 +7321,7 @@ static int SQLITE_TCLAPI tclLoadStaticExtensionCmd(
  extern int sqlite3_regexp_init(sqlite3*,char**,const sqlite3_api_routines*);
  extern int sqlite3_remember_init(sqlite3*,char**,const sqlite3_api_routines*);
  extern int sqlite3_series_init(sqlite3*,char**,const sqlite3_api_routines*);
+  extern int sqlite3_shmlockvtab_init(sqlite3*,char**,const sqlite3_api_routines*);
  extern int sqlite3_spellfix_init(sqlite3*,char**,const sqlite3_api_routines*);
  extern int sqlite3_totype_init(sqlite3*,char**,const sqlite3_api_routines*);
  extern int sqlite3_wholenumber_init(sqlite3*,char**,const sqlite3_api_routines*);
@@ -7540,6 +7351,7 @@ static int SQLITE_TCLAPI tclLoadStaticExtensionCmd(
    { "regexp",                sqlite3_regexp_init               },
    { "remember",              sqlite3_remember_init             },
    { "series",                sqlite3_series_init               },
+    { "shmlockvtab",           sqlite3_shmlockvtab_init          },
    { "spellfix",              sqlite3_spellfix_init             },
    { "totype",                sqlite3_totype_init               },
    { "unionvtab",             sqlite3_unionvtab_init            },
@@ -8083,48 +7895,6 @@ static int SQLITE_TCLAPI test_write_db(
  return TCL_OK;
 }

-/*
-** Usage:  sqlite3_register_cksumvfs
-**
-*/
-static int SQLITE_TCLAPI test_register_cksumvfs(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  if( objc!=1 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "");
-    return TCL_ERROR;
-  }else{
-    extern int sqlite3_register_cksumvfs(const char*);
-    int rc = sqlite3_register_cksumvfs(0);
-    Tcl_SetResult(interp, (char *)sqlite3ErrName(rc), TCL_VOLATILE);
-  }
-  return TCL_OK;
-}
-
-/*
-** Usage:  sqlite3_unregister_cksumvfs
-**
-*/
-static int SQLITE_TCLAPI test_unregister_cksumvfs(
-  void * clientData,
-  Tcl_Interp *interp,
-  int objc,
-  Tcl_Obj *CONST objv[]
-){
-  if( objc!=1 ){
-    Tcl_WrongNumArgs(interp, 1, objv, "");
-    return TCL_ERROR;
-  }else{
-    extern int sqlite3_unregister_cksumvfs(void);
-    int rc = sqlite3_unregister_cksumvfs();
-    Tcl_SetResult(interp, (char *)sqlite3ErrName(rc), TCL_VOLATILE);
-  }
-  return TCL_OK;
-}
-
 /*
 ** Usage:  decode_hexdb TEXT
 **
@@ -8290,9 +8060,6 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
     { "sqlite3_bind_text",             test_bind_text     ,0 },
     { "sqlite3_bind_text16",           test_bind_text16   ,0 },
     { "sqlite3_bind_blob",             test_bind_blob     ,0 },
-#ifndef SQLITE_OMIT_VIRTUALTABLE
-     { "sqlite3_carray_bind",           test_carray_bind   ,0 },
-#endif
     { "sqlite3_bind_parameter_count",  test_bind_parameter_count, 0},
     { "sqlite3_bind_parameter_name",   test_bind_parameter_name,  0},
     { "sqlite3_bind_parameter_index",  test_bind_parameter_index, 0},
@@ -8424,8 +8191,8 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
     { "file_control_persist_wal",    file_control_persist_wal,     0   },
     { "file_control_powersafe_overwrite",file_control_powersafe_overwrite,0},
     { "file_control_vfsname",        file_control_vfsname,         0   },
-     { "file_control_reservebytes",   file_control_reservebytes,    0   },
     { "file_control_tempfilename",   file_control_tempfilename,    0   },
+     { "file_control_shmlock_name",   file_control_shmlock_name,    0   },
     { "sqlite3_vfs_list",           vfs_list,     0   },
     { "sqlite3_create_function_v2", test_create_function_v2, 0 },

@@ -8495,8 +8262,6 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
     { "sqlite3_config_sorterref", test_config_sorterref,   0 },
     { "decode_hexdb",             test_decode_hexdb,       0 },
     { "test_write_db",            test_write_db,           0 },
-     { "sqlite3_register_cksumvfs", test_register_cksumvfs,  0 },
-     { "sqlite3_unregister_cksumvfs", test_unregister_cksumvfs,  0 },
  };
  static int bitmask_size = sizeof(Bitmask)*8;
  static int longdouble_size = sizeof(LONGDOUBLE_TYPE);
@@ -550,16 +550,13 @@ static int cfDeviceCharacteristics(sqlite3_file *pFile){
 ** Pass-throughs for WAL support.
 */
 static int cfShmLock(sqlite3_file *pFile, int ofst, int n, int flags){
-  sqlite3_file *pReal = ((CrashFile*)pFile)->pRealFile;
-  return pReal->pMethods->xShmLock(pReal, ofst, n, flags);
+  return sqlite3OsShmLock(((CrashFile*)pFile)->pRealFile, ofst, n, flags);
 }
 static void cfShmBarrier(sqlite3_file *pFile){
-  sqlite3_file *pReal = ((CrashFile*)pFile)->pRealFile;
-  pReal->pMethods->xShmBarrier(pReal);
+  sqlite3OsShmBarrier(((CrashFile*)pFile)->pRealFile);
 }
 static int cfShmUnmap(sqlite3_file *pFile, int delFlag){
-  sqlite3_file *pReal = ((CrashFile*)pFile)->pRealFile;
-  return pReal->pMethods->xShmUnmap(pReal, delFlag);
+  return sqlite3OsShmUnmap(((CrashFile*)pFile)->pRealFile, delFlag);
 }
 static int cfShmMap(
  sqlite3_file *pFile,            /* Handle open on database file */
@@ -568,8 +565,7 @@ static int cfShmMap(
  int w,                          /* True to extend file if necessary */
  void volatile **pp              /* OUT: Mapped memory */
 ){
-  sqlite3_file *pReal = ((CrashFile*)pFile)->pRealFile;
-  return pReal->pMethods->xShmMap(pReal, iRegion, sz, w, pp);
+  return sqlite3OsShmMap(((CrashFile*)pFile)->pRealFile, iRegion, sz, w, pp);
 }

 static const sqlite3_io_methods CrashFileVtab = {
@@ -191,7 +191,7 @@ static int devsymDeviceCharacteristics(sqlite3_file *pFile){
 */
 static int devsymShmLock(sqlite3_file *pFile, int ofst, int n, int flags){
  devsym_file *p = (devsym_file *)pFile;
-  return p->pReal->pMethods->xShmLock(p->pReal, ofst, n, flags);
+  return sqlite3OsShmLock(p->pReal, ofst, n, flags);
 }
 static int devsymShmMap(
  sqlite3_file *pFile, 
@@ -201,15 +201,15 @@ static int devsymShmMap(
  void volatile **pp
 ){
  devsym_file *p = (devsym_file *)pFile;
-  return p->pReal->pMethods->xShmMap(p->pReal, iRegion, szRegion, isWrite, pp);
+  return sqlite3OsShmMap(p->pReal, iRegion, szRegion, isWrite, pp);
 }
 static void devsymShmBarrier(sqlite3_file *pFile){
  devsym_file *p = (devsym_file *)pFile;
-  p->pReal->pMethods->xShmBarrier(p->pReal);
+  sqlite3OsShmBarrier(p->pReal);
 }
 static int devsymShmUnmap(sqlite3_file *pFile, int delFlag){
  devsym_file *p = (devsym_file *)pFile;
-  return p->pReal->pMethods->xShmUnmap(p->pReal, delFlag);
+  return sqlite3OsShmUnmap(p->pReal, delFlag);
 }


@@ -895,8 +895,7 @@ static int tvfsShmMap(
  Testvfs *p = (Testvfs *)(pFd->pVfs->pAppData);

  if( p->isFullshm ){
-    sqlite3_file *pReal = pFd->pReal;
-    return pReal->pMethods->xShmMap(pReal, iPage, pgsz, isWrite, pp);
+    return sqlite3OsShmMap(pFd->pReal, iPage, pgsz, isWrite, pp);
  }

  if( 0==pFd->pShm ){
@@ -946,8 +945,7 @@ static int tvfsShmLock(
  char zLock[80];

  if( p->isFullshm ){
-    sqlite3_file *pReal = pFd->pReal;
-    return pReal->pMethods->xShmLock(pReal, ofst, n, flags);
+    return sqlite3OsShmLock(pFd->pReal, ofst, n, flags);
  }

  if( p->pScript && p->mask&TESTVFS_SHMLOCK_MASK ){
@@ -1011,8 +1009,7 @@ static void tvfsShmBarrier(sqlite3_file *pFile){
  }

  if( p->isFullshm ){
-    sqlite3_file *pReal = pFd->pReal;
-    pReal->pMethods->xShmBarrier(pReal);
+    sqlite3OsShmBarrier(pFd->pReal);
    return;
  }
 }
@@ -1028,8 +1025,7 @@ static int tvfsShmUnmap(
  TestvfsFd **ppFd;

  if( p->isFullshm ){
-    sqlite3_file *pReal = pFd->pReal;
-    return pReal->pMethods->xShmUnmap(pReal, deleteFlag);
+    return sqlite3OsShmUnmap(pFd->pReal, deleteFlag);
  }

  if( !pBuffer ) return SQLITE_OK;
@@ -157,11 +157,22 @@ void sqlite3BeginTrigger(
  pTab = sqlite3SrcListLookup(pParse, pTableName);
  if( !pTab ){
    /* The table does not exist. */
-    goto trigger_orphan_error;
+    if( db->init.iDb==1 ){
+      /* Ticket #3810.
+      ** Normally, whenever a table is dropped, all associated triggers are
+      ** dropped too.  But if a TEMP trigger is created on a non-TEMP table
+      ** and the table is dropped by a different database connection, the
+      ** trigger is not visible to the database connection that does the
+      ** drop so the trigger cannot be dropped.  This results in an
+      ** "orphaned trigger" - a trigger whose associated table is missing.
+      */
+      db->init.orphanTrigger = 1;
+    }
+    goto trigger_cleanup;
  }
  if( IsVirtual(pTab) ){
    sqlite3ErrorMsg(pParse, "cannot create triggers on virtual tables");
-    goto trigger_orphan_error;
+    goto trigger_cleanup;
  }

  /* Check that the trigger name is not reserved and that no trigger of the
@@ -199,12 +210,12 @@ void sqlite3BeginTrigger(
  if( pTab->pSelect && tr_tm!=TK_INSTEAD ){
    sqlite3ErrorMsg(pParse, "cannot create %s trigger on view: %S", 
        (tr_tm == TK_BEFORE)?"BEFORE":"AFTER", pTableName, 0);
-    goto trigger_orphan_error;
+    goto trigger_cleanup;
  }
  if( !pTab->pSelect && tr_tm==TK_INSTEAD ){
    sqlite3ErrorMsg(pParse, "cannot create INSTEAD OF"
        " trigger on table: %S", pTableName, 0);
-    goto trigger_orphan_error;
+    goto trigger_cleanup;
  }

 #ifndef SQLITE_OMIT_AUTHORIZATION
@@ -264,23 +275,6 @@ trigger_cleanup:
  }else{
    assert( pParse->pNewTrigger==pTrigger );
  }
-  return;
-
-trigger_orphan_error:
-  if( db->init.iDb==1 ){
-    /* Ticket #3810.
-    ** Normally, whenever a table is dropped, all associated triggers are
-    ** dropped too.  But if a TEMP trigger is created on a non-TEMP table
-    ** and the table is dropped by a different database connection, the
-    ** trigger is not visible to the database connection that does the
-    ** drop so the trigger cannot be dropped.  This results in an
-    ** "orphaned trigger" - a trigger whose associated table is missing.
-    **
-    ** 2020-11-05 see also https://sqlite.org/forum/forumpost/157dc791df
-    */
-    db->init.orphanTrigger = 1;
-  }
-  goto trigger_cleanup;
 }

 /*
@@ -234,7 +234,7 @@ static void updateFromSelect(
 #endif
      pList = sqlite3ExprListAppend(pParse, pList, pNew);
    }
-    eDest = IsVirtual(pTab) ? SRT_Table : SRT_Upfrom;
+    eDest = SRT_Upfrom;
  }else if( pTab->pSelect ){
    for(i=0; i<pTab->nCol; i++){
      pList = sqlite3ExprListAppend(pParse, pList, exprRowColumn(pParse, i));
@@ -651,8 +651,6 @@ void sqlite3Update(

  if( nChangeFrom==0 && HasRowid(pTab) ){
    sqlite3VdbeAddOp3(v, OP_Null, 0, regRowSet, regOldRowid);
-    iEph = pParse->nTab++;
-    addrOpen = sqlite3VdbeAddOp3(v, OP_OpenEphemeral, iEph, 0, regRowSet);
  }else{
    assert( pPk!=0 || HasRowid(pTab) );
    nPk = pPk ? pPk->nKeyCol : 0;
@@ -744,10 +742,9 @@ void sqlite3Update(
      ** leave it in register regOldRowid.  */
      sqlite3VdbeAddOp2(v, OP_Rowid, iDataCur, regOldRowid);
      if( eOnePass==ONEPASS_OFF ){
+        /* We need to use regRowSet, so reallocate aRegIdx[nAllIdx] */
        aRegIdx[nAllIdx] = ++pParse->nMem;
-        sqlite3VdbeAddOp3(v, OP_Insert, iEph, regRowSet, regOldRowid);
-      }else{
-        if( ALWAYS(addrOpen) ) sqlite3VdbeChangeToNoop(v, addrOpen);
+        sqlite3VdbeAddOp2(v, OP_RowSetAdd, regRowSet, regOldRowid);
      }
    }else{
      /* Read the PK of the current row into an array of registers. In
@@ -835,9 +832,8 @@ void sqlite3Update(
        VdbeCoverage(v);
      }
    }else{
-      sqlite3VdbeAddOp2(v, OP_Rewind, iEph, labelBreak); VdbeCoverage(v);
-      labelContinue = sqlite3VdbeMakeLabel(pParse);
-      addrTop = sqlite3VdbeAddOp2(v, OP_Rowid, iEph, regOldRowid);
+      labelContinue = sqlite3VdbeAddOp3(v, OP_RowSetRead, regRowSet,labelBreak,
+                               regOldRowid);
      VdbeCoverage(v);
      sqlite3VdbeAddOp3(v, OP_NotExists, iDataCur, labelContinue, regOldRowid);
      VdbeCoverage(v);
@@ -1087,9 +1083,11 @@ void sqlite3Update(
  }else if( eOnePass==ONEPASS_MULTI ){
    sqlite3VdbeResolveLabel(v, labelContinue);
    sqlite3WhereEnd(pWInfo);
-  }else{
+  }else if( pPk || nChangeFrom ){
    sqlite3VdbeResolveLabel(v, labelContinue);
    sqlite3VdbeAddOp2(v, OP_Next, iEph, addrTop); VdbeCoverage(v);
+  }else{
+    sqlite3VdbeGoto(v, labelContinue);
  }
  sqlite3VdbeResolveLabel(v, labelBreak);

@@ -1189,26 +1187,12 @@ static void updateVirtualTable(
  regArg = pParse->nMem + 1;
  pParse->nMem += nArg;
  if( pSrc->nSrc>1 ){
-    Index *pPk = 0;
    Expr *pRow;
    ExprList *pList;
-    if( HasRowid(pTab) ){
-      if( pRowid ){
-        pRow = sqlite3ExprDup(db, pRowid, 0);
-      }else{
-        pRow = sqlite3PExpr(pParse, TK_ROW, 0, 0);
-      }
+    if( pRowid ){
+      pRow = sqlite3ExprDup(db, pRowid, 0);
    }else{
-      i16 iPk;      /* PRIMARY KEY column */
-      pPk = sqlite3PrimaryKeyIndex(pTab);
-      assert( pPk!=0 );
-      assert( pPk->nKeyCol==1 );
-      iPk = pPk->aiColumn[0];
-      if( aXRef[iPk]>=0 ){
-        pRow = sqlite3ExprDup(db, pChanges->a[aXRef[iPk]].pExpr, 0);
-      }else{
-        pRow = exprRowColumn(pParse, iPk);
-      }
+      pRow = sqlite3PExpr(pParse, TK_ROW, 0, 0);
    }
    pList = sqlite3ExprListAppend(pParse, 0, pRow);

@@ -1222,7 +1206,7 @@ static void updateVirtualTable(
      }
    }

-    updateFromSelect(pParse, ephemTab, pPk, pList, pSrc, pWhere, 0, 0);
+    updateFromSelect(pParse, ephemTab, 0, pList, pSrc, pWhere, 0, 0);
    sqlite3ExprListDelete(db, pList);
    eOnePass = ONEPASS_OFF;
  }else{
@@ -3487,8 +3487,7 @@ case OP_AutoCommit: {
 ** active.
 ** If P2 is non-zero, then a write-transaction is started, or if a 
 ** read-transaction is already active, it is upgraded to a write-transaction.
-** If P2 is zero, then a read-transaction is started.  If P2 is 2 or more
-** then an exclusive transaction is started.
+** If P2 is zero, then a read-transaction is started.
 **
 ** P1 is the index of the database file on which the transaction is
 ** started.  Index 0 is the main database file and index 1 is the
@@ -3522,7 +3521,6 @@ case OP_Transaction: {

  assert( p->bIsReader );
  assert( p->readOnly==0 || pOp->p2==0 );
-  assert( pOp->p2>=0 && pOp->p2<=2 );
  assert( pOp->p1>=0 && pOp->p1<db->nDb );
  assert( DbMaskTest(p->btreeMask, pOp->p1) );
  if( pOp->p2 && (db->flags & SQLITE_QueryOnly)!=0 ){
@@ -3901,7 +3899,7 @@ case OP_OpenDup: {
 }


-/* Opcode: OpenEphemeral P1 P2 P3 P4 P5
+/* Opcode: OpenEphemeral P1 P2 * P4 P5
 ** Synopsis: nColumn=P2
 **
 ** Open a new cursor P1 to a transient table.
@@ -3921,10 +3919,6 @@ case OP_OpenDup: {
 ** in btree.h.  These flags control aspects of the operation of
 ** the btree.  The BTREE_OMIT_JOURNAL and BTREE_SINGLE flags are
 ** added automatically.
-**
-** If P3 is positive, then reg[P3] is modified slightly so that it
-** can be used as zero-length data for OP_Insert.  This is an optimization
-** that avoids an extra OP_Blob opcode to initialize that register.
 */
 /* Opcode: OpenAutoindex P1 P2 * P4 *
 ** Synopsis: nColumn=P2
@@ -3947,15 +3941,6 @@ case OP_OpenEphemeral: {
      SQLITE_OPEN_TRANSIENT_DB;
  assert( pOp->p1>=0 );
  assert( pOp->p2>=0 );
-  if( pOp->p3>0 ){
-    /* Make register reg[P3] into a value that can be used as the data
-    ** form sqlite3BtreeInsert() where the length of the data is zero. */
-    assert( pOp->p2==0 ); /* Only used when number of columns is zero */
-    assert( pOp->opcode==OP_OpenEphemeral );
-    assert( aMem[pOp->p3].flags & MEM_Null );
-    aMem[pOp->p3].n = 0;
-    aMem[pOp->p3].z = "";
-  }
  pCx = p->apCsr[pOp->p1];
  if( pCx && pCx->pBtx ){
    /* If the ephermeral table is already open, erase all existing content
@@ -4398,147 +4383,6 @@ seek_not_found:
  break;
 }

-
-/* Opcode: SeekScan  P1 P2 * * *
-** Synopsis: Scan-ahead up to P1 rows
-**
-** This opcode is a prefix opcode to OP_SeekGE.  In other words, this
-** opcode must be immediately followed by OP_SeekGE. This constraint is
-** checked by assert() statements.
-**
-** This opcode uses the P1 through P4 operands of the subsequent
-** OP_SeekGE.  In the text that follows, the operands of the subsequent
-** OP_SeekGE opcode are denoted as SeekOP.P1 through SeekOP.P4.   Only
-** the P1 and P2 operands of this opcode are also used, and  are called
-** This.P1 and This.P2.
-**
-** This opcode helps to optimize IN operators on a multi-column index
-** where the IN operator is on the later terms of the index by avoiding
-** unnecessary seeks on the btree, substituting steps to the next row
-** of the b-tree instead.  A correct answer is obtained if this opcode
-** is omitted or is a no-op.
-**
-** The SeekGE.P3 and SeekGE.P4 operands identify an unpacked key which
-** is the desired entry that we want the cursor SeekGE.P1 to be pointing
-** to.  Call this SeekGE.P4/P5 row the "target".
-**
-** If the SeekGE.P1 cursor is not currently pointing to a valid row,
-** then this opcode is a no-op and control passes through into the OP_SeekGE.
-**
-** If the SeekGE.P1 cursor is pointing to a valid row, then that row
-** might be the target row, or it might be near and slightly before the
-** target row.  This opcode attempts to position the cursor on the target
-** row by, perhaps by invoking sqlite3BtreeStep() on the cursor
-** between 0 and This.P1 times.
-**
-** There are three possible outcomes from this opcode:<ol>
-**
-** <li> If after This.P1 steps, the cursor is still point to a place that
-**      is earlier in the btree than the target row,
-**      then fall through into the subsquence OP_SeekGE opcode.
-**
-** <li> If the cursor is successfully moved to the target row by 0 or more
-**      sqlite3BtreeNext() calls, then jump to This.P2, which will land just
-**      past the OP_IdxGT opcode that follows the OP_SeekGE.
-**
-** <li> If the cursor ends up past the target row (indicating the the target
-**      row does not exist in the btree) then jump to SeekOP.P2. 
-** </ol>
-*/
-case OP_SeekScan: {
-  VdbeCursor *pC;
-  int res;
-  int nStep;
-  UnpackedRecord r;
-
-  assert( pOp[1].opcode==OP_SeekGE );
-
-  /* pOp->p2 points to the first instruction past the OP_IdxGT that
-  ** follows the OP_SeekGE.  */
-  assert( pOp->p2>=(int)(pOp-aOp)+2 );
-  assert( aOp[pOp->p2-1].opcode==OP_IdxGT );
-  assert( pOp[1].p1==aOp[pOp->p2-1].p1 );
-  assert( pOp[1].p2==aOp[pOp->p2-1].p2 );
-  assert( pOp[1].p3==aOp[pOp->p2-1].p3 );
-
-  assert( pOp->p1>0 );
-  pC = p->apCsr[pOp[1].p1];
-  assert( pC!=0 );
-  assert( pC->eCurType==CURTYPE_BTREE );
-  assert( !pC->isTable );
-  if( !sqlite3BtreeCursorIsValidNN(pC->uc.pCursor) ){
-#ifdef SQLITE_DEBUG
-     if( db->flags&SQLITE_VdbeTrace ){
-       printf("... cursor not valid - fall through\n");
-     }        
-#endif
-    break;
-  }
-  nStep = pOp->p1;
-  assert( nStep>=1 );
-  r.pKeyInfo = pC->pKeyInfo;
-  r.nField = (u16)pOp[1].p4.i;
-  r.default_rc = 0;
-  r.aMem = &aMem[pOp[1].p3];
-#ifdef SQLITE_DEBUG
-  {
-    int i;
-    for(i=0; i<r.nField; i++){
-      assert( memIsValid(&r.aMem[i]) );
-      REGISTER_TRACE(pOp[1].p3+i, &aMem[pOp[1].p3+i]);
-    }
-  }
-#endif
-  res = 0;  /* Not needed.  Only used to silence a warning. */
-  while(1){
-    rc = sqlite3VdbeIdxKeyCompare(db, pC, &r, &res);
-    if( rc ) goto abort_due_to_error;
-    if( res>0 ){
-      seekscan_search_fail:
-#ifdef SQLITE_DEBUG
-      if( db->flags&SQLITE_VdbeTrace ){
-        printf("... %d steps and then skip\n", pOp->p1 - nStep);
-      }        
-#endif
-      VdbeBranchTaken(1,3);
-      pOp++;
-      goto jump_to_p2;
-    }
-    if( res==0 ){
-#ifdef SQLITE_DEBUG
-      if( db->flags&SQLITE_VdbeTrace ){
-        printf("... %d steps and then success\n", pOp->p1 - nStep);
-      }        
-#endif
-      VdbeBranchTaken(2,3);
-      goto jump_to_p2;
-      break;
-    }
-    if( nStep<=0 ){
-#ifdef SQLITE_DEBUG
-      if( db->flags&SQLITE_VdbeTrace ){
-        printf("... fall through after %d steps\n", pOp->p1);
-      }        
-#endif
-      VdbeBranchTaken(0,3);
-      break;
-    }
-    nStep--;
-    rc = sqlite3BtreeNext(pC->uc.pCursor, 0);
-    if( rc ){
-      if( rc==SQLITE_DONE ){
-        rc = SQLITE_OK;
-        goto seekscan_search_fail;
-      }else{
-        goto abort_due_to_error;
-      }
-    }
-  }
-  
-  break;
-}
-
-
 /* Opcode: SeekHit P1 P2 P3 * *
 ** Synopsis: set P2<=seekHit<=P3
 **
@@ -5115,7 +4959,7 @@ case OP_Insert: {

  if( pOp->p5 & OPFLAG_NCHANGE ) p->nChange++;
  if( pOp->p5 & OPFLAG_LASTROWID ) db->lastRowid = x.nKey;
-  assert( (pData->flags & (MEM_Blob|MEM_Str))!=0 || pData->n==0 );
+  assert( pData->flags & (MEM_Blob|MEM_Str) );
  x.pData = pData->z;
  x.nData = pData->n;
  seekResult = ((pOp->p5 & OPFLAG_USESEEKRESULT) ? pC->seekResult : 0);
@@ -6070,31 +5914,8 @@ case OP_IdxGE:  {       /* jump */
    }
  }
 #endif
-
-  /* Inlined version of sqlite3VdbeIdxKeyCompare() */
-  {
-    i64 nCellKey = 0;
-    BtCursor *pCur;
-    Mem m;
-
-    assert( pC->eCurType==CURTYPE_BTREE );
-    pCur = pC->uc.pCursor;
-    assert( sqlite3BtreeCursorIsValid(pCur) );
-    nCellKey = sqlite3BtreePayloadSize(pCur);
-    /* nCellKey will always be between 0 and 0xffffffff because of the way
-    ** that btreeParseCellPtr() and sqlite3GetVarint32() are implemented */
-    if( nCellKey<=0 || nCellKey>0x7fffffff ){
-      rc = SQLITE_CORRUPT_BKPT;
-      goto abort_due_to_error;
-    }
-    sqlite3VdbeMemInit(&m, db, 0);
-    rc = sqlite3VdbeMemFromBtreeZeroOffset(pCur, (u32)nCellKey, &m);
-    if( rc ) goto abort_due_to_error;
-    res = sqlite3VdbeRecordCompareWithSkip(m.n, m.z, &r, 0);
-    sqlite3VdbeMemRelease(&m);
-  }
-  /* End of inlined sqlite3VdbeIdxKeyCompare() */
-
+  res = 0;  /* Not needed.  Only used to silence a warning. */
+  rc = sqlite3VdbeIdxKeyCompare(db, pC, &r, &res);
  assert( (OP_IdxLE&1)==(OP_IdxLT&1) && (OP_IdxGE&1)==(OP_IdxGT&1) );
  if( (pOp->opcode&1)==(OP_IdxLT&1) ){
    assert( pOp->opcode==OP_IdxLE || pOp->opcode==OP_IdxLT );
@@ -6104,7 +5925,7 @@ case OP_IdxGE:  {       /* jump */
    res++;
  }
  VdbeBranchTaken(res>0,2);
-  assert( rc==SQLITE_OK );
+  if( rc ) goto abort_due_to_error;
  if( res>0 ) goto jump_to_p2;
  break;
 }
@@ -8170,11 +7991,7 @@ default: {          /* This is really OP_Noop, OP_Explain */
  ** an error of some kind.
  */
 abort_due_to_error:
-  if( db->mallocFailed ){
-    rc = SQLITE_NOMEM_BKPT;
-  }else if( rc==SQLITE_IOERR_CORRUPTFS ){
-    rc = SQLITE_CORRUPT_BKPT;
-  }
+  if( db->mallocFailed ) rc = SQLITE_NOMEM_BKPT;
  assert( rc );
  if( p->zErrMsg==0 && rc!=SQLITE_IOERR_NOMEM ){
    sqlite3VdbeError(p, "%s", sqlite3ErrStr(rc));
@@ -475,7 +475,6 @@ void sqlite3VdbeAddParseSchemaOp(Vdbe *p, int iDb, char *zWhere){
  int j;
  sqlite3VdbeAddOp4(p, OP_ParseSchema, iDb, 0, 0, zWhere, P4_DYNAMIC);
  for(j=0; j<p->db->nDb; j++) sqlite3VdbeUsesBtree(p, j);
-  sqlite3MayAbort(p->pParse);
 }

 /*
@@ -704,7 +703,7 @@ int sqlite3VdbeAssertMayAbort(Vdbe *v, int mayAbort){
    if( opcode==OP_Destroy || opcode==OP_VUpdate || opcode==OP_VRename 
     || opcode==OP_VDestroy
     || opcode==OP_VCreate
-     || opcode==OP_ParseSchema
+     || (opcode==OP_ParseSchema && pOp->p4.z==0)
     || ((opcode==OP_Halt || opcode==OP_HaltIfNull) 
      && ((pOp->p1)!=SQLITE_OK && pOp->p2==OE_Abort))
    ){
@@ -1522,7 +1521,7 @@ char *sqlite3VdbeDisplayComment(
              sqlite3_str_appendf(&x, "%d", v1);
            }else if( pCtx->argc>1 ){
              sqlite3_str_appendf(&x, "%d..%d", v1, v1+pCtx->argc-1);
-            }else if( x.accError==0 ){
+            }else{
              assert( x.nChar>2 );
              x.nChar -= 2;
              ii++;
@@ -4295,12 +4294,9 @@ SQLITE_NOINLINE int sqlite3BlobCompare(const Mem *pB1, const Mem *pB2){
 static int sqlite3IntFloatCompare(i64 i, double r){
  if( sizeof(LONGDOUBLE_TYPE)>8 ){
    LONGDOUBLE_TYPE x = (LONGDOUBLE_TYPE)i;
-    testcase( x<r );
-    testcase( x>r );
-    testcase( x==r );
    if( x<r ) return -1;
-    if( x>r ) return +1;  /*NO_TEST*/ /* work around bugs in gcov */
-    return 0;             /*NO_TEST*/ /* work around bugs in gcov */
+    if( x>r ) return +1;
+    return 0;
  }else{
    i64 y;
    double s;
@@ -970,16 +970,13 @@ int sqlite3VdbeSorterInit(
  if( pSorter==0 ){
    rc = SQLITE_NOMEM_BKPT;
  }else{
-    Btree *pBt = db->aDb[0].pBt;
    pSorter->pKeyInfo = pKeyInfo = (KeyInfo*)((u8*)pSorter + sz);
    memcpy(pKeyInfo, pCsr->pKeyInfo, szKeyInfo);
    pKeyInfo->db = 0;
    if( nField && nWorker==0 ){
      pKeyInfo->nKeyField = nField;
    }
-    sqlite3BtreeEnter(pBt);
-    pSorter->pgsz = pgsz = sqlite3BtreeGetPageSize(pBt);
-    sqlite3BtreeLeave(pBt);
+    pSorter->pgsz = pgsz = sqlite3BtreeGetPageSize(db->aDb[0].pBt);
    pSorter->nTask = nWorker + 1;
    pSorter->iPrev = (u8)(nWorker - 1);
    pSorter->bUseThreads = (pSorter->nTask>1);
@@ -235,16 +235,6 @@ static void createMask(WhereMaskSet *pMaskSet, int iCursor){
  pMaskSet->ix[pMaskSet->n++] = iCursor;
 }

-/*
-** If the right-hand branch of the expression is a TK_COLUMN, then return
-** a pointer to the right-hand branch.  Otherwise, return NULL.
-*/
-static Expr *whereRightSubexprIsColumn(Expr *p){
-  p = sqlite3ExprSkipCollateAndLikely(p->pRight);
-  if( ALWAYS(p!=0) && p->op==TK_COLUMN ) return p;
-  return 0;
-}
-
 /*
 ** Advance to the next WhereTerm that matches according to the criteria
 ** established when the pScan object was initialized by whereScanInit().
@@ -267,7 +257,7 @@ static WhereTerm *whereScanNext(WhereScan *pScan){
    do{
      for(pTerm=pWC->a+k; k<pWC->nTerm; k++, pTerm++){
        if( pTerm->leftCursor==iCur
-         && pTerm->u.x.leftColumn==iColumn
+         && pTerm->u.leftColumn==iColumn
         && (iColumn!=XN_EXPR
             || sqlite3ExprCompareSkip(pTerm->pExpr->pLeft,
                                       pScan->pIdxExpr,iCur)==0)
@@ -275,7 +265,8 @@ static WhereTerm *whereScanNext(WhereScan *pScan){
        ){
          if( (pTerm->eOperator & WO_EQUIV)!=0
           && pScan->nEquiv<ArraySize(pScan->aiCur)
-           && (pX = whereRightSubexprIsColumn(pTerm->pExpr))!=0
+           && (pX = sqlite3ExprSkipCollateAndLikely(pTerm->pExpr->pRight))->op
+               ==TK_COLUMN
          ){
            int j;
            for(j=0; j<pScan->nEquiv; j++){
@@ -471,8 +462,7 @@ static int findIndexCol(

  for(i=0; i<pList->nExpr; i++){
    Expr *p = sqlite3ExprSkipCollateAndLikely(pList->a[i].pExpr);
-    if( ALWAYS(p!=0)
-     && p->op==TK_COLUMN
+    if( p->op==TK_COLUMN
     && p->iColumn==pIdx->aiColumn[iCol]
     && p->iTable==iBase
    ){
@@ -536,7 +526,6 @@ static int isDistinctRedundant(
  */
  for(i=0; i<pDistinct->nExpr; i++){
    Expr *p = sqlite3ExprSkipCollateAndLikely(pDistinct->a[i].pExpr);
-    if( NEVER(p==0) ) continue;
    if( p->op==TK_COLUMN && p->iTable==iBase && p->iColumn<0 ) return 1;
  }

@@ -690,8 +679,8 @@ static int termCanDriveIndex(
    return 0;
  }
  if( (pTerm->prereqRight & notReady)!=0 ) return 0;
-  if( pTerm->u.x.leftColumn<0 ) return 0;
-  aff = pSrc->pTab->aCol[pTerm->u.x.leftColumn].affinity;
+  if( pTerm->u.leftColumn<0 ) return 0;
+  aff = pSrc->pTab->aCol[pTerm->u.leftColumn].affinity;
  if( !sqlite3IndexAffinityOk(pTerm->pExpr, aff) ) return 0;
  testcase( pTerm->pExpr->op==TK_IS );
  return 1;
@@ -762,7 +751,7 @@ static void constructAutomaticIndex(
                                sqlite3ExprDup(pParse->db, pExpr, 0));
    }
    if( termCanDriveIndex(pTerm, pSrc, notReady) ){
-      int iCol = pTerm->u.x.leftColumn;
+      int iCol = pTerm->u.leftColumn;
      Bitmask cMask = iCol>=BMS ? MASKBIT(BMS-1) : MASKBIT(iCol);
      testcase( iCol==BMS );
      testcase( iCol==BMS-1 );
@@ -815,14 +804,14 @@ static void constructAutomaticIndex(
  idxCols = 0;
  for(pTerm=pWC->a; pTerm<pWCEnd; pTerm++){
    if( termCanDriveIndex(pTerm, pSrc, notReady) ){
-      int iCol = pTerm->u.x.leftColumn;
+      int iCol = pTerm->u.leftColumn;
      Bitmask cMask = iCol>=BMS ? MASKBIT(BMS-1) : MASKBIT(iCol);
      testcase( iCol==BMS-1 );
      testcase( iCol==BMS );
      if( (idxCols & cMask)==0 ){
        Expr *pX = pTerm->pExpr;
        idxCols |= cMask;
-        pIdx->aiColumn[n] = pTerm->u.x.leftColumn;
+        pIdx->aiColumn[n] = pTerm->u.leftColumn;
        pColl = sqlite3ExprCompareCollSeq(pParse, pX);
        assert( pColl!=0 || pParse->nErr>0 ); /* TH3 collate01.800 */
        pIdx->azColl[n] = pColl ? pColl->zName : sqlite3StrBINARY;
@@ -943,7 +932,7 @@ static sqlite3_index_info *allocateIndexInfo(
    testcase( pTerm->eOperator & WO_ALL );
    if( (pTerm->eOperator & ~(WO_EQUIV))==0 ) continue;
    if( pTerm->wtFlags & TERM_VNULL ) continue;
-    assert( pTerm->u.x.leftColumn>=(-1) );
+    assert( pTerm->u.leftColumn>=(-1) );
    nTerm++;
  }

@@ -1003,8 +992,8 @@ static sqlite3_index_info *allocateIndexInfo(
    ){
      continue;
    }
-    assert( pTerm->u.x.leftColumn>=(-1) );
-    pIdxCons[j].iColumn = pTerm->u.x.leftColumn;
+    assert( pTerm->u.leftColumn>=(-1) );
+    pIdxCons[j].iColumn = pTerm->u.leftColumn;
    pIdxCons[j].iTermOffset = i;
    op = pTerm->eOperator & WO_ALL;
    if( op==WO_IN ) op = WO_EQ;
@@ -1767,9 +1756,9 @@ void sqlite3WhereTermPrint(WhereTerm *pTerm, int iTerm){
    if( pTerm->wtFlags & TERM_CODED  ) zType[3] = 'C';
    if( pTerm->eOperator & WO_SINGLE ){
      sqlite3_snprintf(sizeof(zLeft),zLeft,"left={%d:%d}",
-                       pTerm->leftCursor, pTerm->u.x.leftColumn);
+                       pTerm->leftCursor, pTerm->u.leftColumn);
    }else if( (pTerm->eOperator & WO_OR)!=0 && pTerm->u.pOrInfo!=0 ){
-      sqlite3_snprintf(sizeof(zLeft),zLeft,"indexable=0x%llx", 
+      sqlite3_snprintf(sizeof(zLeft),zLeft,"indexable=0x%lld", 
                       pTerm->u.pOrInfo->indexable);
    }else{
      sqlite3_snprintf(sizeof(zLeft),zLeft,"left=%d", pTerm->leftCursor);
@@ -1783,8 +1772,8 @@ void sqlite3WhereTermPrint(WhereTerm *pTerm, int iTerm){
      sqlite3DebugPrintf(" prob=%-3d prereq=%llx,%llx",
        pTerm->truthProb, (u64)pTerm->prereqAll, (u64)pTerm->prereqRight);
    }
-    if( pTerm->u.x.iField ){
-      sqlite3DebugPrintf(" iField=%d", pTerm->u.x.iField);
+    if( pTerm->iField ){
+      sqlite3DebugPrintf(" iField=%d", pTerm->iField);
    }
    if( pTerm->iParent>=0 ){
      sqlite3DebugPrintf(" iParent=%d", pTerm->iParent);
@@ -2451,9 +2440,9 @@ static int whereLoopAddBtreeIndex(

  pNew = pBuilder->pNew;
  if( db->mallocFailed ) return SQLITE_NOMEM_BKPT;
-  WHERETRACE(0x800, ("BEGIN %s.addBtreeIdx(%s), nEq=%d, nSkip=%d, rRun=%d\n",
+  WHERETRACE(0x800, ("BEGIN %s.addBtreeIdx(%s), nEq=%d, nSkip=%d\n",
                     pProbe->pTable->zName,pProbe->zName,
-                     pNew->u.btree.nEq, pNew->nSkip, pNew->rRun));
+                     pNew->u.btree.nEq, pNew->nSkip));

  assert( (pNew->wsFlags & WHERE_VIRTUALTABLE)==0 );
  assert( (pNew->wsFlags & WHERE_TOP_LIMIT)==0 );
@@ -2547,7 +2536,7 @@ static int whereLoopAddBtreeIndex(
        /* "x IN (value, value, ...)" */
        nIn = sqlite3LogEst(pExpr->x.pList->nExpr);
      }
-      if( pProbe->hasStat1 && rLogSize>=10 ){
+      if( pProbe->hasStat1 ){
        LogEst M, logK, safetyMargin;
        /* Let:
        **   N = the total number of rows in the table
@@ -2566,8 +2555,7 @@ static int whereLoopAddBtreeIndex(
        ** a safety margin of 2 (LogEst: 10) that favors using the IN operator
        ** with the index, as using an index has better worst-case behavior.
        ** If we do not have real sqlite_stat1 data, always prefer to use
-        ** the index.  Do not bother with this optimization on very small
-        ** tables (less than 2 rows) as it is pointless in that case.
+        ** the index.
        */
        M = pProbe->aiRowLogEst[saved_nEq];
        logK = estLog(nIn);
@@ -2576,7 +2564,7 @@ static int whereLoopAddBtreeIndex(
          WHERETRACE(0x40,
            ("Scan preferred over IN operator on column %d of \"%s\" (%d<%d)\n",
             saved_nEq, pProbe->zName, M+logK+10, nIn+rLogSize));
-          pNew->wsFlags |= WHERE_IN_SEEKSCAN;
+          continue;
        }else{
          WHERETRACE(0x40,
            ("IN operator preferred on column %d of \"%s\" (%d>=%d)\n",
@@ -2822,7 +2810,6 @@ static int indexMightHelpWithOrderBy(
  if( (pOB = pBuilder->pWInfo->pOrderBy)==0 ) return 0;
  for(ii=0; ii<pOB->nExpr; ii++){
    Expr *pExpr = sqlite3ExprSkipCollateAndLikely(pOB->a[ii].pExpr);
-    if( NEVER(pExpr==0) ) continue;
    if( pExpr->op==TK_COLUMN && pExpr->iTable==iCursor ){
      if( pExpr->iColumn<0 ) return 1;
      for(jj=0; jj<pIndex->nKeyCol; jj++){
@@ -3054,23 +3041,8 @@ static int whereLoopAddBtree(

      /* Full table scan */
      pNew->iSortIdx = b ? iSortIdx : 0;
-      /* TUNING: Cost of full table scan is 3.0*N.  The 3.0 factor is an
-      ** extra cost designed to discourage the use of full table scans,
-      ** since index lookups have better worst-case performance if our
-      ** stat guesses are wrong.  Reduce the 3.0 penalty slightly
-      ** (to 2.75) if we have valid STAT4 information for the table.
-      ** At 2.75, a full table scan is preferred over using an index on
-      ** a column with just two distinct values where each value has about
-      ** an equal number of appearances.  Without STAT4 data, we still want
-      ** to use an index in that case, since the constraint might be for
-      ** the scarcer of the two values, and in that case an index lookup is
-      ** better.
-      */
-#ifdef SQLITE_ENABLE_STAT4
-      pNew->rRun = rSize + 16 - 2*((pTab->tabFlags & TF_HasStat4)!=0);
-#else
+      /* TUNING: Cost of full table scan is (N*3.0). */
      pNew->rRun = rSize + 16;
-#endif
      ApplyCostMultiplier(pNew->rRun, pTab->costMult);
      whereLoopOutputAdjust(pWC, pNew, rSize);
      rc = whereLoopInsert(pBuilder, pNew);
@@ -3801,7 +3773,6 @@ static i8 wherePathSatisfiesOrderBy(
    for(i=0; i<nOrderBy; i++){
      if( MASKBIT(i) & obSat ) continue;
      pOBExpr = sqlite3ExprSkipCollateAndLikely(pOrderBy->a[i].pExpr);
-      if( NEVER(pOBExpr==0) ) continue;
      if( pOBExpr->op!=TK_COLUMN ) continue;
      if( pOBExpr->iTable!=iCur ) continue;
      pTerm = sqlite3WhereFindTerm(&pWInfo->sWC, iCur, pOBExpr->iColumn,
@@ -3928,7 +3899,6 @@ static i8 wherePathSatisfiesOrderBy(
          pOBExpr = sqlite3ExprSkipCollateAndLikely(pOrderBy->a[i].pExpr);
          testcase( wctrlFlags & WHERE_GROUPBY );
          testcase( wctrlFlags & WHERE_DISTINCTBY );
-          if( NEVER(pOBExpr==0) ) continue;
          if( (wctrlFlags & (WHERE_GROUPBY|WHERE_DISTINCTBY))==0 ) bOnce = 0;
          if( iColumn>=XN_ROWID ){
            if( pOBExpr->op!=TK_COLUMN ) continue;
@@ -4092,7 +4062,7 @@ static LogEst whereSortingCost(

  /* Multiple by log(M) where M is the number of output rows.
  ** Use the LIMIT for M if it is smaller.  Or if this sort is for
-  ** a DISTINCT operator, M will be the number of distinct output
+  ** a DISTINT operator, M will be the number of distinct output
  ** rows, so fudge it downwards a bit.
  */
  if( (pWInfo->wctrlFlags & WHERE_USE_LIMIT)!=0 && pWInfo->iLimit<nRow ){
@@ -5227,7 +5197,6 @@ WhereInfo *sqlite3WhereBegin(
        if( (pLoop->wsFlags & WHERE_CONSTRAINT)!=0
         && (pLoop->wsFlags & (WHERE_COLUMN_RANGE|WHERE_SKIPSCAN))==0
         && (pLoop->wsFlags & WHERE_BIGNULL_SORT)==0
-         && (pLoop->wsFlags & WHERE_IN_SEEKSCAN)==0
         && (pWInfo->wctrlFlags&WHERE_ORDERBY_MIN)==0
         && pWInfo->eDistinct!=WHERE_DISTINCT_ORDERED
        ){
@@ -5390,9 +5359,7 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
        sqlite3VdbeJumpHere(v, pIn->addrInTop+1);
        if( pIn->eEndLoopOp!=OP_Noop ){
          if( pIn->nPrefix ){
-            int bEarlyOut = 
-                (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0
-                 && (pLoop->wsFlags & WHERE_IN_EARLYOUT)!=0;
+            assert( pLoop->wsFlags & WHERE_IN_EARLYOUT );
            if( pLevel->iLeftJoin ){
              /* For LEFT JOIN queries, cursor pIn->iCur may not have been
              ** opened yet. This occurs for WHERE clauses such as
@@ -5403,10 +5370,12 @@ void sqlite3WhereEnd(WhereInfo *pWInfo){
              ** jump over the OP_Next or OP_Prev instruction about to
              ** be coded.  */
              sqlite3VdbeAddOp2(v, OP_IfNotOpen, pIn->iCur, 
-                  sqlite3VdbeCurrentAddr(v) + 2 + bEarlyOut);
+                  sqlite3VdbeCurrentAddr(v) + 2 + 
+                     ((pLoop->wsFlags & WHERE_VIRTUALTABLE)==0)
+              );
              VdbeCoverage(v);
            }
-            if( bEarlyOut ){
+            if( (pLoop->wsFlags & WHERE_VIRTUALTABLE)==0 ){
              sqlite3VdbeAddOp4Int(v, OP_IfNoHope, pLevel->iIdxCur,
                  sqlite3VdbeCurrentAddr(v)+2,
                  pIn->iBase, pIn->nPrefix);
@@ -261,11 +261,9 @@ struct WhereTerm {
  u8 eMatchOp;            /* Op for vtab MATCH/LIKE/GLOB/REGEXP terms */
  int iParent;            /* Disable pWC->a[iParent] when this term disabled */
  int leftCursor;         /* Cursor number of X in "X <op> <expr>" */
+  int iField;             /* Field in (?,?,?) IN (SELECT...) vector */
  union {
-    struct {
-      int leftColumn;         /* Column number of X in "X <op> <expr>" */
-      int iField;             /* Field in (?,?,?) IN (SELECT...) vector */
-    } x;                    /* Opcode other than OP_OR or OP_AND */
+    int leftColumn;         /* Column number of X in "X <op> <expr>" */
    WhereOrInfo *pOrInfo;   /* Extra information if (eOperator & WO_OR)!=0 */
    WhereAndInfo *pAndInfo; /* Extra information if (eOperator& WO_AND)!=0 */
  } u;
@@ -619,6 +617,5 @@ void sqlite3WhereTabFuncArgs(Parse*, struct SrcList_item*, WhereClause*);
 #define WHERE_PARTIALIDX   0x00020000  /* The automatic index is partial */
 #define WHERE_IN_EARLYOUT  0x00040000  /* Perhaps quit IN loops early */
 #define WHERE_BIGNULL_SORT 0x00080000  /* Column nEq of index is BIGNULL */
-#define WHERE_IN_SEEKSCAN  0x00100000  /* Seek-scan optimization for IN */

 #endif /* !defined(SQLITE_WHEREINT_H) */
@@ -427,7 +427,7 @@ static Expr *removeUnindexableInClauseTerms(

    for(i=iEq; i<pLoop->nLTerm; i++){
      if( pLoop->aLTerm[i]->pExpr==pX ){
-        int iField = pLoop->aLTerm[i]->u.x.iField - 1;
+        int iField = pLoop->aLTerm[i]->iField - 1;
        if( pOrigRhs->a[iField].pExpr==0 ) continue; /* Duplicate PK column */
        pRhs = sqlite3ExprListAppend(pParse, pRhs, pOrigRhs->a[iField].pExpr);
        pOrigRhs->a[iField].pExpr = 0;
@@ -570,7 +570,7 @@ static int codeEqualityTerm(
    if( pLevel->u.in.nIn==0 ){
      pLevel->addrNxt = sqlite3VdbeMakeLabel(pParse);
    }
-    if( iEq>0 && (pLoop->wsFlags & WHERE_IN_SEEKSCAN)==0 ){
+    if( iEq>0 ){
      pLoop->wsFlags |= WHERE_IN_EARLYOUT;
    }

@@ -608,12 +608,7 @@ static int codeEqualityTerm(
          pIn++;
        }
      }
-      testcase( iEq>0
-                && (pLoop->wsFlags & WHERE_IN_SEEKSCAN)==0
-                && (pLoop->wsFlags & WHERE_VIRTUALTABLE)!=0 );
-      if( iEq>0 
-       && (pLoop->wsFlags & (WHERE_IN_SEEKSCAN|WHERE_VIRTUALTABLE))==0
-      ){
+      if( iEq>0 ){
        sqlite3VdbeAddOp3(v, OP_SeekHit, pLevel->iIdxCur, 0, iEq);
      }
    }else{
@@ -1402,9 +1397,6 @@ Bitmask sqlite3WhereCodeOneLoopStart(
                      pLoop->u.vtab.needFree ? P4_DYNAMIC : P4_STATIC);
    VdbeCoverage(v);
    pLoop->u.vtab.needFree = 0;
-    /* An OOM inside of AddOp4(OP_VFilter) instruction above might have freed
-    ** the u.vtab.idxStr.  NULL it out to prevent a use-after-free */
-    if( db->mallocFailed ) pLoop->u.vtab.idxStr = 0;
    pLevel->p1 = iCur;
    pLevel->op = pWInfo->eOnePass ? OP_Noop : OP_VNext;
    pLevel->p2 = sqlite3VdbeCurrentAddr(v);
@@ -1663,7 +1655,6 @@ Bitmask sqlite3WhereCodeOneLoopStart(
    u8 bStopAtNull = 0;          /* Add condition to terminate at NULLs */
    int omitTable;               /* True if we use the index only */
    int regBignull = 0;          /* big-null flag register */
-    int addrSeekScan = 0;        /* Opcode of the OP_SeekScan, if any */

    pIdx = pLoop->u.btree.pIndex;
    iIdxCur = pLevel->iIdxCur;
@@ -1769,7 +1760,8 @@ Bitmask sqlite3WhereCodeOneLoopStart(
      Expr *pRight = pRangeStart->pExpr->pRight;
      codeExprOrVector(pParse, pRight, regBase+nEq, nBtm);
      whereLikeOptimizationStringFixup(v, pLevel, pRangeStart);
-      if( (pRangeStart->wtFlags & TERM_VNULL)==0
+      if( !bRev
+       && (pRangeStart->wtFlags & TERM_VNULL)==0
       && sqlite3ExprCanBeNull(pRight)
      ){
        sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
@@ -1809,20 +1801,6 @@ Bitmask sqlite3WhereCodeOneLoopStart(

      op = aStartOp[(start_constraints<<2) + (startEq<<1) + bRev];
      assert( op!=0 );
-      if( (pLoop->wsFlags & WHERE_IN_SEEKSCAN)!=0 && op==OP_SeekGE ){
-        assert( regBignull==0 );
-        /* TUNING:  The OP_SeekScan opcode seeks to reduce the number
-        ** of expensive seek operations by replacing a single seek with
-        ** 1 or more step operations.  The question is, how many steps
-        ** should we try before giving up and going with a seek.  The cost
-        ** of a seek is proportional to the logarithm of the of the number
-        ** of entries in the tree, so basing the number of steps to try
-        ** on the estimated number of rows in the btree seems like a good
-        ** guess. */
-        addrSeekScan = sqlite3VdbeAddOp1(v, OP_SeekScan, 
-                                         (pIdx->aiRowLogEst[0]+9)/10);
-        VdbeCoverage(v);
-      }
      sqlite3VdbeAddOp4Int(v, op, iIdxCur, addrNxt, regBase, nConstraint);
      VdbeCoverage(v);
      VdbeCoverageIf(v, op==OP_Rewind);  testcase( op==OP_Rewind );
@@ -1858,7 +1836,8 @@ Bitmask sqlite3WhereCodeOneLoopStart(
      Expr *pRight = pRangeEnd->pExpr->pRight;
      codeExprOrVector(pParse, pRight, regBase+nEq, nTop);
      whereLikeOptimizationStringFixup(v, pLevel, pRangeEnd);
-      if( (pRangeEnd->wtFlags & TERM_VNULL)==0
+      if( bRev
+       && (pRangeEnd->wtFlags & TERM_VNULL)==0
       && sqlite3ExprCanBeNull(pRight)
      ){
        sqlite3VdbeAddOp2(v, OP_IsNull, regBase+nEq, addrNxt);
@@ -1905,7 +1884,6 @@ Bitmask sqlite3WhereCodeOneLoopStart(
      testcase( op==OP_IdxGE );  VdbeCoverageIf(v, op==OP_IdxGE );
      testcase( op==OP_IdxLT );  VdbeCoverageIf(v, op==OP_IdxLT );
      testcase( op==OP_IdxLE );  VdbeCoverageIf(v, op==OP_IdxLE );
-      if( addrSeekScan ) sqlite3VdbeJumpHere(v, addrSeekScan);
    }
    if( regBignull ){
      /* During a NULL-scan, check to see if we have reached the end of
@@ -1925,7 +1903,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
      testcase( op==OP_IdxLE );  VdbeCoverageIf(v, op==OP_IdxLE );
    }

-    if( (pLoop->wsFlags & WHERE_IN_EARLYOUT)!=0 ){
+    if( pLoop->wsFlags & WHERE_IN_EARLYOUT ){
      sqlite3VdbeAddOp3(v, OP_SeekHit, iIdxCur, nEq, nEq);
    }

@@ -2433,7 +2411,7 @@ Bitmask sqlite3WhereCodeOneLoopStart(
 #endif
    assert( !ExprHasProperty(pE, EP_FromJoin) );
    assert( (pTerm->prereqRight & pLevel->notReady)!=0 );
-    pAlt = sqlite3WhereFindTerm(pWC, iCur, pTerm->u.x.leftColumn, notReady,
+    pAlt = sqlite3WhereFindTerm(pWC, iCur, pTerm->u.leftColumn, notReady,
                    WO_EQ|WO_IN|WO_IS, 0);
    if( pAlt==0 ) continue;
    if( pAlt->wtFlags & (TERM_CODED) ) continue;
@@ -798,7 +798,7 @@ static void exprAnalyzeOrTerm(
          assert( pOrTerm->wtFlags & (TERM_COPIED|TERM_VIRTUAL) );
          continue;
        }
-        iColumn = pOrTerm->u.x.leftColumn;
+        iColumn = pOrTerm->u.leftColumn;
        iCursor = pOrTerm->leftCursor;
        pLeft = pOrTerm->pExpr->pLeft;
        break;
@@ -820,7 +820,7 @@ static void exprAnalyzeOrTerm(
        assert( pOrTerm->eOperator & WO_EQ );
        if( pOrTerm->leftCursor!=iCursor ){
          pOrTerm->wtFlags &= ~TERM_OR_OK;
-        }else if( pOrTerm->u.x.leftColumn!=iColumn || (iColumn==XN_EXPR 
+        }else if( pOrTerm->u.leftColumn!=iColumn || (iColumn==XN_EXPR 
               && sqlite3ExprCompare(pParse, pOrTerm->pExpr->pLeft, pLeft, -1)
        )){
          okToChngToIN = 0;
@@ -855,7 +855,7 @@ static void exprAnalyzeOrTerm(
        if( (pOrTerm->wtFlags & TERM_OR_OK)==0 ) continue;
        assert( pOrTerm->eOperator & WO_EQ );
        assert( pOrTerm->leftCursor==iCursor );
-        assert( pOrTerm->u.x.leftColumn==iColumn );
+        assert( pOrTerm->u.leftColumn==iColumn );
        pDup = sqlite3ExprDup(db, pOrTerm->pExpr->pRight, 0);
        pList = sqlite3ExprListAppend(pWInfo->pParse, pList, pDup);
        pLeft = pOrTerm->pExpr->pLeft;
@@ -1091,15 +1091,15 @@ static void exprAnalyze(
    Expr *pRight = sqlite3ExprSkipCollate(pExpr->pRight);
    u16 opMask = (pTerm->prereqRight & prereqLeft)==0 ? WO_ALL : WO_EQUIV;

-    if( pTerm->u.x.iField>0 ){
+    if( pTerm->iField>0 ){
      assert( op==TK_IN );
      assert( pLeft->op==TK_VECTOR );
-      pLeft = pLeft->x.pList->a[pTerm->u.x.iField-1].pExpr;
+      pLeft = pLeft->x.pList->a[pTerm->iField-1].pExpr;
    }

    if( exprMightBeIndexed(pSrc, prereqLeft, aiCurCol, pLeft, op) ){
      pTerm->leftCursor = aiCurCol[0];
-      pTerm->u.x.leftColumn = aiCurCol[1];
+      pTerm->u.leftColumn = aiCurCol[1];
      pTerm->eOperator = operatorMask(op) & opMask;
    }
    if( op==TK_IS ) pTerm->wtFlags |= TERM_IS;
@@ -1109,7 +1109,7 @@ static void exprAnalyze(
      WhereTerm *pNew;
      Expr *pDup;
      u16 eExtraOp = 0;        /* Extra bits for pNew->eOperator */
-      assert( pTerm->u.x.iField==0 );
+      assert( pTerm->iField==0 );
      if( pTerm->leftCursor>=0 ){
        int idxNew;
        pDup = sqlite3ExprDup(db, pExpr, 0);
@@ -1135,7 +1135,7 @@ static void exprAnalyze(
      }
      pNew->wtFlags |= exprCommute(pParse, pDup);
      pNew->leftCursor = aiCurCol[0];
-      pNew->u.x.leftColumn = aiCurCol[1];
+      pNew->u.leftColumn = aiCurCol[1];
      testcase( (prereqLeft | extraRight) != prereqLeft );
      pNew->prereqRight = prereqLeft | extraRight;
      pNew->prereqAll = prereqAll;
@@ -1309,7 +1309,7 @@ static void exprAnalyze(
        pNewTerm = &pWC->a[idxNew];
        pNewTerm->prereqRight = prereqExpr;
        pNewTerm->leftCursor = pLeft->iTable;
-        pNewTerm->u.x.leftColumn = pLeft->iColumn;
+        pNewTerm->u.leftColumn = pLeft->iColumn;
        pNewTerm->eOperator = WO_AUX;
        pNewTerm->eMatchOp = eOp2;
        markTermAsChild(pWC, idxNew, idxTerm);
@@ -1356,13 +1356,13 @@ static void exprAnalyze(
  /* If there is a vector IN term - e.g. "(a, b) IN (SELECT ...)" - create
  ** a virtual term for each vector component. The expression object
  ** used by each such virtual term is pExpr (the full vector IN(...) 
-  ** expression). The WhereTerm.u.x.iField variable identifies the index within
+  ** expression). The WhereTerm.iField variable identifies the index within
  ** the vector on the LHS that the virtual term represents.
  **
  ** This only works if the RHS is a simple SELECT (not a compound) that does
  ** not use window functions.
  */
-  if( pWC->op==TK_AND && pExpr->op==TK_IN && pTerm->u.x.iField==0
+  if( pWC->op==TK_AND && pExpr->op==TK_IN && pTerm->iField==0
   && pExpr->pLeft->op==TK_VECTOR
   && pExpr->x.pSelect->pPrior==0
 #ifndef SQLITE_OMIT_WINDOWFUNC
@@ -1373,7 +1373,7 @@ static void exprAnalyze(
    for(i=0; i<sqlite3ExprVectorSize(pExpr->pLeft); i++){
      int idxNew;
      idxNew = whereClauseInsert(pWC, pExpr, TERM_VIRTUAL);
-      pWC->a[idxNew].u.x.iField = i+1;
+      pWC->a[idxNew].iField = i+1;
      exprAnalyze(pSrc, pWC, idxNew);
      markTermAsChild(pWC, idxNew, idxTerm);
    }
@@ -1408,7 +1408,7 @@ static void exprAnalyze(
      pNewTerm = &pWC->a[idxNew];
      pNewTerm->prereqRight = 0;
      pNewTerm->leftCursor = pLeft->iTable;
-      pNewTerm->u.x.leftColumn = pLeft->iColumn;
+      pNewTerm->u.leftColumn = pLeft->iColumn;
      pNewTerm->eOperator = WO_GT;
      markTermAsChild(pWC, idxNew, idxTerm);
      pTerm = &pWC->a[idxTerm];
@@ -1451,7 +1451,6 @@ static void exprAnalyze(
 void sqlite3WhereSplit(WhereClause *pWC, Expr *pExpr, u8 op){
  Expr *pE2 = sqlite3ExprSkipCollateAndLikely(pExpr);
  pWC->op = op;
-  assert( pE2!=0 || pExpr==0 );
  if( pE2==0 ) return;
  if( pE2->op!=op ){
    whereClauseInsert(pWC, pExpr, 0);
@@ -72,10 +72,10 @@ do_execsql_test affinity3-200 {
  CREATE TABLE mzed AS SELECT * FROM idmap;
 }

-#do_execsql_test affinity3-210 {
-  #PRAGMA automatic_index=ON;
-  #SELECT * FROM data JOIN idmap USING(id);
-#} {1 abc a 4 xyz e}
+do_execsql_test affinity3-210 {
+  PRAGMA automatic_index=ON;
+  SELECT * FROM data JOIN idmap USING(id);
+} {1 abc a 4 xyz e}
 do_execsql_test affinity3-220 {
  SELECT * FROM data JOIN mzed USING(id);
 } {1 abc a 4 xyz e}
@@ -677,39 +677,4 @@ do_execsql_test 22.1 {
  SELECT * FROM t1;
 } {1 2 78 a b 78}

-#-------------------------------------------------------------------------
-reset_db
-db collate compare64 compare64
-
-do_execsql_test 23.1 {
-  CREATE TABLE gigo(a text);
-  CREATE TABLE idx(x text COLLATE compare64);
-  CREATE VIEW v1 AS SELECT * FROM idx WHERE x='abc';
-}
-db close
-sqlite3 db test.db
-
-do_execsql_test 23.2 {
-  alter table gigo rename to ggiiggoo;
-  alter table idx rename to idx2;
-}
-
-do_execsql_test 23.3 {
-  SELECT sql FROM sqlite_master;
-} {
-  {CREATE TABLE "ggiiggoo"(a text)} 
-  {CREATE TABLE "idx2"(x text COLLATE compare64)}
-  {CREATE VIEW v1 AS SELECT * FROM "idx2" WHERE x='abc'}
-}
-
-do_execsql_test 23.4 {
-  ALTER TABLE idx2 RENAME x TO y;
-  SELECT sql FROM sqlite_master;
-} {
-  {CREATE TABLE "ggiiggoo"(a text)} 
-  {CREATE TABLE "idx2"(y text COLLATE compare64)}
-  {CREATE VIEW v1 AS SELECT * FROM "idx2" WHERE y='abc'}
-}
-
 finish_test
-
@@ -600,52 +600,5 @@ do_execsql_test 25.1 {
 #  ALTER TABLE t2 RENAME COLUMN a TO aaa;
 #}

-#------------------------------------------------------------------------
-#
-reset_db
-do_execsql_test 26.1 {
-  CREATE TABLE t1(x);
-
-  CREATE TABLE t3(y);
-  CREATE TABLE t4(z);
-
-  CREATE TRIGGER tr1 INSERT ON t3 BEGIN
-    UPDATE t3 SET y=z FROM (SELECT z FROM t4);
-  END;
-
-  CREATE TRIGGER tr2 INSERT ON t3 BEGIN
-    UPDATE t3 SET y=abc FROM (SELECT x AS abc FROM t1);
-  END;
-}
-
-do_execsql_test 26.2 {
-  ALTER TABLE t1 RENAME TO t2;
-}
-
-do_execsql_test 26.3 {
-  ALTER TABLE t2 RENAME x TO xx;
-}
-
-do_execsql_test 26.4 {
-  SELECT sql FROM sqlite_schema WHERE name='tr2'
-} {
-{CREATE TRIGGER tr2 INSERT ON t3 BEGIN
-    UPDATE t3 SET y=abc FROM (SELECT xx AS abc FROM "t2");
-  END}
-}
-
-# 2020-11-02 OSSFuzz 
-#
-reset_db
-do_execsql_test 26.5 {
-  CREATE TABLE t1(xx);
-  CREATE TRIGGER xx INSERT ON t1 BEGIN
-     UPDATE t1 SET xx=xx FROM(SELECT xx);
-  END;
-} {}
-do_catchsql_test 26.6 {
-  ALTER TABLE t1 RENAME TO t2;
-} {1 {error in trigger xx: ambiguous column name: xx}}
-
-
 finish_test
+
@@ -131,41 +131,5 @@ do_multiclient_test tn {
  }
 }

-#-------------------------------------------------------------------------
-# Check that even if the busy-handler fails (returns zero) within a
-# call to sqlite3_prepare() (or _v2(), or _v3()), it is still invoked
-# the next time an SQLITE_BUSY is encountered.
-#
-do_multiclient_test tn {
-  code1 {
-    set ::busy_called 0
-    proc busy {args} {
-      if {$::busy_called} { return 1 }
-      set ::busy_called 1
-      return 0
-    }
-    db busy busy
-  }
-
-  do_test 3.$tn.1 {
-    sql2 {
-      CREATE TABLE t1(x);
-      BEGIN EXCLUSIVE;
-        INSERT INTO t1 VALUES('x');
-    }
-  } {}
-
-  do_test 3.$tn.2 {
-    set ::busy_called 0
-    list [catch { sql1 { SELECT * FROM t1 } } msg] $::busy_called
-  } {1 1}
-
-  do_test 3.$tn.3 {
-    set ::busy_called 0
-    list [catch { sql1 { SELECT * FROM t1 } } msg] $::busy_called
-  } {1 1}
-
-}
-
 finish_test

@@ -1,100 +0,0 @@
-# 2020-11-17
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-# 
-# This file implements tests for CARRAY extension
-#
-
-set testdir [file dirname $argv0]
-source $testdir/tester.tcl
-set testprefix carray01
-
-ifcapable !vtab {
-  finish_test
-  return
-}
-load_static_extension db carray
-
-# Parameter $stmt must be a prepared statement created using
-# the sqlite3_prepare_v2 command and with parameters fullly bound.
-# This routine simply runs the statement, gathers the result, and
-# returns a list containing the result.
-#
-# If the optional second argument is true, then the stmt is finalized
-# after it is run.
-#
-proc run_stmt {stmt {finalizeFlag 0}} {
-  set r {}
-  while {[sqlite3_step $stmt]=="SQLITE_ROW"} {
-    for {set i 0} {$i<[sqlite3_data_count $stmt]} {incr i} {
-      lappend r [sqlite3_column_text $stmt $i]
-    }
-  }
-  if {$finalizeFlag} {
-    sqlite3_finalize $stmt
-  } else {
-    sqlite3_reset $stmt
-  }
-  return $r
-}
-
-do_test 100 {
-  set STMT [sqlite3_prepare_v2 db {SELECT 5 IN carray(?3)} -1]
-  sqlite3_carray_bind $STMT 3 1 2 3 4 5 6 7
-  run_stmt $STMT 0
-} {1}
-do_test 101 {
-  sqlite3_carray_bind -static $STMT 3 1 2 3 4 5 6 7
-  run_stmt $STMT 0
-} {1}
-do_test 110 {
-  sqlite3_carray_bind $STMT 3 1 2 3 4 6 7
-  run_stmt $STMT 0
-} {0}
-do_test 120 {
-  sqlite3_carray_bind -int64 $STMT 3 1 2 3 4 5 6 7
-  run_stmt $STMT 0
-} {1}
-do_test 130 {
-  sqlite3_carray_bind -int64 $STMT 3 1 2 3 4 6 7
-  run_stmt $STMT 0
-} {0}
-do_test 131 {
-  sqlite3_carray_bind -int64 -static $STMT 3 1 2 3 4 6 7
-  run_stmt $STMT 0
-} {0}
-do_test 140 {
-  sqlite3_carray_bind -double $STMT 3 1 2 3 4 5 6 7
-  run_stmt $STMT 0
-} {1}
-do_test 150 {
-  sqlite3_carray_bind -double $STMT 3 1 2 3 4 6 7
-  run_stmt $STMT 0
-} {0}
-do_test 160 {
-  sqlite3_carray_bind -double $STMT 3 1 2 3 4 5 6 7
-  run_stmt $STMT 0
-} {1}
-do_test 170 {
-  sqlite3_carray_bind -text -static $STMT 3 1 2 3 4 6 7
-  run_stmt $STMT 0
-} {0}
-do_test 180 {
-  sqlite3_carray_bind -text -transient $STMT 3 1 2 3 4 5 6 7
-  run_stmt $STMT 0
-} {0}
-do_test 190 {
-  sqlite3_carray_bind $STMT 3
-  run_stmt $STMT 0
-} {0}
-
-sqlite3_finalize $STMT
-
-finish_test
@@ -474,14 +474,5 @@ ifcapable utf16 {
  } 1
 }

-reset_db
-do_execsql_test cast-9.0 {
-  CREATE TABLE t0(c0);
-  INSERT INTO t0(c0) VALUES (0);
-  CREATE VIEW v1(c0, c1) AS 
-    SELECT CAST(0.0 AS NUMERIC), COUNT(*) OVER () FROM t0;
-  SELECT v1.c0 FROM v1, t0 WHERE v1.c0=0; 
-} {0.0}
-

 finish_test
@@ -266,7 +266,7 @@ do_execsql_test 2030 {
  ANALYZE;
 }
 do_execsql_test 2040 {
-  SELECT DISTINCT a, b, x FROM t3 CROSS JOIN t2 ORDER BY a, +b; 
+  SELECT DISTINCT a, b, x FROM t3 CROSS JOIN t2 ORDER BY a; 
 } {
  one 0 1
  one 1 1
@@ -254,9 +254,8 @@ foreach {tn a b} {
 #-------------------------------------------------------------------------
 # Test the % operator.
 #
-# EVIDENCE-OF: R-53431-59159 The % operator casts both of its operands
-# to type INTEGER and then computes the remainder after dividing the
-# left integer by the right integer.
+# EVIDENCE-OF: R-04223-04352 The operator % outputs the integer value of
+# its left operand modulo its right operand.
 #
 do_execsql_test e_expr-6.1 {SELECT  72%5}  {2}
 do_execsql_test e_expr-6.2 {SELECT  72%-5} {2}
@@ -627,7 +627,7 @@ static int decodeDatabase(
  unsigned char **paDecode,      /* OUT: decoded database file */
  int *pnDecode                  /* OUT: Size of decoded database */
 ){
-  unsigned char *a, *aNew;       /* Database under construction */
+  unsigned char *a;              /* Database under construction */
  int mx = 0;                    /* Current size of the database */
  sqlite3_uint64 nAlloc = 4096;  /* Space allocated in a[] */
  unsigned int i;                /* Next byte of zIn[] to read */
@@ -673,12 +673,11 @@ static int decodeDatabase(
            }
            newSize = MX_FILE_SZ;
          }
-          aNew = sqlite3_realloc64( a, newSize );
-          if( aNew==0 ){
-            sqlite3_free(a);
-            return -1;
+          a = sqlite3_realloc64( a, newSize );
+          if( a==0 ){
+            fprintf(stderr, "Out of memory!\n");
+            exit(1);
          }
-          a = aNew;
          assert( newSize > nAlloc );
          memset(a+nAlloc, 0, (size_t)(newSize - nAlloc));
          nAlloc = newSize;
@@ -852,8 +851,7 @@ int runCombinedDbSqlInput(const uint8_t *aData, size_t nByte){
    int nAlloc = 0;
    int nNotUsed = 0;
    sqlite3_status(SQLITE_STATUS_MALLOC_COUNT, &nAlloc, &nNotUsed, 0);
-    fprintf(stderr,"memory leak prior to test start:"
-                   " %lld bytes in %d allocations\n",
+    fprintf(stderr,"Memory leak in mutator: %lld bytes in %d allocations\n",
            sqlite3_memory_used(), nAlloc);
    exit(1);
  }
@@ -868,10 +866,7 @@ int runCombinedDbSqlInput(const uint8_t *aData, size_t nByte){
    fflush(stdout);
  }
  rc = sqlite3_open(0, &cx.db);
-  if( rc ){
-    sqlite3_free(aDb);
-    return 1;
-  }
+  if( rc ) return 1;
  if( bVdbeDebug ){
    sqlite3_exec(cx.db, "PRAGMA vdbe_debug=ON", 0, 0, 0);
  }
@@ -1415,8 +1410,7 @@ static void showHelp(void){
 "  --export-sql DIR     Write SQL to file(s) in DIR. Also works with --sqlid\n"
 "  --help               Show this help text\n"
 "  --info               Show information about SOURCE-DB w/o running tests\n"
-"  --limit-depth N      Limit expression depth to N.  Default: 500\n"
-"  --limit-heap N       Limit heap memory to N.  Default: 100M\n"
+"  --limit-depth N      Limit expression depth to N\n"
 "  --limit-mem N        Limit memory used by test SQLite instance to N bytes\n"
 "  --limit-vdbe         Panic if any test runs for more than 100,000 cycles\n"
 "  --load-sql ARGS...   Load SQL scripts fron files into SOURCE-DB\n"
@@ -1430,7 +1424,6 @@ static void showHelp(void){
 "  -q|--quiet           Reduced output\n"
 "  --rebuild            Rebuild and vacuum the database file\n"
 "  --result-trace       Show the results of each SQL command\n"
-"  --skip N             Skip the first N test cases\n"
 "  --spinner            Use a spinner to show progress\n"
 "  --sqlid N            Use only SQL where sqlid=N\n"
 "  --timeout N          Abort if any single test needs more than N seconds\n"
@@ -1458,7 +1451,6 @@ int main(int argc, char **argv){
  int rebuildFlag = 0;         /* --rebuild */
  int vdbeLimitFlag = 0;       /* --limit-vdbe */
  int infoFlag = 0;            /* --info */
-  int nSkip = 0;               /* --skip */
  int bSpinner = 0;            /* True for --spinner */
  int timeoutTest = 0;         /* undocumented --timeout-test flag */
  int runFlags = 0;            /* Flags sent to runSql() */
@@ -1528,10 +1520,6 @@ int main(int argc, char **argv){
        if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]);
        depthLimit = integerValue(argv[++i]);
      }else
-      if( strcmp(z,"limit-heap")==0 ){
-        if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]);
-        heapLimit = integerValue(argv[++i]);
-      }else
      if( strcmp(z,"limit-mem")==0 ){
        if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]);
        nMem = integerValue(argv[++i]);
@@ -1590,10 +1578,6 @@ int main(int argc, char **argv){
      if( strcmp(z,"result-trace")==0 ){
        runFlags |= SQL_OUTPUT;
      }else
-      if( strcmp(z,"skip")==0 ){
-        if( i>=argc-1 ) fatalError("missing arguments on %s", argv[i]);
-        nSkip = atoi(argv[++i]);
-      }else
      if( strcmp(z,"spinner")==0 ){
        bSpinner = 1;
      }else
@@ -1914,11 +1898,7 @@ int main(int argc, char **argv){
            prevAmt = amt;
          }
        }
-        if( nSkip>0 ){
-          nSkip--;
-        }else{
-          runCombinedDbSqlInput(pSql->a, pSql->sz);
-        }
+        runCombinedDbSqlInput(pSql->a, pSql->sz);
        nTest++;
        g.zTestName[0] = 0;
        disableOom();
@@ -1947,10 +1927,6 @@ int main(int argc, char **argv){
            prevAmt = amt;
          }
        }
-        if( nSkip>0 ){
-          nSkip--;
-          continue;
-        }
        createVFile("main.db", pDb->sz, pDb->a);
        sqlite3_randomness(0,0);
        if( ossFuzzThisDb ){
@@ -65,8 +65,8 @@ foreach {tn sql1 sql2} {
  3 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING a=2"
    "SELECT a, sum(b) FROM t1 WHERE a=2 GROUP BY a COLLATE binary"

-  5 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING 1"
-    "SELECT a, sum(b) FROM t1 WHERE 1 GROUP BY a COLLATE binary"
+  5 "SELECT a, sum(b) FROM t1 GROUP BY a COLLATE binary HAVING 0"
+    "SELECT a, sum(b) FROM t1 WHERE 0 GROUP BY a COLLATE binary"

  6 "SELECT count(*) FROM t1,t2 WHERE a=c GROUP BY b, d HAVING b=d"
    "SELECT count(*) FROM t1,t2 WHERE a=c AND b=d GROUP BY b, d"
@@ -154,25 +154,5 @@ do_execsql_test 4.3 {
  SELECT a, sum(b) FROM t3 WHERE nondeter(a) GROUP BY a
 } {1 4 2 2}

-#-------------------------------------------------------------------------
-reset_db
-do_execsql_test 5.0 {
-  CREATE TABLE t1(a, b);
-  CREATE TABLE t2(x, y);
-  INSERT INTO t1 VALUES('a', 'b');
-}
-
-# The WHERE clause (a=2), uses an aggregate column from the outer query.
-# If the HAVING term (0) is moved into the WHERE clause in this case,
-# SQLite would at one point optimize (a=2 AND 0) to simply (0). Which
-# is logically correct, but happened to cause problems in aggregate
-# processing for the outer query. This test case verifies that those 
-# problems are no longer present.
-do_execsql_test 5.1 {
-  SELECT min(b), (
-    SELECT x FROM t2 WHERE a=2 GROUP BY y HAVING 0
-  ) FROM t1;
-} {b {}}
-

 finish_test
@@ -1025,18 +1025,5 @@ do_execsql_test join-24.2 {
  SELECT * FROM t2 LEFT JOIN t1 ON a=0 WHERE (x='x' OR x IS NULL);
 } {1 {} {}}

-# 2020-09-30 ticket 66e4b0e271c47145
-# The query flattener inserts an "expr AND expr" expression as a substitution
-# for the column of a view where that view column is part of an ON expression
-# of a LEFT JOIN.
-#
-reset_db
-do_execsql_test join-25.1 {
-  CREATE TABLE t0(c0 INT);
-  CREATE VIEW v0 AS SELECT (NULL AND 5) as c0 FROM t0;
-  INSERT INTO t0(c0) VALUES (NULL);
-  SELECT count(*)  FROM v0 LEFT JOIN t0 ON v0.c0;
-} {1}
-
-
 finish_test
+
@@ -147,22 +147,6 @@ ifcapable compound {
  } {1 91 92 3 93 5}
 }

-do_execsql_test join6-5.1 {
-  CREATE TABLE tx(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o PRIMARY KEY) 
-  WITHOUT ROWID;
-  INSERT INTO tx VALUES(
-    1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
-  );
-} {}
-do_execsql_test joint6-5.2 {
-  SELECT o FROM tx NATURAL JOIN tx;
-} {15}
-
-do_execsql_test join6-5.3 {
-  CREATE TABLE ty(a,Ñ,x6,x7,x8,Q,I,v,x1,L,E,x2,x3,x4,x5,s,g PRIMARY KEY,b,c)
-  WITHOUT ROWID;
-  SELECT a FROM ty NATURAL JOIN ty;
-}



@@ -296,12 +296,5 @@ do_execsql_test null-9.3 {
  SELECT * FROM t5 WHERE a IS NULL AND b = 'x';
 } {{} x two {} x ii}

-# 2020-09-30 ticket 5c4e7aa793943803
-reset_db
-do_execsql_test null-10.1 {
-  CREATE TABLE t0(c0 PRIMARY KEY DESC);
-  INSERT INTO t0(c0) VALUES (0);
-  SELECT * FROM t0 WHERE t0.c0 > NULL;
-} {}

 finish_test
@@ -1201,13 +1201,4 @@ do_execsql_test select-20.20 {
  SELECT ifnull(a, max((SELECT 123))), count(a) FROM t1 ;
 } {10 1}

-# 2020-10-02 dbsqlfuzz find
-reset_db
-do_execsql_test select-21.1 {
-  CREATE TABLE t1(a IMTEGES PRIMARY KEY,R);
-  CREATE TABLE t2(x UNIQUE);
-  CREATE VIEW v1a(z,y) AS SELECT x IS NULL, x FROM t2;
-  SELECT a,(+a)b,(+a)b,(+a)b,NOT EXISTS(SELECT null FROM t2),CASE z WHEN 487 THEN 992 WHEN 391 THEN 203 WHEN 10 THEN '?k<D Q' END,'' FROM t1 LEFT JOIN v1a ON z=b;
-} {}
-
 finish_test
@@ -160,9 +160,11 @@ do_test shared-$av.1.8 {
 } {}

 do_test shared-$av.2.1 {
-  # Open connection db3 to the database.
+  # Open connection db3 to the database. Use a different path to the same
+  # file so that db3 does *not* share the same pager cache as db and db2
+  # (there should be two open file handles).
  if {$::tcl_platform(platform)=="unix"} {
-    sqlite3 db3 "file:test.db?cache=private" -uri 1
+    sqlite3 db3 ./test.db
  } else {
    sqlite3 db3 TEST.DB
  }
@@ -798,7 +800,7 @@ do_test shared-$av.10.3 {
  # An external connection should be able to read the database, but not
  # prepare a write operation.
  if {$::tcl_platform(platform)=="unix"} {
-    sqlite3 db3 "file:test.db?cache=private" -uri 1
+    sqlite3 db3 ./test.db
  } else {
    sqlite3 db3 TEST.DB
  }
@@ -70,14 +70,13 @@ do_test shared3-2.5 {
 # test case shared3-2.3 above). The goal of the following tests is to
 # ensure that the cache-size really is 10 pages.
 #
-#if {$::tcl_platform(platform)=="unix"} {
-#  set alternative_name ./test.db
-#} else {
-#  set alternative_name TEST.DB
-#}
+if {$::tcl_platform(platform)=="unix"} {
+  set alternative_name ./test.db
+} else {
+  set alternative_name TEST.DB
+}
 do_test shared3-2.6 {
-  #sqlite3 db3 $alternative_name
-  sqlite3 db3 "file:./test.db?cache=private" -uri 1
+  sqlite3 db3 $alternative_name
  catchsql {select count(*) from sqlite_master} db3
 } {0 1}
 do_test shared3-2.7 {
@@ -97,7 +96,7 @@ do_test shared3-2.8 {
  # statement above should have caused the pager to grab an exclusive lock
  # on the database file so that the cache could be spilled.
  #
-  catch { sqlite3 db3 "file:./test.db?cache=private" -uri 1 }
+  catch { sqlite3 db3 $alternative_name }
  catchsql {select count(*) from sqlite_master} db3
 } {1 {database is locked}}

@@ -64,10 +64,6 @@ do_test shell1-1.2.1 {
 } {1 1 1 1}

 # -init filename       read/process named file
-forcedelete FOO
-set out [open FOO w]
-puts $out ""
-close $out
 do_test shell1-1.3.1 {
  catchcmd "-init FOO test.db" ""
 } {0 {}}
@@ -251,7 +247,6 @@ do_test shell1-2.4.2 {
 do_test shell1-3.1.1 {
  catchcmd "test.db" ".backup"
 } {1 {missing FILENAME argument on .backup}}
-forcedelete FOO
 do_test shell1-3.1.2 {
  catchcmd "test.db" ".backup FOO"
 } {0 {}}
@@ -588,7 +583,7 @@ do_test shell1-3.21.2 {
 do_test shell1-3.21.3 {
  # too many arguments
  catchcmd "test.db" ".schema FOO BAD"
-} {1 {Usage: .schema ?--indent? ?--nosys? ?LIKE-PATTERN?}}
+} {1 {Usage: .schema ?--indent? ?LIKE-PATTERN?}}

 do_test shell1-3.21.4 {
  catchcmd "test.db" {
@@ -0,0 +1,147 @@
+# 2015-08-19
+#
+# 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 tests for table-valued-functions implemented using
+# eponymous virtual tables.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+source $testdir/lock_common.tcl
+set testprefix shmlockvtab
+
+ifcapable !vtab||!wal {
+  finish_test
+  return
+}
+
+load_static_extension db shmlockvtab
+do_execsql_test 1.0 {
+  SELECT * FROM shmlock
+}
+
+do_execsql_test 1.1 {
+  CREATE TABLE t1(a, b);
+  PRAGMA journal_mode = wal;
+  SELECT * FROM t1;
+  SELECT lock, locktype, mxframe FROM shmlock;
+} {
+  wal
+  READ(0) R 0
+}
+
+do_execsql_test 1.2 {
+  BEGIN EXCLUSIVE;
+    SELECT lock, locktype, coalesce(mxframe, 'NULL') FROM shmlock;
+} {
+  WRITE   W NULL
+  READ(0) R 0
+}
+
+do_execsql_test 1.3 {
+  INSERT INTO t1 VALUES(3, 4);
+  COMMIT;
+  SELECT lock, locktype, mxframe FROM shmlock;
+} {
+  READ(1) R 1
+}
+
+do_execsql_test 1.4 {
+  INSERT INTO t1 VALUES(5, 6);
+  INSERT INTO t1 VALUES(8, 7);
+  SELECT lock, locktype, mxframe FROM shmlock;
+} {
+  READ(1) R 3
+}
+
+do_test 1.5 {
+  execsql { SELECT connid FROM shmlock }
+} {/[0123456789ABCDEF]*/}
+
+do_test 1.6 {
+  file_control_shmlock_name db main thisdb
+  execsql { SELECT * FROM shmlock }
+} {thisdb READ(1) R 3}
+
+do_test 1.7 {
+  sqlite3 db2 test.db
+  load_static_extension db2 shmlockvtab
+  file_control_shmlock_name db2 main thisdb2
+  execsql { SELECT * FROM shmlock } db2
+} {thisdb2 READ(1) R 3}
+
+forcedelete test.db2
+
+do_execsql_test 1.8 {
+  ATTACH 'test.db2' AS aux;
+  SELECT * FROM shmlock('aux');
+} {}
+
+do_execsql_test 1.9 {
+  SELECT * FROM shmlock('main');
+} {thisdb READ(1) R 3}
+
+do_test 1.10 {
+  file_control_shmlock_name db aux auxdb
+  execsql {
+    PRAGMA aux.journal_mode = wal;
+    CREATE TABLE aux.t1(x);
+  }
+} {wal}
+
+do_execsql_test 1.11 {
+  SELECT * FROM shmlock('aux');
+} {}
+
+do_execsql_test 1.12 {
+  BEGIN EXCLUSIVE;
+    INSERT INTO aux.t1 VALUES('val');
+    SELECT * FROM shmlock('aux');
+} {
+  auxdb WRITE W {} 
+  auxdb READ(1) R 2
+}
+
+file_control_shmlock_name db aux {Fred's database}
+do_execsql_test 1.13 {
+  SELECT * FROM shmlock('aux'); 
+} {
+  {Fred's database} WRITE W {} 
+  {Fred's database} READ(1) R 2
+}
+
+do_multiclient_test tn {
+  code1 { load_static_extension db shmlockvtab }
+  do_test 2.$tn.0 {
+    sql1 {
+      CREATE TABLE t1(a, b);
+      PRAGMA journal_mode = wal;
+      INSERT INTO t1 VALUES('A', 'B');
+    }
+  } {wal}
+
+  do_test 2.$tn.1 {
+    sql2 {
+      BEGIN EXCLUSIVE;
+        SELECT * FROM t1
+    }
+    sql1 { 
+      SELECT lock, locktype, mxframe FROM shmlock WHERE lock='WRITE' 
+    }
+  } {WRITE W {}}
+  do_test 2.$tn.2 {
+    sql1 { SELECT lock, locktype, mxframe FROM shmlock ORDER BY 1 }
+  } {READ(1) R 1 READ(1) R 1 WRITE W {}}
+}
+
+
+finish_test
+
@@ -30,7 +30,7 @@ do_execsql_test 1.1 {

 expr srand(4)
 do_test 1.2 {
-  for {set i 0} {$i < 1000} {incr i} {
+  for {set i 0} {$i < 100} {incr i} {
    set a [expr int(rand()*4.0) + 1]
    set b [expr int(rand()*20.0) + 1]
    execsql { INSERT INTO t1 VALUES($a, $b, NULL) }
@@ -43,7 +43,7 @@ foreach {tn q res} {
  2  "b > 12 AND b < 16"       {/*ANY(a) AND b>? AND b<?*/}
  3  "b > 2 AND b < 16"        {/*SCAN TABLE t1*/}
  4  "b > 18 AND b < 25"       {/*ANY(a) AND b>? AND b<?*/}
-  5  "b > 16"                  {/*ANY(a) AND b>?*/}
+  5  "b > 15"                  {/*ANY(a) AND b>?*/}
  6  "b > 5"                   {/*SCAN TABLE t1*/}
  7  "b < 15"                  {/*SCAN TABLE t1*/}
  8  "b < 5"                   {/*ANY(a) AND b<?*/}
@@ -52,7 +52,7 @@ foreach {tn q res} {
  11 "b > '12' AND b < '16'"   {/*ANY(a) AND b>? AND b<?*/}
  12 "b > '2' AND b < '16'"    {/*SCAN TABLE t1*/}
  13 "b > '18' AND b < '25'"   {/*ANY(a) AND b>? AND b<?*/}
-  14 "b > '16'"                {/*ANY(a) AND b>?*/}
+  14 "b > '15'"                {/*ANY(a) AND b>?*/}
  15 "b > '5'"                 {/*SCAN TABLE t1*/}
  16 "b < '15'"                {/*SCAN TABLE t1*/}
  17 "b < '5'"                 {/*ANY(a) AND b<?*/}
@@ -108,7 +108,7 @@ foreach {tn dbenc coll} {
    3 { c > 'q' }                     {/*ANY(a) AND ANY(b) AND c>?*/}
    4 { c > 'e' }                     {/*SCAN TABLE t2*/}
    5 { c < 'q' }                     {/*SCAN TABLE t2*/}
-    6 { c < 'b' }                     {/*ANY(a) AND ANY(b) AND c<?*/}
+    6 { c < 'c' }                     {/*ANY(a) AND ANY(b) AND c<?*/}
  } {
    set sql "EXPLAIN QUERY PLAN SELECT * FROM t2 WHERE $q" 
    do_execsql_test 2.$tn.$tn2 $sql $res
@@ -28,7 +28,6 @@ static const char zHelp[] =
  "  --primarykey        Use PRIMARY KEY instead of UNIQUE where appropriate\n"
  "  --repeat N          Repeat each SELECT N times (default: 1)\n"
  "  --reprepare         Reprepare each statement upon every invocation\n"
-  "  --reserve N         Reserve N bytes on each database page\n"
  "  --serialized        Set serialized threading mode\n"
  "  --singlethread      Set single-threaded mode - disables all mutexing\n"
  "  --sqlonly           No-op.  Only show the SQL that would have been run.\n"
@@ -94,7 +93,6 @@ static struct Global {
  int szTest;                /* Scale factor for test iterations */
  int nRepeat;               /* Repeat selects this many times */
  int doCheckpoint;          /* Run PRAGMA wal_checkpoint after each trans */
-  int nReserve;              /* Reserve bytes */
  const char *zWR;           /* Might be WITHOUT ROWID */
  const char *zNN;           /* Might be NOT NULL */
  const char *zPK;           /* Might be UNIQUE or PRIMARY KEY */
@@ -2137,10 +2135,6 @@ static void displayLinuxIoStats(FILE *out){
 #  define sqlite3_sourceid(X) "(before 3.6.18)"
 #endif

-#if SQLITE_CKSUMVFS_STATIC
-int sqlite3_register_cksumvfs(const char*);
-#endif
-
 static int xCompileOptions(void *pCtx, int nVal, char **azVal, char **azCol){
  printf("-- Compile option: %s\n", azVal[0]);
  return SQLITE_OK;
@@ -2175,10 +2169,6 @@ int main(int argc, char **argv){
  int i;                        /* Loop counter */
  int rc;                       /* API return code */

-#ifdef SQLITE_CKSUMVFS_STATIC
-  sqlite3_register_cksumvfs(0);
-#endif
-
  /* Display the version of SQLite being tested */
  printf("-- Speedtest1 for SQLite %s %.48s\n",
         sqlite3_libversion(), sqlite3_sourceid());
@@ -2313,9 +2303,6 @@ int main(int argc, char **argv){
 #ifndef SPEEDTEST_OMIT_HASH
        HashInit();
 #endif
-      }else if( strcmp(z,"reserve")==0 ){
-        if( i>=argc-1 ) fatal_error("missing argument on %s\n", argv[i]);
-        g.nReserve = atoi(argv[++i]);
      }else if( strcmp(z,"without-rowid")==0 ){
        g.zWR = "WITHOUT ROWID";
        g.zPK = "PRIMARY KEY";
@@ -2367,9 +2354,6 @@ int main(int argc, char **argv){
    if( rc ) fatal_error("lookaside configuration failed: %d\n", rc);
  }
 #endif
-  if( g.nReserve>0 ){
-    sqlite3_file_control(g.db, 0, SQLITE_FCNTL_RESERVE_BYTES, &g.nReserve);
-  }

  /* Set database connection options */
  sqlite3_create_function(g.db, "random", 0, SQLITE_UTF8, 0, randomFunc, 0, 0);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
dan	922703138e	Add tests for virtual table shmlock. FossilOrigin-Name: 1c6a8442735e9f6117d7a8f1d88630958ec8fdb25a75cc392af1e8511a5fc56d	2020-09-02 16:14:17 +00:00
dan	148920e52a	Fix reporting on locks from external processes. Various other fixes. FossilOrigin-Name: 459de23e869c79357221100e81d2c8e0b812ed3260e58d7d7acb3419876f41a3	2020-09-02 15:26:28 +00:00
dan	b7ae3b541c	Add file-controls and a vtab frontend for querying the unix VFS for the currently held shm-locks. Still some issues. FossilOrigin-Name: ef10e1b386d7a9028eab64e1f4802e3d6b2df11c6723130a29e5effc8dcb2e80	2020-09-01 20:56:28 +00:00
@@ -1 +1 @@
 .34.1
 .34.0