Merge tag 'upstream/2.0.6'

Upstream version 2.0.6

12 files changed, 240 insertions, 1458 deletions

diff --git a/tool/build-shell.sh b/tool/build-shell.sh
index 54e8308..8e62a71 100644
--- a/tool/build-shell.sh
+++ b/tool/build-shell.sh
@@ -12,8 +12,8 @@ make sqlite3.c
 gcc -o sqlite3 -g -Os -I. \
    -DSQLITE_THREADSAFE=0 \
    -DSQLITE_ENABLE_VFSTRACE \
-   -DSQLITE_ENABLE_STAT2 \
-   -DSQLITE_ENABLE_FTS3 \
+   -DSQLITE_ENABLE_STAT3 \
+   -DSQLITE_ENABLE_FTS4 \
    -DSQLITE_ENABLE_RTREE \
    -DHAVE_READLINE \
    -DHAVE_USLEEP=1 \
diff --git a/tool/crypto-speedtest.tcl b/tool/crypto-speedtest.tcl
index ca6e0b4..fa923a0 100755
--- a/tool/crypto-speedtest.tcl
+++ b/tool/crypto-speedtest.tcl
@@ -95,8 +95,6 @@ catch {exec /bin/sh -c {rm -f perftest*.db}}
 

 set fd [open perftest0.sql w]

 puts $fd {

-PRAGMA key='xyzzy';

-PRAGMA cipher_use_hmac=OFF;

 }

 close $fd

 

diff --git a/tool/lemon.c b/tool/lemon.c
index 1fb0308..5d96995 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -117,8 +117,6 @@ void ResortStates(struct lemon *);
 void  SetSize(int);             /* All sets will be of size N */
 char *SetNew(void);               /* A new set for element 0..N */
 void  SetFree(char*);             /* Deallocate a set */
-
-char *SetNew(void);               /* A new set for element 0..N */
 int SetAdd(char*,int);            /* Add element to a set */
 int SetUnion(char *,char *);    /* A <- A U B, thru element N */
 #define SetFind(X,Y) (X[Y])       /* True if Y is in set X */
@@ -686,8 +684,9 @@ void FindFirstSets(struct lemon *lemp)
     for(rp=lemp->rule; rp; rp=rp->next){
       if( rp->lhs->lambda ) continue;
       for(i=0; i<rp->nrhs; i++){
-         struct symbol *sp = rp->rhs[i];
-         if( sp->type!=TERMINAL || sp->lambda==LEMON_FALSE ) break;
+        struct symbol *sp = rp->rhs[i];
+        assert( sp->type==NONTERMINAL || sp->lambda==LEMON_FALSE );
+        if( sp->lambda==LEMON_FALSE ) break;
       }
       if( i==rp->nrhs ){
         rp->lhs->lambda = LEMON_TRUE;
@@ -968,7 +967,7 @@ void FindFollowSets(struct lemon *lemp)
   }while( progress );
 }
 
-static int resolve_conflict(struct action *,struct action *, struct symbol *);
+static int resolve_conflict(struct action *,struct action *);
 
 /* Compute the reduce actions, and resolve conflicts.
 */
@@ -1022,7 +1021,7 @@ void FindActions(struct lemon *lemp)
       for(nap=ap->next; nap && nap->sp==ap->sp; nap=nap->next){
          /* The two actions "ap" and "nap" have the same lookahead.
          ** Figure out which one should be used */
-         lemp->nconflict += resolve_conflict(ap,nap,lemp->errsym);
+         lemp->nconflict += resolve_conflict(ap,nap);
       }
     }
   }
@@ -1057,8 +1056,7 @@ void FindActions(struct lemon *lemp)
 */
 static int resolve_conflict(
   struct action *apx,
-  struct action *apy,
-  struct symbol *errsym   /* The error symbol (if defined.  NULL otherwise) */
+  struct action *apy
 ){
   struct symbol *spx, *spy;
   int errcnt = 0;
@@ -1548,7 +1546,7 @@ int main(int argc, char **argv)
 /*
 ** Return a pointer to the next structure in the linked list.
 */
-#define NEXT(A) (*(char**)(((unsigned long)A)+offset))
+#define NEXT(A) (*(char**)(((char*)A)+offset))
 
 /*
 ** Inputs:
@@ -1995,7 +1993,7 @@ static void parseonetoken(struct pstate *psp)
       }else if( x[0]=='{' ){
         if( psp->prevrule==0 ){
           ErrorMsg(psp->filename,psp->tokenlineno,
-"There is no prior rule opon which to attach the code \
+"There is no prior rule upon which to attach the code \
 fragment which begins on this line.");
           psp->errorcnt++;
 	}else if( psp->prevrule->code!=0 ){
diff --git a/tool/mkkeywordhash.c b/tool/mkkeywordhash.c
index 509aeef..4e5ba8f 100644
--- a/tool/mkkeywordhash.c
+++ b/tool/mkkeywordhash.c
@@ -360,7 +360,7 @@ int main(int argc, char **argv){
   /* Fill in the lengths of strings and hashes for all entries. */
   for(i=0; i<nKeyword; i++){
     Keyword *p = &aKeywordTable[i];
-    p->len = strlen(p->zName);
+    p->len = (int)strlen(p->zName);
     assert( p->len<sizeof(p->zOrigName) );
     strcpy(p->zOrigName, p->zName);
     totalLen += p->len;
diff --git a/tool/shell1.test b/tool/shell1.test
deleted file mode 100644
index 9dd9df5..0000000
--- a/tool/shell1.test
+++ /dev/null
@@ -1,720 +0,0 @@
-# 2009 Nov 11
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-# The focus of this file is testing the CLI shell tool.
-#
-# $Id: shell1.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
-#
-
-# Test plan:
-#
-#   shell1-1.*: Basic command line option handling.
-#   shell1-2.*: Basic "dot" command token parsing.
-#   shell1-3.*: Basic test that "dot" command can be called.
-#
-
-package require sqlite3
-
-set CLI "./sqlite3"
-
-proc do_test {name cmd expected} {
-  puts -nonewline "$name ..."
-  set res [uplevel $cmd]
-  if {$res eq $expected} {
-    puts Ok
-  } else {
-    puts Error
-    puts "  Got: $res"
-    puts "  Expected: $expected"
-    exit
-  }
-}
-
-proc execsql {sql} {
-  uplevel [list db eval $sql]
-}
-
-proc catchsql {sql} {
-  set rc [catch {uplevel [list db eval $sql]} msg]
-  list $rc $msg
-}
-
-proc catchcmd {db {cmd ""}} {
-  global CLI
-  set out [open cmds.txt w]
-  puts $out $cmd
-  close $out
-  set line "exec $CLI $db < cmds.txt"
-  set rc [catch { eval $line } msg]
-  list $rc $msg
-}
-
-file delete -force test.db test.db.journal
-sqlite3 db test.db
-
-#----------------------------------------------------------------------------
-# Test cases shell1-1.*: Basic command line option handling.
-#
-
-# invalid option
-do_test shell1-1.1.1 {
-  set res [catchcmd "-bad test.db" ""]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {Error: unknown option: -bad} $res]
-} {1 1}
-# error on extra options
-do_test shell1-1.1.2 {
-  set res [catchcmd "-bad test.db \"select 3\" \"select 4\"" ""]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {Error: too many options: "select 4"} $res]
-} {1 1}
-# error on extra options
-do_test shell1-1.1.3 {
-  set res [catchcmd "-bad FOO test.db BAD" ".quit"]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {Error: too many options: "BAD"} $res]
-} {1 1}
-
-# -help
-do_test shell1-1.2.1 {
-  set res [catchcmd "-help test.db" ""]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {Usage} $res] \
-       [regexp {\-init} $res] \
-       [regexp {\-version} $res]
-} {1 1 1 1}
-
-# -init filename       read/process named file
-do_test shell1-1.3.1 {
-  catchcmd "-init FOO test.db" ""
-} {0 {}}
-do_test shell1-1.3.2 {
-  set res [catchcmd "-init FOO test.db .quit BAD" ""]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {Error: too many options: "BAD"} $res]
-} {1 1}
-
-# -echo                print commands before execution
-do_test shell1-1.4.1 {
-  catchcmd "-echo test.db" "" 
-} {0 {}}
-
-# -[no]header          turn headers on or off
-do_test shell1-1.5.1 {
-  catchcmd "-header test.db" "" 
-} {0 {}}
-do_test shell1-1.5.2 {
-  catchcmd "-noheader test.db" "" 
-} {0 {}}
-
-# -bail                stop after hitting an error
-do_test shell1-1.6.1 {
-  catchcmd "-bail test.db" "" 
-} {0 {}}
-
-# -interactive         force interactive I/O
-do_test shell1-1.7.1 {
-  set res [catchcmd "-interactive test.db" ".quit"]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {SQLite version} $res] \
-       [regexp {Enter SQL statements} $res]
-} {0 1 1}
-
-# -batch               force batch I/O
-do_test shell1-1.8.1 {
-  catchcmd "-batch test.db" "" 
-} {0 {}}
-
-# -column              set output mode to 'column'
-do_test shell1-1.9.1 {
-  catchcmd "-column test.db" "" 
-} {0 {}}
-
-# -csv                 set output mode to 'csv'
-do_test shell1-1.10.1 {
-  catchcmd "-csv test.db" "" 
-} {0 {}}
-
-# -html                set output mode to HTML
-do_test shell1-1.11.1 {
-  catchcmd "-html test.db" "" 
-} {0 {}}
-
-# -line                set output mode to 'line'
-do_test shell1-1.12.1 {
-  catchcmd "-line test.db" "" 
-} {0 {}}
-
-# -list                set output mode to 'list'
-do_test shell1-1.13.1 {
-  catchcmd "-list test.db" "" 
-} {0 {}}
-
-# -separator 'x'       set output field separator (|)
-do_test shell1-1.14.1 {
-  catchcmd "-separator 'x' test.db" "" 
-} {0 {}}
-do_test shell1-1.14.2 {
-  catchcmd "-separator x test.db" "" 
-} {0 {}}
-do_test shell1-1.14.3 {
-  set res [catchcmd "-separator" ""]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {Error: missing argument for option: -separator} $res]
-} {1 1}
-
-# -stats               print memory stats before each finalize
-do_test shell1-1.14b.1 {
-  catchcmd "-stats test.db" "" 
-} {0 {}}
-
-# -nullvalue 'text'    set text string for NULL values
-do_test shell1-1.15.1 {
-  catchcmd "-nullvalue 'x' test.db" ""
-} {0 {}}
-do_test shell1-1.15.2 {
-  catchcmd "-nullvalue x test.db" ""
-} {0 {}}
-do_test shell1-1.15.3 {
-  set res [catchcmd "-nullvalue" ""]
-  set rc [lindex $res 0]
-  list $rc \
-       [regexp {Error: missing argument for option: -nullvalue} $res]
-} {1 1}
-
-# -version             show SQLite version
-do_test shell1-1.16.1 {
-  set x [catchcmd "-version test.db" ""]
-  regexp {0 \{3.\d.\d+ 20\d\d-[01]\d-\d\d \d\d:\d\d:\d\d [0-9a-f]+\}} $x 
-} 1
-
-#----------------------------------------------------------------------------
-# Test cases shell1-2.*: Basic "dot" command token parsing.
-#
-
-# check first token handling
-do_test shell1-2.1.1 {
-  catchcmd "test.db" ".foo" 
-} {1 {Error: unknown command or invalid arguments:  "foo". Enter ".help" for help}}
-do_test shell1-2.1.2 {
-  catchcmd "test.db" ".\"foo OFF\""
-} {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
-do_test shell1-2.1.3 {
-  catchcmd "test.db" ".\'foo OFF\'"
-} {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
-
-# unbalanced quotes
-do_test shell1-2.2.1 {
-  catchcmd "test.db" ".\"foo OFF"
-} {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
-do_test shell1-2.2.2 {
-  catchcmd "test.db" ".\'foo OFF"
-} {1 {Error: unknown command or invalid arguments:  "foo OFF". Enter ".help" for help}}
-do_test shell1-2.2.3 {
-  catchcmd "test.db" ".explain \"OFF"
-} {0 {}}
-do_test shell1-2.2.4 {
-  catchcmd "test.db" ".explain \'OFF"
-} {0 {}}
-do_test shell1-2.2.5 {
-  catchcmd "test.db" ".mode \"insert FOO"
-} {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell1-2.2.6 {
-  catchcmd "test.db" ".mode \'insert FOO"
-} {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-
-# check multiple tokens, and quoted tokens
-do_test shell1-2.3.1 {
-  catchcmd "test.db" ".explain 1"
-} {0 {}}
-do_test shell1-2.3.2 {
-  catchcmd "test.db" ".explain on"
-} {0 {}}
-do_test shell1-2.3.3 {
-  catchcmd "test.db" ".explain \"1 2 3\""
-} {0 {}}
-do_test shell1-2.3.4 {
-  catchcmd "test.db" ".explain \"OFF\""
-} {0 {}}
-do_test shell1-2.3.5 {
-  catchcmd "test.db" ".\'explain\' \'OFF\'"
-} {0 {}}
-do_test shell1-2.3.6 {
-  catchcmd "test.db" ".explain \'OFF\'"
-} {0 {}}
-do_test shell1-2.3.7 {
-  catchcmd "test.db" ".\'explain\' \'OFF\'"
-} {0 {}}
-
-# check quoted args are unquoted
-do_test shell1-2.4.1 {
-  catchcmd "test.db" ".mode FOO"
-} {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell1-2.4.2 {
-  catchcmd "test.db" ".mode csv"
-} {0 {}}
-do_test shell1-2.4.2 {
-  catchcmd "test.db" ".mode \"csv\""
-} {0 {}}
-
-
-#----------------------------------------------------------------------------
-# Test cases shell1-3.*: Basic test that "dot" command can be called.
-#
-
-# .backup ?DB? FILE      Backup DB (default "main") to FILE
-do_test shell1-3.1.1 {
-  catchcmd "test.db" ".backup"
-} {1 {Error: unknown command or invalid arguments:  "backup". Enter ".help" for help}}
-do_test shell1-3.1.2 {
-  catchcmd "test.db" ".backup FOO"
-} {0 {}}
-do_test shell1-3.1.3 {
-  catchcmd "test.db" ".backup FOO BAR"
-} {1 {Error: unknown database FOO}}
-do_test shell1-3.1.4 {
-  # too many arguments
-  catchcmd "test.db" ".backup FOO BAR BAD"
-} {1 {Error: unknown command or invalid arguments:  "backup". Enter ".help" for help}}
-
-# .bail ON|OFF           Stop after hitting an error.  Default OFF
-do_test shell1-3.2.1 {
-  catchcmd "test.db" ".bail"
-} {1 {Error: unknown command or invalid arguments:  "bail". Enter ".help" for help}}
-do_test shell1-3.2.2 {
-  catchcmd "test.db" ".bail ON"
-} {0 {}}
-do_test shell1-3.2.3 {
-  catchcmd "test.db" ".bail OFF"
-} {0 {}}
-do_test shell1-3.2.4 {
-  # too many arguments
-  catchcmd "test.db" ".bail OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "bail". Enter ".help" for help}}
-
-# .databases             List names and files of attached databases
-do_test shell1-3.3.1 {
-  set res [catchcmd "test.db" ".databases"]
-  regexp {0.*main.*test\.db} $res
-} {1}
-do_test shell1-3.3.2 {
-  # too many arguments
-  catchcmd "test.db" ".databases BAD"
-} {1 {Error: unknown command or invalid arguments:  "databases". Enter ".help" for help}}
-
-# .dump ?TABLE? ...      Dump the database in an SQL text format
-#                          If TABLE specified, only dump tables matching
-#                          LIKE pattern TABLE.
-do_test shell1-3.4.1 {
-  set res [catchcmd "test.db" ".dump"]
-  list [regexp {BEGIN TRANSACTION;} $res] \
-       [regexp {COMMIT;} $res]
-} {1 1}
-do_test shell1-3.4.2 {
-  set res [catchcmd "test.db" ".dump FOO"]
-  list [regexp {BEGIN TRANSACTION;} $res] \
-       [regexp {COMMIT;} $res]
-} {1 1}
-do_test shell1-3.4.3 {
-  # too many arguments
-  catchcmd "test.db" ".dump FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "dump". Enter ".help" for help}}
-
-# .echo ON|OFF           Turn command echo on or off
-do_test shell1-3.5.1 {
-  catchcmd "test.db" ".echo"
-} {1 {Error: unknown command or invalid arguments:  "echo". Enter ".help" for help}}
-do_test shell1-3.5.2 {
-  catchcmd "test.db" ".echo ON"
-} {0 {}}
-do_test shell1-3.5.3 {
-  catchcmd "test.db" ".echo OFF"
-} {0 {}}
-do_test shell1-3.5.4 {
-  # too many arguments
-  catchcmd "test.db" ".echo OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "echo". Enter ".help" for help}}
-
-# .exit                  Exit this program
-do_test shell1-3.6.1 {
-  catchcmd "test.db" ".exit"
-} {0 {}}
-do_test shell1-3.6.2 {
-  # too many arguments
-  catchcmd "test.db" ".exit BAD"
-} {1 {Error: unknown command or invalid arguments:  "exit". Enter ".help" for help}}
-
-# .explain ON|OFF        Turn output mode suitable for EXPLAIN on or off.
-do_test shell1-3.7.1 {
-  catchcmd "test.db" ".explain"
-  # explain is the exception to the booleans.  without an option, it turns it on.
-} {0 {}}
-do_test shell1-3.7.2 {
-  catchcmd "test.db" ".explain ON"
-} {0 {}}
-do_test shell1-3.7.3 {
-  catchcmd "test.db" ".explain OFF"
-} {0 {}}
-do_test shell1-3.7.4 {
-  # too many arguments
-  catchcmd "test.db" ".explain OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "explain". Enter ".help" for help}}
-
-
-# .header(s) ON|OFF      Turn display of headers on or off
-do_test shell1-3.9.1 {
-  catchcmd "test.db" ".header"
-} {1 {Error: unknown command or invalid arguments:  "header". Enter ".help" for help}}
-do_test shell1-3.9.2 {
-  catchcmd "test.db" ".header ON"
-} {0 {}}
-do_test shell1-3.9.3 {
-  catchcmd "test.db" ".header OFF"
-} {0 {}}
-do_test shell1-3.9.4 {
-  # too many arguments
-  catchcmd "test.db" ".header OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "header". Enter ".help" for help}}
-
-do_test shell1-3.9.5 {
-  catchcmd "test.db" ".headers"
-} {1 {Error: unknown command or invalid arguments:  "headers". Enter ".help" for help}}
-do_test shell1-3.9.6 {
-  catchcmd "test.db" ".headers ON"
-} {0 {}}
-do_test shell1-3.9.7 {
-  catchcmd "test.db" ".headers OFF"
-} {0 {}}
-do_test shell1-3.9.8 {
-  # too many arguments
-  catchcmd "test.db" ".headers OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "headers". Enter ".help" for help}}
-
-# .help                  Show this message
-do_test shell1-3.10.1 {
-  set res [catchcmd "test.db" ".help"]
-  # look for a few of the possible help commands
-  list [regexp {.help} $res] \
-       [regexp {.quit} $res] \
-       [regexp {.show} $res]
-} {1 1 1}
-do_test shell1-3.10.2 {
-  # we allow .help to take extra args (it is help after all)
-  set res [catchcmd "test.db" ".help BAD"]
-  # look for a few of the possible help commands
-  list [regexp {.help} $res] \
-       [regexp {.quit} $res] \
-       [regexp {.show} $res]
-} {1 1 1}
-
-# .import FILE TABLE     Import data from FILE into TABLE
-do_test shell1-3.11.1 {
-  catchcmd "test.db" ".import"
-} {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-do_test shell1-3.11.2 {
-  catchcmd "test.db" ".import FOO"
-} {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-do_test shell1-3.11.2 {
-  catchcmd "test.db" ".import FOO BAR"
-} {1 {Error: no such table: BAR}}
-do_test shell1-3.11.3 {
-  # too many arguments
-  catchcmd "test.db" ".import FOO BAR BAD"
-} {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-
-# .indices ?TABLE?       Show names of all indices
-#                          If TABLE specified, only show indices for tables
-#                          matching LIKE pattern TABLE.
-do_test shell1-3.12.1 {
-  catchcmd "test.db" ".indices"
-} {0 {}}
-do_test shell1-3.12.2 {
-  catchcmd "test.db" ".indices FOO"
-} {0 {}}
-do_test shell1-3.12.3 {
-  # too many arguments
-  catchcmd "test.db" ".indices FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "indices". Enter ".help" for help}}
-
-# .mode MODE ?TABLE?     Set output mode where MODE is one of:
-#                          csv      Comma-separated values
-#                          column   Left-aligned columns.  (See .width)
-#                          html     HTML <table> code
-#                          insert   SQL insert statements for TABLE
-#                          line     One value per line
-#                          list     Values delimited by .separator string
-#                          tabs     Tab-separated values
-#                          tcl      TCL list elements
-do_test shell1-3.13.1 {
-  catchcmd "test.db" ".mode"
-} {1 {Error: unknown command or invalid arguments:  "mode". Enter ".help" for help}}
-do_test shell1-3.13.2 {
-  catchcmd "test.db" ".mode FOO"
-} {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell1-3.13.3 {
-  catchcmd "test.db" ".mode csv"
-} {0 {}}
-do_test shell1-3.13.4 {
-  catchcmd "test.db" ".mode column"
-} {0 {}}
-do_test shell1-3.13.5 {
-  catchcmd "test.db" ".mode html"
-} {0 {}}
-do_test shell1-3.13.6 {
-  catchcmd "test.db" ".mode insert"
-} {0 {}}
-do_test shell1-3.13.7 {
-  catchcmd "test.db" ".mode line"
-} {0 {}}
-do_test shell1-3.13.8 {
-  catchcmd "test.db" ".mode list"
-} {0 {}}
-do_test shell1-3.13.9 {
-  catchcmd "test.db" ".mode tabs"
-} {0 {}}
-do_test shell1-3.13.10 {
-  catchcmd "test.db" ".mode tcl"
-} {0 {}}
-do_test shell1-3.13.11 {
-  # too many arguments
-  catchcmd "test.db" ".mode tcl BAD"
-} {1 {Error: invalid arguments:  "BAD". Enter ".help" for help}}
-
-# don't allow partial mode type matches
-do_test shell1-3.13.12 {
-  catchcmd "test.db" ".mode l"
-} {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell1-3.13.13 {
-  catchcmd "test.db" ".mode li"
-} {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-do_test shell1-3.13.14 {
-  catchcmd "test.db" ".mode lin"
-} {1 {Error: mode should be one of: column csv html insert line list tabs tcl}}
-
-# .nullvalue STRING      Print STRING in place of NULL values
-do_test shell1-3.14.1 {
-  catchcmd "test.db" ".nullvalue"
-} {1 {Error: unknown command or invalid arguments:  "nullvalue". Enter ".help" for help}}
-do_test shell1-3.14.2 {
-  catchcmd "test.db" ".nullvalue FOO"
-} {0 {}}
-do_test shell1-3.14.3 {
-  # too many arguments
-  catchcmd "test.db" ".nullvalue FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "nullvalue". Enter ".help" for help}}
-
-# .output FILENAME       Send output to FILENAME
-do_test shell1-3.15.1 {
-  catchcmd "test.db" ".output"
-} {1 {Error: unknown command or invalid arguments:  "output". Enter ".help" for help}}
-do_test shell1-3.15.2 {
-  catchcmd "test.db" ".output FOO"
-} {0 {}}
-do_test shell1-3.15.3 {
-  # too many arguments
-  catchcmd "test.db" ".output FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "output". Enter ".help" for help}}
-
-# .output stdout         Send output to the screen
-do_test shell1-3.16.1 {
-  catchcmd "test.db" ".output stdout"
-} {0 {}}
-do_test shell1-3.16.2 {
-  # too many arguments
-  catchcmd "test.db" ".output stdout BAD"
-} {1 {Error: unknown command or invalid arguments:  "output". Enter ".help" for help}}
-
-# .prompt MAIN CONTINUE  Replace the standard prompts
-do_test shell1-3.17.1 {
-  catchcmd "test.db" ".prompt"
-} {1 {Error: unknown command or invalid arguments:  "prompt". Enter ".help" for help}}
-do_test shell1-3.17.2 {
-  catchcmd "test.db" ".prompt FOO"
-} {0 {}}
-do_test shell1-3.17.3 {
-  catchcmd "test.db" ".prompt FOO BAR"
-} {0 {}}
-do_test shell1-3.17.4 {
-  # too many arguments
-  catchcmd "test.db" ".prompt FOO BAR BAD"
-} {1 {Error: unknown command or invalid arguments:  "prompt". Enter ".help" for help}}
-
-# .quit                  Exit this program
-do_test shell1-3.18.1 {
-  catchcmd "test.db" ".quit"
-} {0 {}}
-do_test shell1-3.18.2 {
-  # too many arguments
-  catchcmd "test.db" ".quit BAD"
-} {1 {Error: unknown command or invalid arguments:  "quit". Enter ".help" for help}}
-
-# .read FILENAME         Execute SQL in FILENAME
-do_test shell1-3.19.1 {
-  catchcmd "test.db" ".read"
-} {1 {Error: unknown command or invalid arguments:  "read". Enter ".help" for help}}
-do_test shell1-3.19.2 {
-  file delete -force FOO
-  catchcmd "test.db" ".read FOO"
-} {1 {Error: cannot open "FOO"}}
-do_test shell1-3.19.3 {
-  # too many arguments
-  catchcmd "test.db" ".read FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "read". Enter ".help" for help}}
-
-# .restore ?DB? FILE     Restore content of DB (default "main") from FILE
-do_test shell1-3.20.1 {
-  catchcmd "test.db" ".restore"
-} {1 {Error: unknown command or invalid arguments:  "restore". Enter ".help" for help}}
-do_test shell1-3.20.2 {
-  catchcmd "test.db" ".restore FOO"
-} {0 {}}
-do_test shell1-3.20.3 {
-  catchcmd "test.db" ".restore FOO BAR"
-} {1 {Error: unknown database FOO}}
-do_test shell1-3.20.4 {
-  # too many arguments
-  catchcmd "test.db" ".restore FOO BAR BAD"
-} {1 {Error: unknown command or invalid arguments:  "restore". Enter ".help" for help}}
-
-# .schema ?TABLE?        Show the CREATE statements
-#                          If TABLE specified, only show tables matching
-#                          LIKE pattern TABLE.
-do_test shell1-3.21.1 {
-  catchcmd "test.db" ".schema"
-} {0 {}}
-do_test shell1-3.21.2 {
-  catchcmd "test.db" ".schema FOO"
-} {0 {}}
-do_test shell1-3.21.3 {
-  # too many arguments
-  catchcmd "test.db" ".schema FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "schema". Enter ".help" for help}}
-
-# .separator STRING      Change separator used by output mode and .import
-do_test shell1-3.22.1 {
-  catchcmd "test.db" ".separator"
-} {1 {Error: unknown command or invalid arguments:  "separator". Enter ".help" for help}}
-do_test shell1-3.22.2 {
-  catchcmd "test.db" ".separator FOO"
-} {0 {}}
-do_test shell1-3.22.3 {
-  # too many arguments
-  catchcmd "test.db" ".separator FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "separator". Enter ".help" for help}}
-
-# .show                  Show the current values for various settings
-do_test shell1-3.23.1 {
-  set res [catchcmd "test.db" ".show"]
-  list [regexp {echo:} $res] \
-       [regexp {explain:} $res] \
-       [regexp {headers:} $res] \
-       [regexp {mode:} $res] \
-       [regexp {nullvalue:} $res] \
-       [regexp {output:} $res] \
-       [regexp {separator:} $res] \
-       [regexp {stats:} $res] \
-       [regexp {width:} $res]
-} {1 1 1 1 1 1 1 1 1}
-do_test shell1-3.23.2 {
-  # too many arguments
-  catchcmd "test.db" ".show BAD"
-} {1 {Error: unknown command or invalid arguments:  "show". Enter ".help" for help}}
-
-# .stats ON|OFF          Turn stats on or off
-do_test shell1-3.23b.1 {
-  catchcmd "test.db" ".stats"
-} {1 {Error: unknown command or invalid arguments:  "stats". Enter ".help" for help}}
-do_test shell1-3.23b.2 {
-  catchcmd "test.db" ".stats ON"
-} {0 {}}
-do_test shell1-3.23b.3 {
-  catchcmd "test.db" ".stats OFF"
-} {0 {}}
-do_test shell1-3.23b.4 {
-  # too many arguments
-  catchcmd "test.db" ".stats OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "stats". Enter ".help" for help}}
-
-# .tables ?TABLE?        List names of tables
-#                          If TABLE specified, only list tables matching
-#                          LIKE pattern TABLE.
-do_test shell1-3.24.1 {
-  catchcmd "test.db" ".tables"
-} {0 {}}
-do_test shell1-3.24.2 {
-  catchcmd "test.db" ".tables FOO"
-} {0 {}}
-do_test shell1-3.24.3 {
-  # too many arguments
-  catchcmd "test.db" ".tables FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "tables". Enter ".help" for help}}
-
-# .timeout MS            Try opening locked tables for MS milliseconds
-do_test shell1-3.25.1 {
-  catchcmd "test.db" ".timeout"
-} {1 {Error: unknown command or invalid arguments:  "timeout". Enter ".help" for help}}
-do_test shell1-3.25.2 {
-  catchcmd "test.db" ".timeout zzz"
-  # this should be treated the same as a '0' timeout
-} {0 {}}
-do_test shell1-3.25.3 {
-  catchcmd "test.db" ".timeout 1"
-} {0 {}}
-do_test shell1-3.25.4 {
-  # too many arguments
-  catchcmd "test.db" ".timeout 1 BAD"
-} {1 {Error: unknown command or invalid arguments:  "timeout". Enter ".help" for help}}
-
-# .width NUM NUM ...     Set column widths for "column" mode
-do_test shell1-3.26.1 {
-  catchcmd "test.db" ".width"
-} {1 {Error: unknown command or invalid arguments:  "width". Enter ".help" for help}}
-do_test shell1-3.26.2 {
-  catchcmd "test.db" ".width xxx"
-  # this should be treated the same as a '0' width for col 1
-} {0 {}}
-do_test shell1-3.26.3 {
-  catchcmd "test.db" ".width xxx yyy"
-  # this should be treated the same as a '0' width for col 1 and 2
-} {0 {}}
-do_test shell1-3.26.4 {
-  catchcmd "test.db" ".width 1 1"
-  # this should be treated the same as a '1' width for col 1 and 2
-} {0 {}}
-
-# .timer ON|OFF          Turn the CPU timer measurement on or off
-do_test shell1-3.27.1 {
-  catchcmd "test.db" ".timer"
-} {1 {Error: unknown command or invalid arguments:  "timer". Enter ".help" for help}}
-do_test shell1-3.27.2 {
-  catchcmd "test.db" ".timer ON"
-} {0 {}}
-do_test shell1-3.27.3 {
-  catchcmd "test.db" ".timer OFF"
-} {0 {}}
-do_test shell1-3.27.4 {
-  # too many arguments
-  catchcmd "test.db" ".timer OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "timer". Enter ".help" for help}}
-
-do_test shell1-3-28.1 {
-  catchcmd test.db \
-     ".log stdout\nSELECT coalesce(sqlite_log(123,'hello'),'456');"
-} "0 {(123) hello\n456}"
-
-puts "CLI tests completed successfully"
diff --git a/tool/shell2.test b/tool/shell2.test
deleted file mode 100644
index b63fafc..0000000
--- a/tool/shell2.test
+++ /dev/null
@@ -1,222 +0,0 @@
-# 2009 Nov 11
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-# The focus of this file is testing the CLI shell tool.
-#
-# $Id: shell2.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
-#
-
-# Test plan:
-#
-#   shell2-1.*: Misc. test of various tickets and reported errors.
-#
-
-package require sqlite3
-
-set CLI "./sqlite3"
-
-proc do_test {name cmd expected} {
-  puts -nonewline "$name ..."
-  set res [uplevel $cmd]
-  if {$res eq $expected} {
-    puts Ok
-  } else {
-    puts Error
-    puts "  Got: $res"
-    puts "  Expected: $expected"
-    exit
-  }
-}
-
-proc execsql {sql} {
-  uplevel [list db eval $sql]
-}
-
-proc catchsql {sql} {
-  set rc [catch {uplevel [list db eval $sql]} msg]
-  list $rc $msg
-}
-
-proc catchcmd {db {cmd ""}} {
-  global CLI
-  set out [open cmds.txt w]
-  puts $out $cmd
-  close $out
-  set line "exec $CLI $db < cmds.txt"
-  set rc [catch { eval $line } msg]
-  list $rc $msg
-}
-
-file delete -force test.db test.db.journal
-sqlite3 db test.db
-
-
-#----------------------------------------------------------------------------
-#   shell2-1.*: Misc. test of various tickets and reported errors.
-#
-
-# Batch mode not creating databases.  
-# Reported on mailing list by Ken Zalewski.
-# Ticket [aeff892c57].
-do_test shell2-1.1.1 {
-  file delete -force foo.db
-  set rc [ catchcmd "-batch foo.db" "CREATE TABLE t1(a);" ]
-  set fexist [file exist foo.db]
-  list $rc $fexist
-} {{0 {}} 1}
-
-# Shell silently ignores extra parameters.
-# Ticket [f5cb008a65].
-do_test shell2-1.2.1 {
-  set rc [catch { eval exec $CLI \":memory:\" \"select 3\" \"select 4\" } msg]
-  list $rc \
-       [regexp {Error: too many options: "select 4"} $msg]
-} {1 1}
-
-# Test a problem reported on the mailing list. The shell was at one point
-# returning the generic SQLITE_ERROR message ("SQL error or missing database")
-# instead of the "too many levels..." message in the test below.
-#
-do_test shell2-1.3 {
-  catchcmd "-batch test.db" {
-    PRAGMA recursive_triggers = ON;
-    CREATE TABLE t5(a PRIMARY KEY, b, c);
-    INSERT INTO t5 VALUES(1, 2, 3);
-    CREATE TRIGGER au_tble AFTER UPDATE ON t5 BEGIN
-      UPDATE OR IGNORE t5 SET a = new.a, c = 10;
-    END;
-
-    UPDATE OR REPLACE t5 SET a = 4 WHERE a = 1;
-  }
-} {1 {Error: near line 9: too many levels of trigger recursion}}
-
-
-
-# Shell not echoing all commands with echo on.
-# Ticket [eb620916be].
-
-# Test with echo off
-# NB. whitespace is important
-do_test shell2-1.4.1 {
-  file delete -force foo.db
-  catchcmd "foo.db" {CREATE TABLE foo(a);
-INSERT INTO foo(a) VALUES(1);
-SELECT * FROM foo;}
-} {0 1}
-
-# Test with echo on using command line option
-# NB. whitespace is important
-do_test shell2-1.4.2 {
-  file delete -force foo.db
-  catchcmd "-echo foo.db" {CREATE TABLE foo(a);
-INSERT INTO foo(a) VALUES(1);
-SELECT * FROM foo;}
-} {0 {CREATE TABLE foo(a);
-INSERT INTO foo(a) VALUES(1);
-SELECT * FROM foo;
-1}}
-
-# Test with echo on using dot command
-# NB. whitespace is important
-do_test shell2-1.4.3 {
-  file delete -force foo.db
-  catchcmd "foo.db" {.echo ON
-CREATE TABLE foo(a);
-INSERT INTO foo(a) VALUES(1);
-SELECT * FROM foo;}
-} {0 {CREATE TABLE foo(a);
-INSERT INTO foo(a) VALUES(1);
-SELECT * FROM foo;
-1}}
-
-# Test with echo on using dot command and 
-# turning off mid- processing.
-# NB. whitespace is important
-do_test shell2-1.4.4 {
-  file delete -force foo.db
-  catchcmd "foo.db" {.echo ON
-CREATE TABLE foo(a);
-.echo OFF
-INSERT INTO foo(a) VALUES(1);
-SELECT * FROM foo;}
-} {0 {CREATE TABLE foo(a);
-.echo OFF
-1}}
-
-# Test with echo on using dot command and 
-# multiple commands per line.
-# NB. whitespace is important
-do_test shell2-1.4.5 {
-  file delete -force foo.db
-  catchcmd "foo.db" {.echo ON
-CREATE TABLE foo1(a);
-INSERT INTO foo1(a) VALUES(1);
-CREATE TABLE foo2(b);
-INSERT INTO foo2(b) VALUES(1);
-SELECT * FROM foo1; SELECT * FROM foo2;
-INSERT INTO foo1(a) VALUES(2); INSERT INTO foo2(b) VALUES(2);
-SELECT * FROM foo1; SELECT * FROM foo2;
-}
-} {0 {CREATE TABLE foo1(a);
-INSERT INTO foo1(a) VALUES(1);
-CREATE TABLE foo2(b);
-INSERT INTO foo2(b) VALUES(1);
-SELECT * FROM foo1;
-1
-SELECT * FROM foo2;
-1
-INSERT INTO foo1(a) VALUES(2);
-INSERT INTO foo2(b) VALUES(2);
-SELECT * FROM foo1;
-1
-2
-SELECT * FROM foo2;
-1
-2}}
-
-# Test with echo on and headers on using dot command and 
-# multiple commands per line.
-# NB. whitespace is important
-do_test shell2-1.4.6 {
-  file delete -force foo.db
-  catchcmd "foo.db" {.echo ON
-.headers ON
-CREATE TABLE foo1(a);
-INSERT INTO foo1(a) VALUES(1);
-CREATE TABLE foo2(b);
-INSERT INTO foo2(b) VALUES(1);
-SELECT * FROM foo1; SELECT * FROM foo2;
-INSERT INTO foo1(a) VALUES(2); INSERT INTO foo2(b) VALUES(2);
-SELECT * FROM foo1; SELECT * FROM foo2;
-}
-} {0 {.headers ON
-CREATE TABLE foo1(a);
-INSERT INTO foo1(a) VALUES(1);
-CREATE TABLE foo2(b);
-INSERT INTO foo2(b) VALUES(1);
-SELECT * FROM foo1;
-a
-1
-SELECT * FROM foo2;
-b
-1
-INSERT INTO foo1(a) VALUES(2);
-INSERT INTO foo2(b) VALUES(2);
-SELECT * FROM foo1;
-a
-1
-2
-SELECT * FROM foo2;
-b
-1
-2}}
-
-puts "CLI tests completed successfully"
diff --git a/tool/shell3.test b/tool/shell3.test
deleted file mode 100644
index d37adff..0000000
--- a/tool/shell3.test
+++ /dev/null
@@ -1,124 +0,0 @@
-# 2009 Dec 16
-#
-# 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.
-#
-#***********************************************************************
-#
-# The focus of this file is testing the CLI shell tool.
-#
-# $Id: shell2.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
-#
-
-# Test plan:
-#
-#   shell3-1.*: Basic tests for running SQL statments from command line.
-#   shell3-2.*: Basic tests for running SQL file from command line.
-#
-
-package require sqlite3
-
-set CLI "./sqlite3"
-
-proc do_test {name cmd expected} {
-  puts -nonewline "$name ..."
-  set res [uplevel $cmd]
-  if {$res eq $expected} {
-    puts Ok
-  } else {
-    puts Error
-    puts "  Got: $res"
-    puts "  Expected: $expected"
-    exit
-  }
-}
-
-proc execsql {sql} {
-  uplevel [list db eval $sql]
-}
-
-proc catchsql {sql} {
-  set rc [catch {uplevel [list db eval $sql]} msg]
-  list $rc $msg
-}
-
-proc catchcmd {db {cmd ""}} {
-  global CLI
-  set out [open cmds.txt w]
-  puts $out $cmd
-  close $out
-  set line "exec $CLI $db < cmds.txt"
-  set rc [catch { eval $line } msg]
-  list $rc $msg
-}
-
-file delete -force test.db test.db.journal
-sqlite3 db test.db
-
-
-#----------------------------------------------------------------------------
-#   shell3-1.*: Basic tests for running SQL statments from command line.
-#
-
-# Run SQL statement from command line
-do_test shell3-1.1 {
-  file delete -force foo.db
-  set rc [ catchcmd "foo.db \"CREATE TABLE t1(a);\"" ]
-  set fexist [file exist foo.db]
-  list $rc $fexist
-} {{0 {}} 1}
-do_test shell3-1.2 {
-  catchcmd "foo.db" ".tables"
-} {0 t1}
-do_test shell3-1.3 {
-  catchcmd "foo.db \"DROP TABLE t1;\""
-} {0 {}}
-do_test shell3-1.4 {
-  catchcmd "foo.db" ".tables"
-} {0 {}}
-do_test shell3-1.5 {
-  catchcmd "foo.db \"CREATE TABLE t1(a); DROP TABLE t1;\""
-} {0 {}}
-do_test shell3-1.6 {
-  catchcmd "foo.db" ".tables"
-} {0 {}}
-do_test shell3-1.7 {
-  catchcmd "foo.db \"CREATE TABLE\""
-} {1 {Error: near "TABLE": syntax error}}
-
-#----------------------------------------------------------------------------
-#   shell3-2.*: Basic tests for running SQL file from command line.
-#
-
-# Run SQL file from command line
-do_test shell3-2.1 {
-  file delete -force foo.db
-  set rc [ catchcmd "foo.db" "CREATE TABLE t1(a);" ]
-  set fexist [file exist foo.db]
-  list $rc $fexist
-} {{0 {}} 1}
-do_test shell3-2.2 {
-  catchcmd "foo.db" ".tables"
-} {0 t1}
-do_test shell3-2.3 {
-  catchcmd "foo.db" "DROP TABLE t1;"
-} {0 {}}
-do_test shell3-2.4 {
-  catchcmd "foo.db" ".tables"
-} {0 {}}
-do_test shell3-2.5 {
-  catchcmd "foo.db" "CREATE TABLE t1(a); DROP TABLE t1;"
-} {0 {}}
-do_test shell3-2.6 {
-  catchcmd "foo.db" ".tables"
-} {0 {}}
-do_test shell3-2.7 {
-  catchcmd "foo.db" "CREATE TABLE"
-} {1 {Error: incomplete SQL: CREATE TABLE}}
-
-
-puts "CLI tests completed successfully"
diff --git a/tool/shell4.test b/tool/shell4.test
deleted file mode 100644
index 085c279..0000000
--- a/tool/shell4.test
+++ /dev/null
@@ -1,129 +0,0 @@
-# 2010 July 28
-#
-# The author disclaims copyright to this source code.  In place of
-# a legal notice, here is a blessing:
-#
-#    May you do good and not evil.
-#    May you find forgiveness for yourself and forgive others.
-#    May you share freely, never taking more than you give.
-#
-#***********************************************************************
-#
-# The focus of this file is testing the CLI shell tool.
-# These tests are specific to the .stats command.
-#
-# $Id: shell4.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
-#
-
-# Test plan:
-#
-#   shell4-1.*: Basic tests specific to the "stats" command.
-#
-
-set CLI "./sqlite3"
-
-proc do_test {name cmd expected} {
-  puts -nonewline "$name ..."
-  set res [uplevel $cmd]
-  if {$res eq $expected} {
-    puts Ok
-  } else {
-    puts Error
-    puts "  Got: $res"
-    puts "  Expected: $expected"
-    exit
-  }
-}
-
-proc catchcmd {db {cmd ""}} {
-  global CLI
-  set out [open cmds.txt w]
-  puts $out $cmd
-  close $out
-  set line "exec $CLI $db < cmds.txt"
-  set rc [catch { eval $line } msg]
-  list $rc $msg
-}
-
-file delete -force test.db test.db.journal
-
-#----------------------------------------------------------------------------
-# Test cases shell4-1.*: Tests specific to the "stats" command.
-#
-
-# should default to off
-do_test shell4-1.1.1 {
-  set res [catchcmd "test.db" ".show"]
-  list [regexp {stats: off} $res]
-} {1}
-
-do_test shell4-1.1.2 {
-  set res [catchcmd "test.db" ".show"]
-  list [regexp {stats: on} $res]
-} {0}
-
-# -stats should turn it on
-do_test shell4-1.2.1 {
-  set res [catchcmd "-stats test.db" ".show"]
-  list [regexp {stats: on} $res]
-} {1}
-
-do_test shell4-1.2.2 {
-  set res [catchcmd "-stats test.db" ".show"]
-  list [regexp {stats: off} $res]
-} {0}
-
-# .stats ON|OFF          Turn stats on or off
-do_test shell4-1.3.1 {
-  catchcmd "test.db" ".stats"
-} {1 {Error: unknown command or invalid arguments:  "stats". Enter ".help" for help}}
-do_test shell4-1.3.2 {
-  catchcmd "test.db" ".stats ON"
-} {0 {}}
-do_test shell4-1.3.3 {
-  catchcmd "test.db" ".stats OFF"
-} {0 {}}
-do_test shell4-1.3.4 {
-  # too many arguments
-  catchcmd "test.db" ".stats OFF BAD"
-} {1 {Error: unknown command or invalid arguments:  "stats". Enter ".help" for help}}
-
-# NB. whitespace is important
-do_test shell4-1.4.1 {
-  set res [catchcmd "test.db" {.show}]
-  list [regexp {stats: off} $res]
-} {1}
-
-do_test shell4-1.4.2 {
-  set res [catchcmd "test.db" {.stats ON
-.show
-}]
-  list [regexp {stats: on} $res]
-} {1}
-
-do_test shell4-1.4.3 {
-  set res [catchcmd "test.db" {.stats OFF
-.show
-}]
-  list [regexp {stats: off} $res]
-} {1}
-
-# make sure stats not present when off
-do_test shell4-1.5.1 {
-  set res [catchcmd "test.db" {SELECT 1;}]
-  list [regexp {Memory Used} $res] \
-       [regexp {Heap Usage} $res] \
-       [regexp {Autoindex Inserts} $res]
-} {0 0 0}
-
-# make sure stats are present when on
-do_test shell4-1.5.2 {
-  set res [catchcmd "test.db" {.stats ON
-SELECT 1;
-}]
-  list [regexp {Memory Used} $res] \
-       [regexp {Heap Usage} $res] \
-       [regexp {Autoindex Inserts} $res]
-} {1 1 1}
-
-puts "CLI tests completed successfully"
diff --git a/tool/shell5.test b/tool/shell5.test
deleted file mode 100644
index a82f979..0000000
--- a/tool/shell5.test
+++ /dev/null
@@ -1,243 +0,0 @@
-# 2010 August 4
-#
-# 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.
-#
-#***********************************************************************
-#
-# The focus of this file is testing the CLI shell tool.
-# These tests are specific to the .import command.
-#
-# $Id: shell5.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
-#
-
-# Test plan:
-#
-#   shell5-1.*: Basic tests specific to the ".import" command.
-#
-
-set CLI "./sqlite3"
-
-proc do_test {name cmd expected} {
-  puts -nonewline "$name ..."
-  set res [uplevel $cmd]
-  if {$res eq $expected} {
-    puts Ok
-  } else {
-    puts Error
-    puts "  Got: $res"
-    puts "  Expected: $expected"
-    exit
-  }
-}
-
-proc catchcmd {db {cmd ""}} {
-  global CLI
-  set out [open cmds.txt w]
-  puts $out $cmd
-  close $out
-  set line "exec $CLI $db < cmds.txt"
-  set rc [catch { eval $line } msg]
-  list $rc $msg
-}
-
-file delete -force test.db test.db.journal
-
-#----------------------------------------------------------------------------
-# Test cases shell5-1.*: Basic handling of the .import and .separator commands.
-#
-
-# .import FILE TABLE     Import data from FILE into TABLE
-do_test shell5-1.1.1 {
-  catchcmd "test.db" ".import"
-} {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-do_test shell5-1.1.2 {
-  catchcmd "test.db" ".import FOO"
-} {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-do_test shell5-1.1.2 {
-  catchcmd "test.db" ".import FOO BAR"
-} {1 {Error: no such table: BAR}}
-do_test shell5-1.1.3 {
-  # too many arguments
-  catchcmd "test.db" ".import FOO BAR BAD"
-} {1 {Error: unknown command or invalid arguments:  "import". Enter ".help" for help}}
-
-# .separator STRING      Change separator used by output mode and .import
-do_test shell1-1.2.1 {
-  catchcmd "test.db" ".separator"
-} {1 {Error: unknown command or invalid arguments:  "separator". Enter ".help" for help}}
-do_test shell1-1.2.2 {
-  catchcmd "test.db" ".separator FOO"
-} {0 {}}
-do_test shell1-1.2.3 {
-  # too many arguments
-  catchcmd "test.db" ".separator FOO BAD"
-} {1 {Error: unknown command or invalid arguments:  "separator". Enter ".help" for help}}
-
-# separator should default to "|"
-do_test shell5-1.3.1 {
-  set res [catchcmd "test.db" ".show"]
-  list [regexp {separator: \"\|\"} $res]
-} {1}
-
-# set separator to different value.
-# check that .show reports new value
-do_test shell5-1.3.2 {
-  set res [catchcmd "test.db" {.separator ,
-.show}]
-  list [regexp {separator: \",\"} $res]
-} {1}
-
-# import file doesn't exist
-do_test shell5-1.4.1 {
-  file delete -force FOO
-  set res [catchcmd "test.db" {CREATE TABLE t1(a, b);
-.import FOO t1}]
-} {1 {Error: cannot open "FOO"}}
-
-# empty import file
-do_test shell5-1.4.2 {
-  file delete -force shell5.csv
-  set in [open shell5.csv w]
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1
-SELECT COUNT(*) FROM t1;}]
-} {0 0}
-
-# import file with 1 row, 1 column (expecting 2 cols)
-do_test shell5-1.4.3 {
-  set in [open shell5.csv w]
-  puts $in "1"
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1}]
-} {1 {Error: shell5.csv line 1: expected 2 columns of data but found 1}}
-
-# import file with 1 row, 3 columns (expecting 2 cols)
-do_test shell5-1.4.4 {
-  set in [open shell5.csv w]
-  puts $in "1|2|3"
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1}]
-} {1 {Error: shell5.csv line 1: expected 2 columns of data but found 3}}
-
-# import file with 1 row, 2 columns
-do_test shell5-1.4.5 {
-  set in [open shell5.csv w]
-  puts $in "1|2"
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1
-SELECT COUNT(*) FROM t1;}]
-} {0 1}
-
-# import file with 2 rows, 2 columns
-# note we end up with 3 rows because of the 1 row 
-# imported above.
-do_test shell5-1.4.6 {
-  set in [open shell5.csv w]
-  puts $in "2|3"
-  puts $in "3|4"
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1
-SELECT COUNT(*) FROM t1;}]
-} {0 3}
-
-# import file with 1 row, 2 columns, using a comma
-do_test shell5-1.4.7 {
-  set in [open shell5.csv w]
-  puts $in "4,5"
-  close $in
-  set res [catchcmd "test.db" {.separator ,
-.import shell5.csv t1
-SELECT COUNT(*) FROM t1;}]
-} {0 4}
-
-# import file with 1 row, 2 columns, text data
-do_test shell5-1.4.8.1 {
-  set in [open shell5.csv w]
-  puts $in "5|Now is the time for all good men to come to the aid of their country."
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1
-SELECT COUNT(*) FROM t1;}]
-} {0 5}
-
-do_test shell5-1.4.8.2 {
-  catchcmd "test.db" {SELECT b FROM t1 WHERE a='5';}
-} {0 {Now is the time for all good men to come to the aid of their country.}}
-
-# import file with 1 row, 2 columns, quoted text data
-# note that currently sqlite doesn't support quoted fields, and
-# imports the entire field, quotes and all.
-do_test shell5-1.4.9.1 {
-  set in [open shell5.csv w]
-  puts $in "6|'Now is the time for all good men to come to the aid of their country.'"
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1
-SELECT COUNT(*) FROM t1;}]
-} {0 6}
-
-do_test shell5-1.4.9.2 {
-  catchcmd "test.db" {SELECT b FROM t1 WHERE a='6';}
-} {0 {'Now is the time for all good men to come to the aid of their country.'}}
-
-# import file with 1 row, 2 columns, quoted text data
-do_test shell5-1.4.10.1 {
-  set in [open shell5.csv w]
-  puts $in "7|\"Now is the time for all good men to come to the aid of their country.\""
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1
-SELECT COUNT(*) FROM t1;}]
-} {0 7}
-
-do_test shell5-1.4.10.2 {
-  catchcmd "test.db" {SELECT b FROM t1 WHERE a='7';}
-} {0 {"Now is the time for all good men to come to the aid of their country."}}
-
-# check importing very long field
-do_test shell5-1.5.1 {
-  set str [string repeat X 999]
-  set in [open shell5.csv w]
-  puts $in "8|$str"
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t1
-SELECT length(b) FROM t1 WHERE a='8';}]
-} {0 999}
-
-# try importing into a table with a large number of columns.
-# This is limited by SQLITE_MAX_VARIABLE_NUMBER, which defaults to 999.
-set cols 999
-do_test shell5-1.6.1 {
-  set sql {CREATE TABLE t2(}
-  set data {}
-  for {set i 1} {$i<$cols} {incr i} {
-    append sql "c$i,"
-    append data "$i|"
-  }
-  append sql "c$cols);"
-  append data "$cols"
-  catchcmd "test.db" $sql
-  set in [open shell5.csv w]
-  puts $in $data
-  close $in
-  set res [catchcmd "test.db" {.import shell5.csv t2
-SELECT COUNT(*) FROM t2;}]
-} {0 1}
-
-# try importing a large number of rows
-set rows 999999
-do_test shell5-1.7.1 {
-  set in [open shell5.csv w]
-  for {set i 1} {$i<=$rows} {incr i} {
-    puts $in $i
-  }
-  close $in
-  set res [catchcmd "test.db" {CREATE TABLE t3(a);
-.import shell5.csv t3
-SELECT COUNT(*) FROM t3;}]
-} [list 0 $rows]
-
-
-puts "CLI tests completed successfully"
diff --git a/tool/showdb.c b/tool/showdb.c
index 057abd3..d378d05 100644
--- a/tool/showdb.c
+++ b/tool/showdb.c
@@ -9,6 +9,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include "sqlite3.h"
 
 
 static int pagesize = 1024;     /* Size of a database page */
@@ -451,6 +452,224 @@ static void decode_trunk_page(
 }
 
 /*
+** A short text comment on the use of each page.
+*/
+static char **zPageUse;
+
+/*
+** Add a comment on the use of a page.
+*/
+static void page_usage_msg(int pgno, const char *zFormat, ...){
+  va_list ap;
+  char *zMsg;
+
+  va_start(ap, zFormat);
+  zMsg = sqlite3_vmprintf(zFormat, ap);
+  va_end(ap);
+  if( pgno<=0 || pgno>mxPage ){
+    printf("ERROR: page %d out of bounds.  Range=1..%d.  Msg: %s\n",
+            pgno, mxPage, zMsg);
+    sqlite3_free(zMsg);
+    return;
+  }
+  if( zPageUse[pgno]!=0 ){
+    printf("ERROR: page %d used multiple times:\n", pgno);
+    printf("ERROR:    previous: %s\n", zPageUse[pgno]);
+    printf("ERROR:    current:  %s\n", zPageUse[pgno]);
+    sqlite3_free(zPageUse[pgno]);
+  }
+  zPageUse[pgno] = zMsg;
+}
+
+/*
+** Find overflow pages of a cell and describe their usage.
+*/
+static void page_usage_cell(
+  unsigned char cType,    /* Page type */
+  unsigned char *a,       /* Cell content */
+  int pgno,               /* page containing the cell */
+  int cellno              /* Index of the cell on the page */
+){
+  int i;
+  int nDesc = 0;
+  int n = 0;
+  i64 nPayload;
+  i64 rowid;
+  int nLocal;
+  i = 0;
+  if( cType<=5 ){
+    a += 4;
+    n += 4;
+  }
+  if( cType!=5 ){
+    i = decodeVarint(a, &nPayload);
+    a += i;
+    n += i;
+    nLocal = localPayload(nPayload, cType);
+  }else{
+    nPayload = nLocal = 0;
+  }
+  if( cType==5 || cType==13 ){
+    i = decodeVarint(a, &rowid);
+    a += i;
+    n += i;
+  }
+  if( nLocal<nPayload ){
+    int ovfl = decodeInt32(a+nLocal);
+    int cnt = 0;
+    while( ovfl && (cnt++)<mxPage ){
+      page_usage_msg(ovfl, "overflow %d from cell %d of page %d",
+                     cnt, cellno, pgno);
+      a = getContent((ovfl-1)*pagesize, 4);
+      ovfl = decodeInt32(a);
+      free(a);
+    }
+  }
+}
+
+
+/*
+** Describe the usages of a b-tree page
+*/
+static void page_usage_btree(
+  int pgno,             /* Page to describe */
+  int parent,           /* Parent of this page.  0 for root pages */
+  int idx,              /* Which child of the parent */
+  const char *zName     /* Name of the table */
+){
+  unsigned char *a;
+  const char *zType = "corrupt node";
+  int nCell;
+  int i;
+  int hdr = pgno==1 ? 100 : 0;
+
+  if( pgno<=0 || pgno>mxPage ) return;
+  a = getContent((pgno-1)*pagesize, pagesize);
+  switch( a[hdr] ){
+    case 2:  zType = "interior node of index";  break;
+    case 5:  zType = "interior node of table";  break;
+    case 10: zType = "leaf of index";           break;
+    case 13: zType = "leaf of table";           break;
+  }
+  if( parent ){
+    page_usage_msg(pgno, "%s [%s], child %d of page %d",
+                   zType, zName, idx, parent);
+  }else{
+    page_usage_msg(pgno, "root %s [%s]", zType, zName);
+  }
+  nCell = a[hdr+3]*256 + a[hdr+4];
+  if( a[hdr]==2 || a[hdr]==5 ){
+    int cellstart = hdr+12;
+    unsigned int child;
+    for(i=0; i<nCell; i++){
+      int ofst;
+
+      ofst = cellstart + i*2;
+      ofst = a[ofst]*256 + a[ofst+1];
+      child = decodeInt32(a+ofst);
+      page_usage_btree(child, pgno, i, zName);
+    }
+    child = decodeInt32(a+cellstart-4);
+    page_usage_btree(child, pgno, i, zName);
+  }
+  if( a[hdr]==2 || a[hdr]==10 || a[hdr]==13 ){
+    int cellstart = hdr + 8 + 4*(a[hdr]<=5);
+    for(i=0; i<nCell; i++){
+      int ofst;
+      ofst = cellstart + i*2;
+      ofst = a[ofst]*256 + a[ofst+1];
+      page_usage_cell(a[hdr], a+ofst, pgno, i);
+    }
+  }
+  free(a);
+}
+
+/*
+** Determine page usage by the freelist
+*/
+static void page_usage_freelist(int pgno){
+  unsigned char *a;
+  int cnt = 0;
+  int i;
+  int n;
+  int iNext;
+  int parent = 1;
+
+  while( pgno>0 && pgno<=mxPage && (cnt++)<mxPage ){
+    page_usage_msg(pgno, "freelist trunk #%d child of %d", cnt, parent);
+    a = getContent((pgno-1)*pagesize, pagesize);
+    iNext = decodeInt32(a);
+    n = decodeInt32(a+4);
+    for(i=0; i<n; i++){
+      int child = decodeInt32(a + (i*4+8));
+      page_usage_msg(child, "freelist leaf, child %d of trunk page %d",
+                     i, pgno);
+    }
+    free(a);
+    parent = pgno;
+    pgno = iNext;
+  }
+}
+
+/*
+** Try to figure out how every page in the database file is being used.
+*/
+static void page_usage_report(const char *zDbName){
+  int i;
+  int rc;
+  sqlite3 *db;
+  sqlite3_stmt *pStmt;
+  unsigned char *a;
+
+  /* Avoid the pathological case */
+  if( mxPage<1 ){
+    printf("empty database\n");
+    return;
+  }
+
+  /* Open the database file */
+  rc = sqlite3_open(zDbName, &db);
+  if( rc ){
+    printf("cannot open database: %s\n", sqlite3_errmsg(db));
+    sqlite3_close(db);
+    return;
+  }
+
+  /* Set up global variables zPageUse[] and mxPage to record page
+  ** usages */
+  zPageUse = sqlite3_malloc( sizeof(zPageUse[0])*(mxPage+1) );
+  if( zPageUse==0 ) out_of_memory();
+  memset(zPageUse, 0, sizeof(zPageUse[0])*(mxPage+1));
+
+  /* Discover the usage of each page */
+  a = getContent(0, 100);
+  page_usage_freelist(decodeInt32(a+32));
+  free(a);
+  page_usage_btree(1, 0, 0, "sqlite_master");
+  rc = sqlite3_prepare_v2(db,
+           "SELECT type, name, rootpage FROM SQLITE_MASTER WHERE rootpage",
+           -1, &pStmt, 0);
+  if( rc==SQLITE_OK ){
+    while( sqlite3_step(pStmt)==SQLITE_ROW ){
+      int pgno = sqlite3_column_int(pStmt, 2);
+      page_usage_btree(pgno, 0, 0, sqlite3_column_text(pStmt, 1));
+    }
+  }else{
+    printf("ERROR: cannot query database: %s\n", sqlite3_errmsg(db));
+  }
+  sqlite3_finalize(pStmt);
+  sqlite3_close(db);
+
+  /* Print the report and free memory used */
+  for(i=1; i<=mxPage; i++){
+    printf("%5d: %s\n", i, zPageUse[i] ? zPageUse[i] : "???");
+    sqlite3_free(zPageUse[i]);
+  }
+  sqlite3_free(zPageUse);
+  zPageUse = 0;
+}
+
+/*
 ** Print a usage comment
 */
 static void usage(const char *argv0){
@@ -458,6 +677,7 @@ static void usage(const char *argv0){
   fprintf(stderr,
     "args:\n"
     "    dbheader        Show database header\n"
+    "    pgidx           Index of how each page is used\n"
     "    NNN..MMM        Show hex of pages NNN through MMM\n"
     "    NNN..end        Show hex of pages NNN through end of file\n"
     "    NNNb            Decode btree page NNN\n"
@@ -503,6 +723,10 @@ int main(int argc, char **argv){
         print_db_header();
         continue;
       }
+      if( strcmp(argv[i], "pgidx")==0 ){
+        page_usage_report(argv[1]);
+        continue;
+      }
       if( !isdigit(argv[i][0]) ){
         fprintf(stderr, "%s: unknown option: [%s]\n", argv[0], argv[i]);
         continue;
diff --git a/tool/spaceanal.tcl b/tool/spaceanal.tcl
index 3dddfe4..fd59670 100644
--- a/tool/spaceanal.tcl
+++ b/tool/spaceanal.tcl
@@ -49,15 +49,14 @@ if {$true_file_size<512} {
 #
 set extension [file extension $file_to_analyze]
 set pattern $file_to_analyze
-append pattern {[0-9][0-9]}
+append pattern {[0-3][0-9][0-9]}
 foreach f [glob -nocomplain $pattern] {
   incr true_file_size [file size $f]
   set extension {}
 }
 if {[string length $extension]>=2 && [string length $extension]<=4} {
   set pattern [file rootname $file_to_analyze]
-  append pattern [string range $extension 0 1]
-  append pattern {[0-9][0-9]}
+  append pattern {.[0-3][0-9][0-9]}
   foreach f [glob -nocomplain $pattern] {
     incr true_file_size [file size $f]
   }
diff --git a/tool/warnings-clang.sh b/tool/warnings-clang.sh
index 51084f3..b0d2fb6 100644
--- a/tool/warnings-clang.sh
+++ b/tool/warnings-clang.sh
@@ -9,5 +9,6 @@ echo '************* FTS4 and RTREE ****************'
 scan-build gcc -c -DHAVE_STDINT_H -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_RTREE \
       -DSQLITE_DEBUG sqlite3.c 2>&1 | grep -v 'ANALYZE:'
 echo '********** ENABLE_STAT3. THREADSAFE=0 *******'
-scan-build gcc -c -DSQLITE_ENABLE_STAT3 -DSQLITE_THREADSAFE=0 \
-      -DSQLITE_DEBUG sqlite3.c 2>&1 | grep -v 'ANALYZE:'
+scan-build gcc -c -I. -DSQLITE_ENABLE_STAT3 -DSQLITE_THREADSAFE=0 \
+      -DSQLITE_DEBUG \
+      sqlite3.c ../sqlite/src/shell.c -ldl 2>&1 | grep -v 'ANALYZE:'