Merge further enhancements to the batch-atomic-write subsystem.

FossilOrigin-Name: 4be4265d74b8a46f6b0b0d9108efb1d2a3fb197d902bac1238e1ee03125f975a
Backport of all batch-atomic-write changes through check-in
2017-07-31 12:04:23 +00:00 · 2017-07-28 02:02:45 +00:00 · 2017-07-27 00:27:57 +00:00 · 2017-06-08 14:26:16 +00:00 · 2017-06-08 11:32:19 +00:00 · 2017-06-08 11:27:05 +00:00
312 changed files with 2135 additions and 47899 deletions
@@ -181,7 +181,7 @@ LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
         notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
         pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
         random.lo resolve.lo rowset.lo rtree.lo \
-         sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
+         sqlite3session.lo select.lo sqlite3rbu.lo status.lo \
         table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
         update.lo util.lo vacuum.lo \
         vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
@@ -350,8 +350,7 @@ SRC += \
  $(TOP)/ext/rbu/sqlite3rbu.h \
  $(TOP)/ext/rbu/sqlite3rbu.c
 SRC += \
-  $(TOP)/ext/misc/json1.c \
-  $(TOP)/ext/misc/stmt.c
+  $(TOP)/ext/misc/json1.c

 # Generated source code files
 #
@@ -435,7 +434,6 @@ TESTSRC += \
  $(TOP)/ext/misc/series.c \
  $(TOP)/ext/misc/spellfix.c \
  $(TOP)/ext/misc/totype.c \
-  $(TOP)/ext/misc/unionvtab.c \
  $(TOP)/ext/misc/wholenumber.c

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

 # Header files used by all library source files.
 #
@@ -567,7 +564,6 @@ SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4
 # SHELL_OPT += -DSQLITE_ENABLE_FTS5
 SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
-SHELL_OPT += -DSQLITE_ENABLE_STMTVTAB
 FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
 FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5 -DSQLITE_OSS_FUZZ
 FUZZCHECK_OPT += -DSQLITE_MAX_MEMORY=50000000
@@ -1038,9 +1034,6 @@ sqlite3session.lo:	$(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
 json1.lo:	$(TOP)/ext/misc/json1.c
 	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c

-stmt.lo:	$(TOP)/ext/misc/stmt.c
-	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/stmt.c
-
 # FTS5 things
 #
 FTS5_SRC = \
@@ -1090,7 +1083,6 @@ TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
 TESTFIXTURE_FLAGS += -DBUILD_sqlite
 TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
 TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
-TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB

 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 TESTFIXTURE_SRC1 = sqlite3.c
@@ -1294,8 +1294,7 @@ SRC07 = \
  $(TOP)\ext\rtree\rtree.c \
  $(TOP)\ext\session\sqlite3session.c \
  $(TOP)\ext\rbu\sqlite3rbu.c \
-  $(TOP)\ext\misc\json1.c \
-  $(TOP)\ext\misc\stmt.c
+  $(TOP)\ext\misc\json1.c

 # Extension header files, part 1.
 #
@@ -1418,7 +1417,6 @@ TESTEXT = \
  $(TOP)\ext\misc\series.c \
  $(TOP)\ext\misc\spellfix.c \
  $(TOP)\ext\misc\totype.c \
-  $(TOP)\ext\misc\unionvtab.c \
  $(TOP)\ext\misc\wholenumber.c

 # Source code to the library files needed by the test fixture
@@ -1507,7 +1505,7 @@ FUZZDATA = \
 # when the shell is not being dynamically linked.
 #
 !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
-SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
+SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_SHELL_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS
 !ENDIF

 # <<mark>>
@@ -2091,7 +2089,6 @@ TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
-TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB
 TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)

 TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
@@ -2245,9 +2242,6 @@ rbu.exe:	$(TOP)\ext\rbu\rbu.c $(TOP)\ext\rbu\sqlite3rbu.c $(SQLITE3C) $(SQLITE3H
 	$(LTLINK) $(NO_WARN) -DSQLITE_ENABLE_RBU \
 		$(TOP)\ext\rbu\rbu.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)

-LSMDIR=$(TOP)\ext\lsm1
-!INCLUDE $(LSMDIR)\Makefile.msc
-
 moreclean:	clean
 	del /Q $(SQLITE3C) $(SQLITE3H) 2>NUL
 # <</mark>>
@@ -2267,7 +2261,6 @@ clean:
 	-rmdir /Q/S tsrc 2>NUL
 	del /Q .target_source 2>NUL
 	del /Q tclsqlite3.exe $(SQLITETCLH) $(SQLITETCLDECLSH) 2>NUL
-	del /Q lsm.dll lsmtest.exe 2>NUL
 	del /Q testloadext.dll 2>NUL
 	del /Q testfixture.exe test.db 2>NUL
 	del /Q LogEst.exe fts3view.exe rollback-test.exe showdb.exe dbdump.exe 2>NUL
@@ -34,9 +34,7 @@ archives as follows:
 If you do want to use Fossil to check out the source tree, 
 first install Fossil version 2.0 or later.
 (Source tarballs and precompiled binaries available
-[here](https://www.fossil-scm.org/fossil/uv/download.html).  Fossil is
-a stand-alone program.  To install, simply download or build the single 
-executable file and put that file someplace on your $PATH.)
+[here](https://www.fossil-scm.org/fossil/uv/download.html).)
 Then run commands like this:

        mkdir ~/sqlite
@@ -108,22 +106,19 @@ The makefiles also require AWK.

 ## Source Code Tour

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

 Test scripts and programs are found in the **test/** subdirectory.
-Addtional test code is found in other source repositories.
-See [How SQLite Is Tested](http://www.sqlite.org/testing.html) for
-additional information.
+There are other test suites for SQLite (see
+[How SQLite Is Tested](http://www.sqlite.org/testing.html))
+but those other test suites are
+in separate source repositories.

 The **ext/** subdirectory contains code for extensions.  The
 Full-text search engine is in **ext/fts3**.  The R-Tree engine is in
@@ -147,7 +142,7 @@ manually-edited files and automatically-generated files.
 The SQLite interface is defined by the **sqlite3.h** header file, which is
 generated from src/sqlite.h.in, ./manifest.uuid, and ./VERSION.  The
 [Tcl script](http://www.tcl.tk) at tool/mksqlite3h.tcl does the conversion.
-The manifest.uuid file contains the SHA3 hash of the particular check-in
+The manifest.uuid file contains the SHA1 hash of the particular check-in
 and is used to generate the SQLITE\_SOURCE\_ID macro.  The VERSION file
 contains the current SQLite version number.  The sqlite3.h header is really
 just a copy of src/sqlite.h.in with the source-id and version number inserted
@@ -158,8 +153,9 @@ used to generate that documentation are in a separate source repository.
 The SQL language parser is **parse.c** which is generate from a grammar in
 the src/parse.y file.  The conversion of "parse.y" into "parse.c" is done
 by the [lemon](./doc/lemon.html) LALR(1) parser generator.  The source code
-for lemon is at tool/lemon.c.  Lemon uses the tool/lempar.c file as a
-template for generating its parser.
+for lemon is at tool/lemon.c.  Lemon uses a
+template for generating its parser.  A generic template is in tool/lempar.c,
+but SQLite uses a slightly modified template found in src/lempar.c.

 Lemon also generates the **parse.h** header file, at the same time it
 generates parse.c. But the parse.h header file is
@@ -179,13 +175,6 @@ that maps SQL language keywords (ex: "CREATE", "SELECT", "INDEX", etc.) into
 the numeric codes used by the parse.c parser.  The keywordhash.h file is
 generated by a C-language program at tool mkkeywordhash.c.

-The **pragma.h** header file contains various definitions used to parse
-and implement the PRAGMA statements.  The header is generated by a
-script **tool/mkpragmatab.tcl**. If you want to add a new PRAGMA, edit
-the **tool/mkpragmatab.tcl** file to insert the information needed by the
-parser for your new PRAGMA, then run the script to regenerate the
-**pragma.h** header file.
-
 ### The Amalgamation

 All of the individual C source code and header files (both manually-edited
@@ -203,7 +192,7 @@ subdirectory (using the equivalent of "make target_source") then the
 tool/mksqlite3c.tcl script is run to copy them all together in just the
 right order while resolving internal "#include" references.

-The amalgamation source file is more than 200K lines long.  Some symbolic
+The amalgamation source file is more than 100K lines long.  Some symbolic
 debuggers (most notably MSVC) are unable to deal with files longer than 64K
 lines.  To work around this, a separate Tcl script, tool/split-sqlite3c.tcl,
 can be run on the amalgamation to break it up into a single small C file
@@ -220,15 +209,14 @@ See the [architectural description](http://www.sqlite.org/arch.html)
 for details. Other documents that are useful in
 (helping to understand how SQLite works include the
 [file format](http://www.sqlite.org/fileformat2.html) description,
-the [virtual machine](http://www.sqlite.org/opcode.html) that runs
+the [virtual machine](http://www.sqlite.org/vdbe.html) that runs
 prepared statements, the description of
 [how transactions work](http://www.sqlite.org/atomiccommit.html), and
 the [overview of the query planner](http://www.sqlite.org/optoverview.html).

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

 Key files:

@@ -239,7 +227,7 @@ Key files:
  *  **sqliteInt.h** - this header file defines many of the data objects
     used internally by SQLite.

-  *  **parse.y** - This file describes the LALR(1) grammar that SQLite uses
+  *  **parse.y** - This file describes the LALR(1) grammer that SQLite uses
     to parse SQL statements, and the actions that are taken at each step
     in the parsing process.

@@ -272,13 +260,13 @@ Key files:
     is not part of the core SQLite library.  But as most of the tests in this
     repository are written in Tcl, the Tcl language bindings are important.

-There are many other source files.  Each has a succinct header comment that
+There are many other source files.  Each has a suscinct header comment that
 describes its purpose and role within the larger system.


 ## Contacts

 The main SQLite webpage is [http://www.sqlite.org/](http://www.sqlite.org/)
-with geographically distributed backups at
+with geographically distributed backup servers at
 [http://www2.sqlite.org/](http://www2.sqlite.org) and
 [http://www3.sqlite.org/](http://www3.sqlite.org).
@@ -1 +1 @@
-3.20.0
+3.19.3
@@ -12,7 +12,7 @@ sqlite3_LDADD = @EXTRA_SHELL_OBJ@ @READLINE_LIBS@
 sqlite3_DEPENDENCIES = @EXTRA_SHELL_OBJ@
 sqlite3_CFLAGS = $(AM_CFLAGS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS

-include_HEADERS = sqlite3.h sqlite3ext.h
+include_HEADERS = sqlite3.h sqlite3ext.h msvc.h

 EXTRA_DIST = sqlite3.1 tea Makefile.msc sqlite3.rc README.txt Replace.cs
 pkgconfigdir = ${libdir}/pkgconfig
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for sqlite 3.20.0.
+# Generated by GNU Autoconf 2.69 for sqlite 3.19.3.
 #
 #
 # 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.20.0'
-PACKAGE_STRING='sqlite 3.20.0'
+PACKAGE_VERSION='3.19.3'
+PACKAGE_STRING='sqlite 3.19.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''

@@ -1463,7 +1463,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.20.0 to adapt to many kinds of systems.
+\`configure' configures sqlite 3.19.3 to adapt to many kinds of systems.

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

@@ -1528,7 +1528,7 @@ fi

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

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

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

  $ $0 $@
@@ -12151,7 +12151,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.20.0, which was
+This file was extended by sqlite $as_me 3.19.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was

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

@@ -23,26 +23,6 @@ or embedded controllers.</p>
 <p>This document is an introduction to the Lemon
 parser generator.</p>

-<h2>Security Note</h2>
-
-<p>The language parser code created by Lemon is very robust and
-is well-suited for use in internet-facing applications that need to
-safely process maliciously crafted inputs.
-
-<p>The "lemon.exe" command-line tool itself works great when given a valid
-input grammar file and almost always gives helpful
-error messages for malformed inputs.  However,  it is possible for
-a malicious user to craft a grammar file that will cause 
-lemon.exe to crash.
-We do not see this as a problem, as lemon.exe is not intended to be used
-with hostile inputs.
-To summarize:</p>
-
-<ul>
-<li>Parser code generated by lemon &rarr; Robust and secure
-<li>The "lemon.exe" command line tool itself &rarr; Not so much
-</ul>
-
 <h2>Theory of Operation</h2>

 <p>The main goal of Lemon is to translate a context free grammar (CFG)
@@ -1707,19 +1707,6 @@ static void fts3CursorFinalizeStmt(Fts3Cursor *pCsr){
  sqlite3_finalize(pCsr->pStmt);
 }

-/*
-** Free all resources currently held by the cursor passed as the only
-** argument.
-*/
-static void fts3ClearCursor(Fts3Cursor *pCsr){
-  fts3CursorFinalizeStmt(pCsr);
-  sqlite3Fts3FreeDeferredTokens(pCsr);
-  sqlite3_free(pCsr->aDoclist);
-  sqlite3Fts3MIBufferFree(pCsr->pMIBuffer);
-  sqlite3Fts3ExprFree(pCsr->pExpr);
-  memset(&(&pCsr->base)[1], 0, sizeof(Fts3Cursor)-sizeof(sqlite3_vtab_cursor));
-}
-
 /*
 ** Close the cursor.  For additional information see the documentation
 ** on the xClose method of the virtual table interface.
@@ -1727,7 +1714,11 @@ static void fts3ClearCursor(Fts3Cursor *pCsr){
 static int fts3CloseMethod(sqlite3_vtab_cursor *pCursor){
  Fts3Cursor *pCsr = (Fts3Cursor *)pCursor;
  assert( ((Fts3Table *)pCsr->base.pVtab)->pSegments==0 );
-  fts3ClearCursor(pCsr);
+  fts3CursorFinalizeStmt(pCsr);
+  sqlite3Fts3ExprFree(pCsr->pExpr);
+  sqlite3Fts3FreeDeferredTokens(pCsr);
+  sqlite3_free(pCsr->aDoclist);
+  sqlite3Fts3MIBufferFree(pCsr->pMIBuffer);
  assert( ((Fts3Table *)pCsr->base.pVtab)->pSegments==0 );
  sqlite3_free(pCsr);
  return SQLITE_OK;
@@ -1753,7 +1744,7 @@ static int fts3CursorSeekStmt(Fts3Cursor *pCsr){
    }else{
      zSql = sqlite3_mprintf("SELECT %s WHERE rowid = ?", p->zReadExprlist);
      if( !zSql ) return SQLITE_NOMEM;
-      rc = sqlite3_prepare_v3(p->db, zSql,-1,SQLITE_PREPARE_PERSISTENT,&pCsr->pStmt,0);
+      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pCsr->pStmt, 0);
      sqlite3_free(zSql);
    }
    if( rc==SQLITE_OK ) pCsr->bSeekStmt = 1;
@@ -3228,7 +3219,11 @@ static int fts3FilterMethod(
  assert( iIdx==nVal );

  /* In case the cursor has been used before, clear it now. */
-  fts3ClearCursor(pCsr);
+  fts3CursorFinalizeStmt(pCsr);
+  sqlite3_free(pCsr->aDoclist);
+  sqlite3Fts3MIBufferFree(pCsr->pMIBuffer);
+  sqlite3Fts3ExprFree(pCsr->pExpr);
+  memset(&pCursor[1], 0, sizeof(Fts3Cursor)-sizeof(sqlite3_vtab_cursor));

  /* Set the lower and upper bounds on docids to return */
  pCsr->iMinDocid = fts3DocidRange(pDocidGe, SMALLEST_INT64);
@@ -3286,7 +3281,7 @@ static int fts3FilterMethod(
      );
    }
    if( zSql ){
-      rc = sqlite3_prepare_v3(p->db,zSql,-1,SQLITE_PREPARE_PERSISTENT,&pCsr->pStmt,0);
+      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pCsr->pStmt, 0);
      sqlite3_free(zSql);
    }else{
      rc = SQLITE_NOMEM;
@@ -3307,12 +3302,7 @@ static int fts3FilterMethod(
 ** routine to find out if it has reached the end of a result set.
 */
 static int fts3EofMethod(sqlite3_vtab_cursor *pCursor){
-  Fts3Cursor *pCsr = (Fts3Cursor*)pCursor;
-  if( pCsr->isEof ){
-    fts3ClearCursor(pCsr);
-    pCsr->isEof = 1;
-  }
-  return pCsr->isEof;
+  return ((Fts3Cursor *)pCursor)->isEof;
 }

 /* 
@@ -3353,7 +3343,8 @@ static int fts3ColumnMethod(
  switch( iCol-p->nColumn ){
    case 0:
      /* The special 'table-name' column */
-      sqlite3_result_pointer(pCtx, pCsr, "fts3cursor");
+      sqlite3_result_blob(pCtx, &pCsr, sizeof(Fts3Cursor*), SQLITE_TRANSIENT);
+      sqlite3_result_subtype(pCtx, SQLITE_BLOB);
      break;

    case 1:
@@ -3571,10 +3562,9 @@ static int fts3FunctionArg(
  sqlite3_value *pVal,            /* argv[0] passed to function */
  Fts3Cursor **ppCsr              /* OUT: Store cursor handle here */
 ){
-  int rc;
-  *ppCsr = (Fts3Cursor*)sqlite3_value_pointer(pVal, "fts3cursor");
-  if( (*ppCsr)!=0 ){
-    rc = SQLITE_OK;
+  int rc = SQLITE_OK;
+  if( sqlite3_value_subtype(pVal)==SQLITE_BLOB ){
+    *ppCsr = *(Fts3Cursor**)sqlite3_value_blob(pVal);
  }else{
    char *zErr = sqlite3_mprintf("illegal first argument to %s", zFunc);
    sqlite3_result_error(pContext, zErr, -1);
@@ -407,8 +407,7 @@ static int fts3SqlStmt(
    if( !zSql ){
      rc = SQLITE_NOMEM;
    }else{
-      rc = sqlite3_prepare_v3(p->db, zSql, -1, SQLITE_PREPARE_PERSISTENT,
-                              &pStmt, NULL);
+      rc = sqlite3_prepare_v2(p->db, zSql, -1, &pStmt, NULL);
      sqlite3_free(zSql);
      assert( rc==SQLITE_OK || pStmt==0 );
      p->aStmt[eStmt] = pStmt;
@@ -171,11 +171,10 @@ static int fts5HashResize(Fts5Hash *pHash){

  for(i=0; i<pHash->nSlot; i++){
    while( apOld[i] ){
-      unsigned int iHash;
+      int iHash;
      Fts5HashEntry *p = apOld[i];
      apOld[i] = p->pHashNext;
-      iHash = fts5HashKey(nNew, (u8*)fts5EntryKey(p),
-                          (int)strlen(fts5EntryKey(p)));
+      iHash = fts5HashKey(nNew, (u8*)fts5EntryKey(p), strlen(fts5EntryKey(p)));
      p->pHashNext = apNew[iHash];
      apNew[iHash] = p;
    }
@@ -478,7 +477,7 @@ int sqlite3Fts5HashQuery(
  int *pnDoclist                  /* OUT: Size of doclist in bytes */
 ){
  unsigned int iHash = fts5HashKey(pHash->nSlot, (const u8*)pTerm, nTerm);
-  char *zKey = 0;
+  char *zKey;
  Fts5HashEntry *p;

  for(p=pHash->aSlot[iHash]; p; p=p->pHashNext){
@@ -728,8 +728,7 @@ static int fts5IndexPrepareStmt(
 ){
  if( p->rc==SQLITE_OK ){
    if( zSql ){
-      p->rc = sqlite3_prepare_v3(p->pConfig->db, zSql, -1,
-                                 SQLITE_PREPARE_PERSISTENT, ppStmt, 0);
+      p->rc = sqlite3_prepare_v2(p->pConfig->db, zSql, -1, ppStmt, 0);
    }else{
      p->rc = SQLITE_NOMEM;
    }
@@ -778,8 +777,7 @@ static void fts5DataDelete(Fts5Index *p, i64 iFirst, i64 iLast){
    if( zSql==0 ){
      rc = SQLITE_NOMEM;
    }else{
-      rc = sqlite3_prepare_v3(pConfig->db, zSql, -1,
-                              SQLITE_PREPARE_PERSISTENT, &p->pDeleter, 0);
+      rc = sqlite3_prepare_v2(pConfig->db, zSql, -1, &p->pDeleter, 0);
      sqlite3_free(zSql);
    }
    if( rc!=SQLITE_OK ){
@@ -883,8 +883,7 @@ static int fts5PrepareStatement(
  if( zSql==0 ){
    rc = SQLITE_NOMEM; 
  }else{
-    rc = sqlite3_prepare_v3(pConfig->db, zSql, -1, 
-                            SQLITE_PREPARE_PERSISTENT, &pRet, 0);
+    rc = sqlite3_prepare_v2(pConfig->db, zSql, -1, &pRet, 0);
    if( rc!=SQLITE_OK ){
      *pConfig->pzErrmsg = sqlite3_mprintf("%s", sqlite3_errmsg(pConfig->db));
    }
@@ -1020,8 +1019,7 @@ static int fts5FindRankFunction(Fts5Cursor *pCsr){
    char *zSql = sqlite3Fts5Mprintf(&rc, "SELECT %s", zRankArgs);
    if( zSql ){
      sqlite3_stmt *pStmt = 0;
-      rc = sqlite3_prepare_v3(pConfig->db, zSql, -1,
-                              SQLITE_PREPARE_PERSISTENT, &pStmt, 0);
+      rc = sqlite3_prepare_v2(pConfig->db, zSql, -1, &pStmt, 0);
      sqlite3_free(zSql);
      assert( rc==SQLITE_OK || pCsr->pRankArgStmt==0 );
      if( rc==SQLITE_OK ){
@@ -2609,14 +2607,15 @@ static void fts5ModuleDestroy(void *pCtx){
 static void fts5Fts5Func(
  sqlite3_context *pCtx,          /* Function call context */
  int nArg,                       /* Number of args */
-  sqlite3_value **apArg           /* Function arguments */
+  sqlite3_value **apUnused        /* Function arguments */
 ){
  Fts5Global *pGlobal = (Fts5Global*)sqlite3_user_data(pCtx);
-  fts5_api **ppApi;
-  UNUSED_PARAM(nArg);
-  assert( nArg==1 );
-  ppApi = (fts5_api**)sqlite3_value_pointer(apArg[0], "fts5_api_ptr");
-  if( ppApi ) *ppApi = &pGlobal->api;
+  char buf[8];
+  UNUSED_PARAM2(nArg, apUnused);
+  assert( nArg==0 );
+  assert( sizeof(buf)>=sizeof(pGlobal) );
+  memcpy(buf, (void*)&pGlobal, sizeof(pGlobal));
+  sqlite3_result_blob(pCtx, buf, sizeof(pGlobal), SQLITE_TRANSIENT);
 }

 /*
@@ -2681,7 +2680,7 @@ static int fts5Init(sqlite3 *db){
    if( rc==SQLITE_OK ) rc = sqlite3Fts5VocabInit(pGlobal, db);
    if( rc==SQLITE_OK ){
      rc = sqlite3_create_function(
-          db, "fts5", 1, SQLITE_UTF8, p, fts5Fts5Func, 0, 0
+          db, "fts5", 0, SQLITE_UTF8, p, fts5Fts5Func, 0, 0
      );
    }
    if( rc==SQLITE_OK ){
@@ -136,8 +136,7 @@ static int fts5StorageGetStmt(
    if( zSql==0 ){
      rc = SQLITE_NOMEM;
    }else{
-      rc = sqlite3_prepare_v3(pC->db, zSql, -1,
-                              SQLITE_PREPARE_PERSISTENT, &p->aStmt[eStmt], 0);
+      rc = sqlite3_prepare_v2(pC->db, zSql, -1, &p->aStmt[eStmt], 0);
      sqlite3_free(zSql);
      if( rc!=SQLITE_OK && pzErrMsg ){
        *pzErrMsg = sqlite3_mprintf("%s", sqlite3_errmsg(pC->db));
@@ -99,13 +99,16 @@ static int SQLITE_TCLAPI f5tDbAndApi(
    sqlite3_stmt *pStmt = 0;
    fts5_api *pApi = 0;

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

    if( sqlite3_finalize(pStmt)!=SQLITE_OK ){
      Tcl_AppendResult(interp, "error: ", sqlite3_errmsg(db), 0);
@@ -73,10 +73,13 @@ static int fts5_api_from_db(sqlite3 *db, fts5_api **ppApi){
  int rc;

  *ppApi = 0;
-  rc = sqlite3_prepare(db, "SELECT fts5(?1)", -1, &pStmt, 0);
+  rc = sqlite3_prepare(db, "SELECT fts5()", -1, &pStmt, 0);
  if( rc==SQLITE_OK ){
-    sqlite3_bind_pointer(pStmt, 1, (void*)ppApi, "fts5_api_ptr");
-    (void)sqlite3_step(pStmt);
+    if( SQLITE_ROW==sqlite3_step(pStmt) 
+        && sizeof(fts5_api*)==sqlite3_column_bytes(pStmt, 0)
+      ){
+      memcpy(ppApi, sqlite3_column_blob(pStmt, 0), sizeof(fts5_api*));
+    }
    rc = sqlite3_finalize(pStmt);
  }

@@ -419,3 +422,4 @@ int sqlite3Fts5TestRegisterMatchinfo(sqlite3 *db){
 }

 #endif /* SQLITE_ENABLE_FTS5 */
+
@@ -182,7 +182,7 @@ static int fts5tokConnectMethod(
  Fts5tokTable *pTab = 0;
  int rc;
  char **azDequote = 0;
-  int nDequote = 0;
+  int nDequote;

  rc = sqlite3_declare_vtab(db, 
       "CREATE TABLE x(input HIDDEN, token, start, end, position)"
@@ -441,7 +441,7 @@ db func funk funk
 do_catchsql_test 16.2 {
  SELECT funk(), bm25(n1), funk() FROM n1 WHERE n1 MATCH 'a+b+c+d'
 } {0 {{} -1e-06 {}}}
-# {1 {SQL logic error}}
+# {1 {SQL logic error or missing database}}

 #-------------------------------------------------------------------------
 #
@@ -595,3 +595,5 @@ do_execsql_test 22.1 {


 finish_test
+
+
@@ -294,3 +294,4 @@ do_execsql_test 7.0 {


 finish_test
+
@@ -276,3 +276,4 @@ foreach {tn expr tclexpr} {
 }

 finish_test
+
@@ -231,6 +231,7 @@ foreach {T create} {
        set res [lsort -integer -increasing $res]
      }
      set n [llength $res]
+      if {$T==5} breakpoint 
      do_execsql_test $T.$bAsc.$tn.$n $sql $res
    }
  }
@@ -241,3 +242,4 @@ foreach {T create} {
 }

 finish_test
+
@@ -309,3 +309,4 @@ foreach {tn q cnt} {
 }

 finish_test
+
@@ -178,3 +178,4 @@ do_execsql_test 5.1 {
 } ;# foreach_detail_mode 

 finish_test
+
@@ -142,3 +142,4 @@ if {[detail_is_full]} {


 finish_test
+
@@ -167,3 +167,4 @@ do_execsql_test 1.8.2 {
 #db eval {SELECT rowid, fts5_decode(rowid, block) aS r FROM t1_data} {puts $r}

 finish_test
+
@@ -55,3 +55,4 @@ do_execsql_test 1.2 {


 finish_test
+
@@ -66,3 +66,4 @@ do_execsql_test 2.0 { INSERT INTO t1(t1) VALUES('integrity-check') }


 finish_test
+
@@ -147,3 +147,4 @@ do_execsql_test 3.1 {
 }

 finish_test
+
@@ -77,7 +77,7 @@ foreach {tn defn} {
 } {
  do_test 2.2.$tn {
    catchsql { INSERT INTO ft1(ft1, rank) VALUES('rank', $defn) }
-  } {1 {SQL logic error}}
+  } {1 {SQL logic error or missing database}}
 }

 #-------------------------------------------------------------------------
@@ -297,3 +297,4 @@ do_catchsql_test 4.4.4 {


 finish_test
+
@@ -89,6 +89,7 @@ do_execsql_test 3.1 {
  BEGIN;
    INSERT INTO abc(rowid, a) VALUES(2, 'a');
 }
+breakpoint
 do_execsql_test 3.2 {
    SELECT rowid FROM abc WHERE abc MATCH 'a';
 } {1 2}
@@ -99,3 +100,4 @@ do_execsql_test 3.3 {
 } {1 2}

 finish_test
+
@@ -342,3 +342,4 @@ foreach {tn expr} {


 finish_test
+
@@ -240,6 +240,7 @@ foreach {tn lRow res} {
 } {
  execsql { DELETE FROM x1 }
  foreach row $lRow { execsql { INSERT INTO x1 VALUES($row) } }
+  breakpoint
  do_execsql_test 8.$tn {
    SELECT highlight(x1, 0, '[', ']') FROM x1 WHERE x1 MATCH 'a OR (b AND d)';
  } $res
@@ -278,3 +279,4 @@ do_execsql_test 9.3 {


 finish_test
+
@@ -112,3 +112,4 @@ db eval {
 }

 finish_test
+
@@ -61,3 +61,4 @@ do_test 2.1...slow {
 } {}

 finish_test
+
@@ -64,3 +64,5 @@ foreach_detail_mode $::testprefix {
 }

 finish_test
+
+
@@ -84,3 +84,5 @@ foreach_detail_mode $::testprefix {


 finish_test
+
+
@@ -143,6 +143,7 @@ do_execsql_test 4.1.1 {
  INSERT INTO t5 VALUES('2 4 6 8');
 }

+breakpoint
 do_execsql_test 4.1.2 {
  INSERT INTO t5(t5) VALUES('integrity-check');
 }
@@ -66,7 +66,7 @@ foreach {tn val} {
 } {
  do_catchsql_test 3.$tn {
    INSERT INTO t1(t1, rank) VALUES('rank', $val);
-  } {1 {SQL logic error}}
+  } {1 {SQL logic error or missing database}}
 }

 #-------------------------------------------------------------------------
@@ -110,6 +110,7 @@ do_catchsql_test 5.1 {
  CREATE VIRTUAL TABLE xx USING fts5(x, tokenize="porter 'ascii");
 } {1 {parse error in tokenize directive}} 

+breakpoint
 do_catchsql_test 5.2 {
  CREATE VIRTUAL TABLE xx USING fts5(x, [y[]);
 } {0 {}}
@@ -168,33 +169,33 @@ do_execsql_test 9.0 {
 } {}
 do_catchsql_test 9.1.1 {
  INSERT INTO abc(abc, rank) VALUES('pgsz', -5);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_catchsql_test 9.1.2 {
  INSERT INTO abc(abc, rank) VALUES('pgsz', 50000000);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_catchsql_test 9.1.3 {
  INSERT INTO abc(abc, rank) VALUES('pgsz', 66.67);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}

 do_catchsql_test 9.2.1 {
  INSERT INTO abc(abc, rank) VALUES('automerge', -5);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_catchsql_test 9.2.2 {
  INSERT INTO abc(abc, rank) VALUES('automerge', 50000000);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_catchsql_test 9.2.3 {
  INSERT INTO abc(abc, rank) VALUES('automerge', 66.67);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_execsql_test 9.2.4 {
  INSERT INTO abc(abc, rank) VALUES('automerge', 1);
 } {}

 do_catchsql_test 9.3.1 {
  INSERT INTO abc(abc, rank) VALUES('crisismerge', -5);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_catchsql_test 9.3.2 {
  INSERT INTO abc(abc, rank) VALUES('crisismerge', 66.67);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_execsql_test 9.3.3 {
  INSERT INTO abc(abc, rank) VALUES('crisismerge', 1);
 } {}
@@ -204,14 +205,14 @@ do_execsql_test 9.3.4 {

 do_catchsql_test 9.4.1 {
  INSERT INTO abc(abc, rank) VALUES('nosuchoption', 1);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}

 do_catchsql_test 9.5.1 {
  INSERT INTO abc(abc, rank) VALUES('hashsize', 'not an integer');
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_catchsql_test 9.5.2 {
  INSERT INTO abc(abc, rank) VALUES('hashsize', -500000);
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}
 do_catchsql_test 9.5.3 {
  INSERT INTO abc(abc, rank) VALUES('hashsize', 500000);
 } {0 {}}
@@ -244,7 +245,7 @@ foreach {tn opt} {

 do_catchsql_test 12.1 {
  INSERT INTO t1(t1, rank) VALUES('rank', NULL);;
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}

 #-------------------------------------------------------------------------
 # errors in the 'usermerge' option
@@ -259,7 +260,8 @@ foreach {tn val} {
  4     1
 } {
  set sql "INSERT INTO tt(tt, rank) VALUES('usermerge', $val)"
-  do_catchsql_test 13.$tn $sql {1 {SQL logic error}}
+  do_catchsql_test 13.$tn $sql {1 {SQL logic error or missing database}}
 }

 finish_test
+
@@ -66,3 +66,5 @@ do_execsql_test 2.1 {
 }

 finish_test
+
+
@@ -255,3 +255,4 @@ do_execsql_test 6.2 {


 finish_test
+
@@ -96,3 +96,4 @@ do_catchsql_test 3.1 {
 } {1 {database disk image is malformed}}

 finish_test
+
@@ -269,3 +269,4 @@ do_catchsql_test 6.2 {

 sqlite3_fts5_may_be_corrupt 0
 finish_test
+
@@ -409,3 +409,4 @@ do_catchsql_test 9.2.2 {

 sqlite3_fts5_may_be_corrupt 0
 finish_test
+
@@ -51,3 +51,4 @@ do_test 1.2 {
 } {}

 finish_test
+
@@ -241,3 +241,4 @@ do_execsql_test 5.3 {


 finish_test
+
@@ -63,3 +63,5 @@ foreach_detail_mode $::testprefix {


 finish_test
+
+
@@ -66,6 +66,7 @@ proc do_dlidx_test1 {tn spc1 spc2 nEntry iFirst nStep} {
  }
  execsql COMMIT

+  breakpoint
  do_test $tn.1 {
    execsql { INSERT INTO t1(t1) VALUES('integrity-check') }
  } {}
@@ -123,6 +124,7 @@ proc do_dlidx_test2 {tn nEntry iFirst nStep} {
  do_execsql_test $tn.1 {
    SELECT rowid FROM t1 WHERE t1 MATCH 'b AND a'
  } {1}
+  breakpoint
  do_execsql_test $tn.2 {
    SELECT rowid FROM t1 WHERE t1 MATCH 'b AND a' ORDER BY rowid DESC
  } {1}
@@ -195,3 +197,4 @@ foreach v $vocab {


 finish_test
+
@@ -44,3 +44,4 @@ do_execsql_test 1.2 {


 finish_test
+
@@ -81,3 +81,6 @@ do_execsql_test 3.3 {


 finish_test
+
+
+
@@ -351,3 +351,4 @@ do_faultsim_test 9.1 -faults oom-* -prep {


 finish_test
+
@@ -137,3 +137,4 @@ do_faultsim_test 5.0 -faults oom-* -prep {
 }

 finish_test
+
@@ -110,3 +110,4 @@ do_faultsim_test 3.2 -faults oom-* -prep {


 finish_test
+
@@ -395,3 +395,4 @@ do_faultsim_test 14.1 -faults oom-t* -prep {
 }

 finish_test
+
@@ -105,6 +105,7 @@ do_faultsim_test 3.2 -faults oom-t* -body {
  faultsim_test_result {0 {1 10 11 12 13 14 15 16 17 18 19 2}}
 }

+breakpoint
 do_execsql_test 3.3.0 {
  SELECT * FROM tv2;
 } {
@@ -129,3 +130,4 @@ do_faultsim_test 3.3 -faults oom-t* -body {


 finish_test
+
@@ -280,6 +280,7 @@ do_faultsim_test 5.4 -faults oom* -prep {

 #-------------------------------------------------------------------------
 catch { db close }
+breakpoint
 do_faultsim_test 6 -faults oom* -prep {
  sqlite_orig db test.db
  sqlite3_db_config_lookaside db 0 0 0
@@ -291,3 +292,4 @@ do_faultsim_test 6 -faults oom* -prep {
  db close
 }
 finish_test
+
@@ -116,3 +116,4 @@ do_faultsim_test 2.2 -faults oom-* -body {
 }

 finish_test
+
@@ -82,3 +82,4 @@ do_faultsim_test 4 -faults oom-* -prep {


 finish_test
+
@@ -153,3 +153,4 @@ do_faultsim_test 6 -faults oom-* -body {
 } ;# foreach_detail_mode...

 finish_test
+
@@ -61,3 +61,4 @@ do_faultsim_test 2 -faults oom* -prep {
  faultsim_test_result {0 {1 2}}
 }
 finish_test
+
@@ -132,3 +132,4 @@ do_faultsim_test 4.2 -faults oom* -body {


 finish_test
+
@@ -40,3 +40,4 @@ do_test 1.1 {


 finish_test
+
@@ -90,3 +90,4 @@ do_catchsql_test 4.1 {
 } {1 {fts5: syntax error near "`"}}

 finish_test
+
@@ -121,6 +121,7 @@ foreach_detail_mode $testprefix {
    }

    execsql { CREATE VIRTUAL TABLE t2 USING fts5(x, detail=%DETAIL%) }
+breakpoint
    execsql {
      INSERT INTO t2 VALUES($small || ' ' || $big);
    }
@@ -129,3 +130,4 @@ foreach_detail_mode $testprefix {
 } ;# foreach_detail_mode

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

 finish_test
+
@@ -70,3 +70,4 @@ do_execsql_test 1.6 {


 finish_test
+
@@ -1,43 +0,0 @@
-# 2014 June 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 regression tests for SQLite library.  The
-# focus of this script is testing the FTS5 module.
-#
-
-source [file join [file dirname [info script]] fts5_common.tcl]
-set testprefix fts5leftjoin
-
-# If SQLITE_ENABLE_FTS5 is not defined, omit this file.
-ifcapable !fts5 {
-  finish_test
-  return
-}
-
-do_execsql_test 1.0 {
-  CREATE VIRTUAL TABLE vt USING fts5(x);
-  INSERT INTO vt VALUES('abc');
-  INSERT INTO vt VALUES('xyz');
-
-  CREATE TABLE t1(a INTEGER PRIMARY KEY);
-  INSERT INTO t1 VALUES(1), (2);
-}
-
-do_execsql_test 1.1 {
-  SELECT * FROM t1 LEFT JOIN (
-    SELECT rowid AS rrr, * FROM vt WHERE vt MATCH 'abc'
-  ) ON t1.a = rrr
-} {1 1 abc 2 {} {}}
-
-do_execsql_test 1.2 {
-  SELECT * FROM t1 LEFT JOIN vt ON (vt MATCH 'abc')
-} {1 abc 2 abc}
-
-finish_test
@@ -472,7 +472,7 @@ do_execsql_test 12.1 {
 #
 reset_db
 proc xyz {} {}
-db func fts5 -argcount 1 xyz
+db func fts5 -argcount 0 xyz
 do_test 13.1 {
  list [catch { sqlite3_fts5_register_matchinfo db } msg] $msg
 } {1 SQLITE_ERROR}
@@ -492,3 +492,4 @@ do_catchsql_test 14.2 {
 } {1 {unrecognized matchinfo flag: d}}

 finish_test
+
@@ -241,3 +241,4 @@ do_execsql_test 6.3 {


 finish_test
+
@@ -55,3 +55,4 @@ do_execsql_test 1.2 {
 }

 finish_test
+
@@ -45,3 +45,4 @@ do_multiclient_test tn {
 };# do_multiclient_test
 };# foreach_detail_mode
 finish_test
+
@@ -68,3 +68,4 @@ do_near_test 1.25 "a b c d e f g h i" { NEAR(i a+b+c+d b+c, 4) } 0


 finish_test
+
@@ -178,3 +178,4 @@ do_execsql_test 4.3.1 {
 do_test 4.2.2 { fts5_level_segs ttt } {3}

 finish_test
+
@@ -106,3 +106,4 @@ foreach {tn nStep} {
  do_test 2.$tn.6 { fts5_segcount t1 } 1
 }
 finish_test
+
@@ -116,3 +116,4 @@ do_execsql_test 2.0 {
 }

 finish_test
+
@@ -64,3 +64,4 @@ do_eqp_test 1.5 {


 finish_test
+
@@ -11803,3 +11803,4 @@ foreach {in out} $test_vocab {


 finish_test
+
@@ -67,3 +67,4 @@ foreach {in out} $test_vocab {


 finish_test
+
@@ -341,3 +341,5 @@ foreach {tn create} {
 }

 finish_test
+
+
@@ -79,3 +79,5 @@ for {set tn 1 ; set pgsz 64} {$tn<32} {incr tn; incr pgsz 16} {


 finish_test
+
+
@@ -90,7 +90,6 @@ do_test 2.7 {
  execsql { SELECT rowid FROM tt('a') ORDER BY rank; } db
 } {1 3 2}

-db2 close

 #--------------------------------------------------------------------------
 # At one point there was a problem with queries such as:
@@ -152,3 +151,4 @@ do_execsql_test 4.1 {


 finish_test
+
@@ -64,3 +64,4 @@ do_catchsql_test 2.2 {
  INSERT INTO nc(nc) VALUES('rebuild');
 } {1 {'rebuild' may not be used with a contentless fts5 table}}
 finish_test
+
@@ -149,3 +149,4 @@ do_test 4.3 {


 finish_test
+
@@ -216,3 +216,4 @@ do_execsql_test 6.2 {


 finish_test
+
@@ -411,6 +411,7 @@ do_catchsql_test 19.2 {

 #-------------------------------------------------------------------------
 reset_db
+breakpoint
 do_execsql_test 20.0 {
  CREATE VIRTUAL TABLE x1 USING fts5(x);
  INSERT INTO x1(x1, rank) VALUES('pgsz', 32);
@@ -370,3 +370,4 @@ do_execsql_test 17.6 {
 #db eval {SELECT rowid, fts5_decode_none(rowid, block) aS r FROM t2_data} {puts $r}
  
 finish_test
+
@@ -116,3 +116,4 @@ do_execsql_test 4.6 {


 finish_test
+
@@ -421,3 +421,4 @@ do_execsql_test 7.1.2 {
 } ;# foreach_detail_mode

 finish_test
+
@@ -161,3 +161,4 @@ foreach {tn expr} {
 }

 finish_test
+
@@ -109,7 +109,7 @@ do_catchsql_test 2.0 {
 do_catchsql_test 2.1 {
  CREATE VIRTUAL TABLE t4 USING fts5tokenize;
  SELECT * FROM t4;
-} {1 {SQL logic error}}
+} {1 {SQL logic error or missing database}}


 finish_test
@@ -302,3 +302,4 @@ do_test 9.5.2 { set ::flags } {query}


 finish_test
+
@@ -50,6 +50,7 @@ do_execsql_test 2.0 "
  INSERT INTO t2 VALUES('\xC0\xC8\xCC');
  INSERT INTO t3 VALUES('\xC0\xC8\xCC');
 "
+breakpoint
 do_execsql_test 2.1 "
  SELECT 't1' FROM t1 WHERE t1 MATCH '\xE0\xE8\xEC';
  SELECT 't2' FROM t2 WHERE t2 MATCH '\xE0\xE8\xEC';
@@ -58,3 +59,4 @@ do_execsql_test 2.1 "


 finish_test
+
@@ -281,6 +281,7 @@ do_test 4.4 {

 #-------------------------------------------------------------------------

+breakpoint
 do_unicode_token_test3 5.1 {tokenchars {}} {
  sqlite3_reset sqlite3_column_int
 } {
@@ -126,3 +126,4 @@ do_test 1.5 {


 finish_test
+
@@ -76,3 +76,4 @@ do_execsql_test 3.2 {


 finish_test
+
@@ -117,3 +117,5 @@ do_execsql_test 2.2.integrity {

 }
 finish_test
+
+
@@ -61,3 +61,4 @@ do_test 1.7 {


 finish_test
+
@@ -210,6 +210,7 @@ do_execsql_test 5.0 {
  INSERT INTO aux.t1 VALUES('x n z');
 }

+breakpoint
 do_execsql_test 5.1 {
  CREATE VIRTUAL TABLE temp.vm  USING fts5vocab(main, t1, row);
  CREATE VIRTUAL TABLE temp.vt1 USING fts5vocab(t1, row);
@@ -1,56 +0,0 @@
-#
-# This Makefile is designed for use with main.mk in the root directory of
-# this project. After including main.mk, the users makefile should contain:
-#
-#    LSMDIR=$(TOP)/ext/lsm1/
-#    LSMOPTS=-fPIC
-#    include $(LSMDIR)/Makefile
-#
-# The most useful targets are [lsmtest] and [lsm.so].
-#
-
-LSMOBJ    = \
-  lsm_ckpt.o \
-  lsm_file.o \
-  lsm_log.o \
-  lsm_main.o \
-  lsm_mem.o \
-  lsm_mutex.o \
-  lsm_shared.o \
-  lsm_sorted.o \
-  lsm_str.o \
-  lsm_tree.o \
-  lsm_unix.o \
-  lsm_win32.o \
-  lsm_varint.o \
-  lsm_vtab.o
-
-LSMHDR   = \
-  $(LSMDIR)/lsm.h \
-  $(LSMDIR)/lsmInt.h
-
-LSMTESTSRC = $(LSMDIR)/lsm-test/lsmtest1.c $(LSMDIR)/lsm-test/lsmtest2.c     \
-             $(LSMDIR)/lsm-test/lsmtest3.c $(LSMDIR)/lsm-test/lsmtest4.c     \
-             $(LSMDIR)/lsm-test/lsmtest5.c $(LSMDIR)/lsm-test/lsmtest6.c     \
-             $(LSMDIR)/lsm-test/lsmtest7.c $(LSMDIR)/lsm-test/lsmtest8.c     \
-             $(LSMDIR)/lsm-test/lsmtest9.c                                   \
-             $(LSMDIR)/lsm-test/lsmtest_datasource.c \
-             $(LSMDIR)/lsm-test/lsmtest_func.c $(LSMDIR)/lsm-test/lsmtest_io.c  \
-             $(LSMDIR)/lsm-test/lsmtest_main.c $(LSMDIR)/lsm-test/lsmtest_mem.c \
-             $(LSMDIR)/lsm-test/lsmtest_tdb.c $(LSMDIR)/lsm-test/lsmtest_tdb3.c \
-             $(LSMDIR)/lsm-test/lsmtest_util.c $(LSMDIR)/lsm-test/lsmtest_win32.c
-
-
-# all: lsm.so
-
-LSMOPTS += -DLSM_MUTEX_PTHREADS=1 -I$(LSMDIR)
-
-lsm.so:	$(LSMOBJ)
-	$(TCCX) -shared -o lsm.so $(LSMOBJ)
-
-%.o:	$(LSMDIR)/%.c $(LSMHDR) sqlite3.h
-	$(TCCX) $(LSMOPTS) -c $<
-	
-lsmtest$(EXE): $(LSMOBJ) $(LSMTESTSRC) $(LSMTESTHDR) sqlite3.o
-	# $(TCPPX) -c $(TOP)/lsm-test/lsmtest_tdb2.cc
-	$(TCCX) $(LSMOPTS) $(LSMTESTSRC) $(LSMOBJ) sqlite3.o -o lsmtest$(EXE) $(THREADLIB)
@@ -1,102 +0,0 @@
-#
-# This Makefile is designed for use with Makefile.msc in the root directory
-# of this project.  The Makefile.msc should contain:
-#
-#    LSMDIR=$(TOP)\ext\lsm1
-#    !INCLUDE $(LSMDIR)\Makefile.msc
-#
-# The most useful targets are [lsmtest.exe] and [lsm.dll].
-#
-
-LSMOBJ    = \
-  lsm_ckpt.lo \
-  lsm_file.lo \
-  lsm_log.lo \
-  lsm_main.lo \
-  lsm_mem.lo \
-  lsm_mutex.lo \
-  lsm_shared.lo \
-  lsm_sorted.lo \
-  lsm_str.lo \
-  lsm_tree.lo \
-  lsm_unix.lo \
-  lsm_win32.lo \
-  lsm_varint.lo \
-  lsm_vtab.lo
-
-LSMHDR   = \
-  $(LSMDIR)\lsm.h \
-  $(LSMDIR)\lsmInt.h
-
-LSMTESTSRC = $(LSMDIR)\lsm-test\lsmtest1.c $(LSMDIR)\lsm-test\lsmtest2.c     \
-             $(LSMDIR)\lsm-test\lsmtest3.c $(LSMDIR)\lsm-test\lsmtest4.c     \
-             $(LSMDIR)\lsm-test\lsmtest5.c $(LSMDIR)\lsm-test\lsmtest6.c     \
-             $(LSMDIR)\lsm-test\lsmtest7.c $(LSMDIR)\lsm-test\lsmtest8.c     \
-             $(LSMDIR)\lsm-test\lsmtest9.c                                   \
-             $(LSMDIR)\lsm-test\lsmtest_datasource.c \
-             $(LSMDIR)\lsm-test\lsmtest_func.c $(LSMDIR)\lsm-test\lsmtest_io.c  \
-             $(LSMDIR)\lsm-test\lsmtest_main.c $(LSMDIR)\lsm-test\lsmtest_mem.c \
-             $(LSMDIR)\lsm-test\lsmtest_tdb.c $(LSMDIR)\lsm-test\lsmtest_tdb3.c \
-             $(LSMDIR)\lsm-test\lsmtest_util.c $(LSMDIR)\lsm-test\lsmtest_win32.c
-
-# all: lsm.dll lsmtest.exe
-
-LSMOPTS = $(NO_WARN) -DLSM_MUTEX_WIN32=1 -I$(LSMDIR)
-
-!IF $(DEBUG)>2
-LSMOPTS = $(LSMOPTS) -DLSM_DEBUG=1
-!ENDIF
-
-!IF $(MEMDEBUG)!=0
-LSMOPTS = $(LSMOPTS) -DLSM_DEBUG_MEM=1
-!ENDIF
-
-lsm_ckpt.lo:	$(LSMDIR)\lsm_ckpt.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_ckpt.c
-
-lsm_file.lo:	$(LSMDIR)\lsm_file.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_file.c
-
-lsm_log.lo:	$(LSMDIR)\lsm_log.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_log.c
-
-lsm_main.lo:	$(LSMDIR)\lsm_main.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_main.c
-
-lsm_mem.lo:	$(LSMDIR)\lsm_mem.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_mem.c
-
-lsm_mutex.lo:	$(LSMDIR)\lsm_mutex.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_mutex.c
-
-lsm_shared.lo:	$(LSMDIR)\lsm_shared.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_shared.c
-
-lsm_sorted.lo:	$(LSMDIR)\lsm_sorted.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_sorted.c
-
-lsm_str.lo:	$(LSMDIR)\lsm_str.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_str.c
-
-lsm_tree.lo:	$(LSMDIR)\lsm_tree.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_tree.c
-
-lsm_unix.lo:	$(LSMDIR)\lsm_unix.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_unix.c
-
-lsm_win32.lo:	$(LSMDIR)\lsm_win32.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_win32.c
-
-lsm_varint.lo:	$(LSMDIR)\lsm_varint.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_varint.c
-
-lsm_vtab.lo:	$(LSMDIR)\lsm_vtab.c $(LSMHDR) $(SQLITE3H)
-	$(LTCOMPILE) $(LSMOPTS) -c $(LSMDIR)\lsm_vtab.c
-
-lsm.dll:	$(LSMOBJ)
-	$(LD) $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) /DLL /OUT:$@ $(LSMOBJ)
-	copy /Y $@ $(LSMDIR)\$@
-
-lsmtest.exe: $(LSMOBJ) $(LSMTESTSRC) $(LSMTESTHDR) $(LIBOBJ)
-	$(LTLINK) $(LSMOPTS) $(LSMTESTSRC) /link $(LSMOBJ) $(LIBOBJ)
-	copy /Y $@ $(LSMDIR)\$@
@@ -1,40 +0,0 @@
-
-
-Organization of test case files:
-
-  lsmtest1.c: Data tests. Tests that perform many inserts and deletes on a 
-              database file, then verify that the contents of the database can
-              be queried.
-
-  lsmtest2.c: Crash tests. Tests that attempt to verify that the database 
-              recovers correctly following an application or system crash.
-
-  lsmtest3.c: Rollback tests. Tests that focus on the explicit rollback of
-              transactions and sub-transactions.
-
-  lsmtest4.c: Multi-client tests.
-
-  lsmtest5.c: Multi-client tests with a different thread for each client.
-
-  lsmtest6.c: OOM injection tests.
-
-  lsmtest7.c: API tests.
-
-  lsmtest8.c: Writer crash tests. Tests in this file attempt to verify that
-              the system recovers and other clients proceed unaffected if
-              a process fails in the middle of a write transaction.
-
-              The difference from lsmtest2.c is that this file tests
-              live-recovery (recovery from a failure that occurs while other
-              clients are still running) whereas lsmtest2.c tests recovery
-              from a system or power failure.
-
-  lsmtest9.c: More data tests. These focus on testing that calling
-              lsm_work(nMerge=1) to compact the database does not corrupt it.
-              In other words, that databases containing block-redirects
-              can be read and written.
-
-
-
-
-
@@ -1,302 +0,0 @@
-
-#ifndef __WRAPPER_INT_H_
-#define __WRAPPER_INT_H_
-
-#include "lsmtest_tdb.h"
-#include "sqlite3.h"
-#include "lsm.h"
-
-#include <assert.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifndef _WIN32
-# include <unistd.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef _WIN32
-# include "windows.h"
-# define gettimeofday win32GetTimeOfDay
-# define F_OK  (0)
-# define sleep(sec) Sleep(1000 * (sec))
-# define usleep(usec) Sleep(((usec) + 999) / 1000)
-# ifdef _MSC_VER
-#  include <io.h>
-#  define snprintf _snprintf
-#  define fsync(fd) FlushFileBuffers((HANDLE)_get_osfhandle((fd)))
-#  define fdatasync(fd) FlushFileBuffers((HANDLE)_get_osfhandle((fd)))
-#  define __va_copy(dst,src) ((dst) = (src))
-#  define ftruncate(fd,sz) ((_chsize_s((fd), (sz))==0) ? 0 : -1)
-# else
-#  error Unsupported C compiler for Windows.
-# endif
-int win32GetTimeOfDay(struct timeval *, void *);
-#endif
-
-#ifndef _LSM_INT_H
-typedef unsigned int  u32;
-typedef unsigned char u8;
-typedef long long int i64;
-typedef unsigned long long int u64;
-#endif
-
-
-#define ArraySize(x) ((int)(sizeof(x) / sizeof((x)[0])))
-
-#define MIN(x,y) ((x)<(y) ? (x) : (y))
-#define MAX(x,y) ((x)>(y) ? (x) : (y))
-
-#define unused_parameter(x) (void)(x)
-
-#define TESTDB_DEFAULT_PAGE_SIZE   4096
-#define TESTDB_DEFAULT_CACHE_SIZE  2048
-
-#ifndef _O_BINARY
-# define _O_BINARY (0)
-#endif
-
-/*
-** Ideally, these should be in wrapper.c. But they are here instead so that 
-** they can be used by the C++ database wrappers in wrapper2.cc.
-*/
-typedef struct DatabaseMethods DatabaseMethods;
-struct TestDb {
-  DatabaseMethods const *pMethods;          /* Database methods */
-  const char *zLibrary;                     /* Library name for tdb_open() */
-};
-struct DatabaseMethods {
-  int (*xClose)(TestDb *);
-  int (*xWrite)(TestDb *, void *, int , void *, int);
-  int (*xDelete)(TestDb *, void *, int);
-  int (*xDeleteRange)(TestDb *, void *, int, void *, int);
-  int (*xFetch)(TestDb *, void *, int, void **, int *);
-  int (*xScan)(TestDb *, void *, int, void *, int, void *, int,
-    void (*)(void *, void *, int , void *, int)
-  );
-  int (*xBegin)(TestDb *, int);
-  int (*xCommit)(TestDb *, int);
-  int (*xRollback)(TestDb *, int);
-};
-
-/* 
-** Functions in wrapper2.cc (a C++ source file). wrapper2.cc contains the
-** wrapper for Kyoto Cabinet. Kyoto cabinet has a C API, but
-** the primary interface is the C++ API.
-*/
-int test_kc_open(const char*, const char *zFilename, int bClear, TestDb **ppDb);
-int test_kc_close(TestDb *);
-int test_kc_write(TestDb *, void *, int , void *, int);
-int test_kc_delete(TestDb *, void *, int);
-int test_kc_delete_range(TestDb *, void *, int, void *, int);
-int test_kc_fetch(TestDb *, void *, int, void **, int *);
-int test_kc_scan(TestDb *, void *, int, void *, int, void *, int,
-  void (*)(void *, void *, int , void *, int)
-);
-
-int test_mdb_open(const char*, const char *zFile, int bClear, TestDb **ppDb);
-int test_mdb_close(TestDb *);
-int test_mdb_write(TestDb *, void *, int , void *, int);
-int test_mdb_delete(TestDb *, void *, int);
-int test_mdb_fetch(TestDb *, void *, int, void **, int *);
-int test_mdb_scan(TestDb *, void *, int, void *, int, void *, int,
-  void (*)(void *, void *, int , void *, int)
-);
-
-/* 
-** Functions in wrapper3.c. This file contains the tdb wrapper for lsm.
-** The wrapper for lsm is a bit more involved than the others, as it 
-** includes code for a couple of different lsm configurations, and for
-** various types of fault injection and robustness testing.
-*/
-int test_lsm_open(const char*, const char *zFile, int bClear, TestDb **ppDb);
-int test_lsm_lomem_open(const char*, const char*, int bClear, TestDb **ppDb);
-int test_lsm_zip_open(const char*, const char*, int bClear, TestDb **ppDb);
-int test_lsm_small_open(const char*, const char*, int bClear, TestDb **ppDb);
-int test_lsm_mt2(const char*, const char *zFile, int bClear, TestDb **ppDb);
-int test_lsm_mt3(const char*, const char *zFile, int bClear, TestDb **ppDb);
-
-int tdb_lsm_configure(lsm_db *, const char *);
-
-/* Functions in lsmtest_tdb4.c */
-int test_bt_open(const char*, const char *zFile, int bClear, TestDb **ppDb);
-int test_fbt_open(const char*, const char *zFile, int bClear, TestDb **ppDb);
-int test_fbts_open(const char*, const char *zFile, int bClear, TestDb **ppDb);
-
-
-/* Functions in testutil.c. */
-int  testPrngInit(void);
-u32  testPrngValue(u32 iVal);
-void testPrngArray(u32 iVal, u32 *aOut, int nOut);
-void testPrngString(u32 iVal, char *aOut, int nOut);
-
-void testErrorInit(int argc, char **);
-void testPrintError(const char *zFormat, ...);
-void testPrintUsage(const char *zArgs);
-void testPrintFUsage(const char *zFormat, ...);
-void testTimeInit(void);
-int  testTimeGet(void);
-
-/* Functions in testmem.c. */
-void testMallocInstall(lsm_env *pEnv);
-void testMallocUninstall(lsm_env *pEnv);
-void testMallocCheck(lsm_env *pEnv, int *, int *, FILE *);
-void testMallocOom(lsm_env *pEnv, int, int, void(*)(void*), void *);
-void testMallocOomEnable(lsm_env *pEnv, int);
-
-/* lsmtest.c */
-TestDb *testOpen(const char *zSystem, int, int *pRc);
-void testReopen(TestDb **ppDb, int *pRc);
-void testClose(TestDb **ppDb);
-
-void testFetch(TestDb *, void *, int, void *, int, int *);
-void testWrite(TestDb *, void *, int, void *, int, int *);
-void testDelete(TestDb *, void *, int, int *);
-void testDeleteRange(TestDb *, void *, int, void *, int, int *);
-void testWriteStr(TestDb *, const char *, const char *zVal, int *pRc);
-void testFetchStr(TestDb *, const char *, const char *, int *pRc);
-
-void testBegin(TestDb *pDb, int iTrans, int *pRc);
-void testCommit(TestDb *pDb, int iTrans, int *pRc);
-
-void test_failed(void);
-
-char *testMallocPrintf(const char *zFormat, ...);
-char *testMallocVPrintf(const char *zFormat, va_list ap);
-int testGlobMatch(const char *zPattern, const char *zStr);
-
-void testScanCompare(TestDb *, TestDb *, int, void *, int, void *, int, int *);
-void testFetchCompare(TestDb *, TestDb *, void *, int, int *);
-
-void *testMalloc(int);
-void *testMallocCopy(void *pCopy, int nByte);
-void *testRealloc(void *, int);
-void testFree(void *);
-
-/* lsmtest_bt.c */
-int do_bt(int nArg, char **azArg);
-
-/* testio.c */
-int testVfsConfigureDb(TestDb *pDb);
-
-/* testfunc.c */
-int do_show(int nArg, char **azArg);
-int do_work(int nArg, char **azArg);
-
-/* testio.c */
-int do_io(int nArg, char **azArg);
-
-/* lsmtest2.c */
-void do_crash_test(const char *zPattern, int *pRc);
-int do_rollback_test(int nArg, char **azArg);
-
-/* test3.c */
-void test_rollback(const char *zSystem, const char *zPattern, int *pRc);
-
-/* test4.c */
-void test_mc(const char *zSystem, const char *zPattern, int *pRc);
-
-/* test5.c */
-void test_mt(const char *zSystem, const char *zPattern, int *pRc);
-
-/* lsmtest6.c */
-void test_oom(const char *zPattern, int *pRc);
-void testDeleteLsmdb(const char *zFile);
-
-void testSaveDb(const char *zFile, const char *zAuxExt);
-void testRestoreDb(const char *zFile, const char *zAuxExt);
-void testCopyLsmdb(const char *zFrom, const char *zTo);
-
-/* lsmtest7.c */
-void test_api(const char *zPattern, int *pRc);
-
-/* lsmtest8.c */
-void do_writer_crash_test(const char *zPattern, int *pRc);
-
-/*************************************************************************
-** Interface to functionality in test_datasource.c.
-*/
-typedef struct Datasource Datasource;
-typedef struct DatasourceDefn DatasourceDefn;
-
-struct DatasourceDefn {
-  int eType;                      /* A TEST_DATASOURCE_* value */
-  int nMinKey;                    /* Minimum key size */
-  int nMaxKey;                    /* Maximum key size */
-  int nMinVal;                    /* Minimum value size */
-  int nMaxVal;                    /* Maximum value size */
-};
-
-#define TEST_DATASOURCE_RANDOM    1
-#define TEST_DATASOURCE_SEQUENCE  2
-
-char *testDatasourceName(const DatasourceDefn *);
-Datasource *testDatasourceNew(const DatasourceDefn *);
-void testDatasourceFree(Datasource *);
-void testDatasourceEntry(Datasource *, int, void **, int *, void **, int *);
-/* End of test_datasource.c interface.
-*************************************************************************/
-void testDatasourceFetch(
-  TestDb *pDb,                    /* Database handle */
-  Datasource *pData,
-  int iKey,
-  int *pRc                        /* IN/OUT: Error code */
-);
-
-void testWriteDatasource(TestDb *, Datasource *, int, int *);
-void testWriteDatasourceRange(TestDb *, Datasource *, int, int, int *);
-void testDeleteDatasource(TestDb *, Datasource *, int, int *);
-void testDeleteDatasourceRange(TestDb *, Datasource *, int, int, int *);
-
-
-/* test1.c */
-void test_data_1(const char *, const char *, int *pRc);
-void test_data_2(const char *, const char *, int *pRc);
-void test_data_3(const char *, const char *, int *pRc);
-void testDbContents(TestDb *, Datasource *, int, int, int, int, int, int *);
-void testCaseProgress(int, int, int, int *);
-int testCaseNDot(void);
-
-void testCompareDb(Datasource *, int, int, TestDb *, TestDb *, int *);
-int testControlDb(TestDb **ppDb);
-
-typedef struct CksumDb CksumDb;
-CksumDb *testCksumArrayNew(Datasource *, int, int, int);
-char *testCksumArrayGet(CksumDb *, int);
-void testCksumArrayFree(CksumDb *);
-void testCaseStart(int *pRc, char *zFmt, ...);
-void testCaseFinish(int rc);
-void testCaseSkip(void);
-int testCaseBegin(int *, const char *, const char *, ...);
-
-#define TEST_CKSUM_BYTES 29
-int testCksumDatabase(TestDb *pDb, char *zOut);
-int testCountDatabase(TestDb *pDb);
-void testCompareInt(int, int, int *);
-void testCompareStr(const char *z1, const char *z2, int *pRc);
-
-/* lsmtest9.c */
-void test_data_4(const char *, const char *, int *pRc);
-
-
-/*
-** Similar to the Tcl_GetIndexFromObjStruct() Tcl library function.
-*/
-#define testArgSelect(w,x,y,z) testArgSelectX(w,x,sizeof(w[0]),y,z)
-int testArgSelectX(void *, const char *, int, const char *, int *);
-
-#ifdef __cplusplus
-}  /* End of the 'extern "C"' block */
-#endif
-
-#endif
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
drh	fa58e6575a	Merge further enhancements to the batch-atomic-write subsystem. FossilOrigin-Name: 4be4265d74b8a46f6b0b0d9108efb1d2a3fb197d902bac1238e1ee03125f975a	2017-07-31 12:04:23 +00:00
drh	ecf0cfef7e	Backport of all batch-atomic-write changes through check-in [67bad7fb9b] FossilOrigin-Name: def55027b1f1db9c083830019dbcc3daed94f6cc70a76b285ac1af9d82f81695	2017-07-28 02:02:45 +00:00
drh	e50dc1de3d	Do now allow the geometry object in the right operand of a MATCH operator in the RTREE extension to be inpersonated by a BLOB literal. FossilOrigin-Name: 24c9cd460051781f7e6417b7e205274319258f061ae1191a6c5ff5af615439c9	2017-07-27 00:27:57 +00:00
drh	d6396e9b16	Version 3.19.3 FossilOrigin-Name: 0ee482a1e0eae22e08edc8978c9733a96603d4509645f348ebf55b579e89636b	2017-06-08 14:26:16 +00:00
drh	d4d01a689d	Fix an issue with OPT_FEATURE_FLAGS in configure.ac. FossilOrigin-Name: 97b5c4a53d0af3792c5ae5ceafdb02245f841c2bd4d79bcfd0ffdf6c5ff27c9e	2017-06-08 11:32:19 +00:00
drh	a096fcc73c	Increase the version number to 3.19.3. FossilOrigin-Name: 903fff53b3f02cbc011c4cd47d841f45a447746fdf3bcb01202e27c3f2b57589	2017-06-08 11:27:05 +00:00
drh	50179f91f3	Ensure pointer map entries are always added when a row that does use overflow pages replaces one that does not in an auto-vacuum database. Fix for [fda22108]. FossilOrigin-Name: 9478106ca963e3ae5cfe59da40301c5a0a07494d03e656b5eb10ab45e441b870	2017-06-08 11:26:13 +00:00
@@ -1 +1 @@
 .20.0
 .19.3
				`@@ -66,3 +66,4 @@ do_execsql_test 2.0 { INSERT INTO t1(t1) VALUES('integrity-check') }`


				`finish_test`
				`@@ -84,3 +84,5 @@ foreach_detail_mode $::testprefix {`


				`finish_test`
				`@@ -63,3 +63,5 @@ foreach_detail_mode $::testprefix {`


				`finish_test`
				`@@ -351,3 +351,4 @@ do_faultsim_test 9.1 -faults oom-* -prep {`


				`finish_test`
				`@@ -110,3 +110,4 @@ do_faultsim_test 3.2 -faults oom-* -prep {`


				`finish_test`
				`@@ -82,3 +82,4 @@ do_faultsim_test 4 -faults oom-* -prep {`


				`finish_test`
				`@@ -132,3 +132,4 @@ do_faultsim_test 4.2 -faults oom* -body {`


				`finish_test`
				`@@ -68,3 +68,4 @@ do_near_test 1.25 "a b c d e f g h i" { NEAR(i a+b+c+d b+c, 4) } 0`


				`finish_test`