Cut over the next generation query planner. Increase the version number

to 3.8.0. FossilOrigin-Name: 0fe31f60cadc5fe5a9d87e110bfaed5fd026cba1
2013-06-26 11:43:18 +00:00 · 2013-06-26 11:43:18 +00:00 · 4580cfb93e
commit 4580cfb93e
parent adbae616bd 2c036cff3d
124 changed files with 3727 additions and 3013 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-3.7.17
+3.8.0
--- a/ext/fts3/fts3.c
+++ b/ext/fts3/fts3.c
@ -1464,7 +1464,7 @@ static int fts3BestIndexMethod(sqlite3_vtab *pVTab, sqlite3_index_info *pInfo){
  ** strategy is possible.
  */
  pInfo->idxNum = FTS3_FULLSCAN_SEARCH;
-  pInfo->estimatedCost = 500000;
+  pInfo->estimatedCost = 5000000;
  for(i=0; i<pInfo->nConstraint; i++){
    struct sqlite3_index_constraint *pCons = &pInfo->aConstraint[i];
    if( pCons->usable==0 ) continue;
--- a/ext/misc/closure.c
+++ b/ext/misc/closure.c
@ -826,11 +826,17 @@ static int closureBestIndex(
  int iPlan = 0;
  int i;
  int idx = 1;
  int seenMatch = 0;
  const struct sqlite3_index_constraint *pConstraint;
  closure_vtab *pVtab = (closure_vtab*)pTab;
  double rCost = 10000000.0;
  pConstraint = pIdxInfo->aConstraint;
  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
    if( pConstraint->iColumn==CLOSURE_COL_ROOT
     && pConstraint->op==SQLITE_INDEX_CONSTRAINT_EQ ){
      seenMatch = 1;
    }
    if( pConstraint->usable==0 ) continue;
    if( (iPlan & 1)==0 
     && pConstraint->iColumn==CLOSURE_COL_ROOT
@ -839,6 +845,7 @@ static int closureBestIndex(
      iPlan |= 1;
      pIdxInfo->aConstraintUsage[i].argvIndex = 1;
      pIdxInfo->aConstraintUsage[i].omit = 1;
      rCost /= 100.0;
    }
    if( (iPlan & 0x0000f0)==0
     && pConstraint->iColumn==CLOSURE_COL_DEPTH
@ -849,6 +856,7 @@ static int closureBestIndex(
      iPlan |= idx<<4;
      pIdxInfo->aConstraintUsage[i].argvIndex = ++idx;
      if( pConstraint->op==SQLITE_INDEX_CONSTRAINT_LT ) iPlan |= 0x000002;
      rCost /= 5.0;
    }
    if( (iPlan & 0x000f00)==0
     && pConstraint->iColumn==CLOSURE_COL_TABLENAME
@ -857,6 +865,7 @@ static int closureBestIndex(
      iPlan |= idx<<8;
      pIdxInfo->aConstraintUsage[i].argvIndex = ++idx;
      pIdxInfo->aConstraintUsage[i].omit = 1;
      rCost /= 5.0;
    }
    if( (iPlan & 0x00f000)==0
     && pConstraint->iColumn==CLOSURE_COL_IDCOLUMN
@ -891,7 +900,8 @@ static int closureBestIndex(
  ){
    pIdxInfo->orderByConsumed = 1;
  }
-  pIdxInfo->estimatedCost = (double)10000;
+  if( seenMatch && (iPlan&1)==0 ) rCost *= 1e30;
  pIdxInfo->estimatedCost = rCost;
  return SQLITE_OK;
 }
--- a/ext/misc/fuzzer.c
+++ b/ext/misc/fuzzer.c
@ -1077,9 +1077,16 @@ static int fuzzerBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
  int iDistTerm = -1;
  int iRulesetTerm = -1;
  int i;
  int seenMatch = 0;
  const struct sqlite3_index_constraint *pConstraint;
  double rCost = 1e12;
  pConstraint = pIdxInfo->aConstraint;
  for(i=0; i<pIdxInfo->nConstraint; i++, pConstraint++){
    if( pConstraint->iColumn==0
     && pConstraint->op==SQLITE_INDEX_CONSTRAINT_MATCH ){
      seenMatch = 1;
    }
    if( pConstraint->usable==0 ) continue;
    if( (iPlan & 1)==0 
     && pConstraint->iColumn==0
@ -1088,6 +1095,7 @@ static int fuzzerBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
      iPlan |= 1;
      pIdxInfo->aConstraintUsage[i].argvIndex = 1;
      pIdxInfo->aConstraintUsage[i].omit = 1;
      rCost /= 1e6;
    }
    if( (iPlan & 2)==0
     && pConstraint->iColumn==1
@ -1096,6 +1104,7 @@ static int fuzzerBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
    ){
      iPlan |= 2;
      iDistTerm = i;
      rCost /= 10.0;
    }
    if( (iPlan & 4)==0
     && pConstraint->iColumn==2
@ -1104,6 +1113,7 @@ static int fuzzerBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
      iPlan |= 4;
      pIdxInfo->aConstraintUsage[i].omit = 1;
      iRulesetTerm = i;
      rCost /= 10.0;
    }
  }
  if( iPlan & 2 ){
@ -1122,7 +1132,8 @@ static int fuzzerBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo){
  ){
    pIdxInfo->orderByConsumed = 1;
  }
-  pIdxInfo->estimatedCost = (double)10000;
+  if( seenMatch && (iPlan&1)==0 ) rCost = 1e99;
  pIdxInfo->estimatedCost = rCost;
  return SQLITE_OK;
 }
--- a/ext/rtree/rtree6.test
+++ b/ext/rtree/rtree6.test
@ -74,36 +74,36 @@ do_test rtree6-1.5 {
 do_eqp_test rtree6.2.1 {
  SELECT * FROM t1,t2 WHERE k=+ii AND x1<10
 } {
-  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca (~0 rows)} 
+  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca} 
-  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
 }
 do_eqp_test rtree6.2.2 {
  SELECT * FROM t1,t2 WHERE k=ii AND x1<10
 } {
-  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca (~0 rows)} 
+  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:Ca} 
-  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
 }
 do_eqp_test rtree6.2.3 {
  SELECT * FROM t1,t2 WHERE k=ii
 } {
-  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2: (~0 rows)} 
+  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:} 
-  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
 }
 do_eqp_test rtree6.2.4 {
  SELECT * FROM t1,t2 WHERE v=10 and x1<10 and x2>10
 } {
-  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:CaEb (~0 rows)} 
+  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:CaEb} 
-  0 1 1 {SCAN TABLE t2 (~100000 rows)}
+  0 1 1 {SCAN TABLE t2}
 }
 do_eqp_test rtree6.2.5 {
  SELECT * FROM t1,t2 WHERE k=ii AND x1<v
 } {
-  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2: (~0 rows)} 
+  0 0 0 {SCAN TABLE t1 VIRTUAL TABLE INDEX 2:} 
-  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 1 {SEARCH TABLE t2 USING INTEGER PRIMARY KEY (rowid=?)}
 }
 do_execsql_test rtree6-3.1 {
--- a/ext/rtree/rtree8.test
+++ b/ext/rtree/rtree8.test
@ -168,4 +168,3 @@ do_test rtree8-5.3 {
 finish_test
--- a/main.mk
+++ b/main.mk
@ -593,6 +593,9 @@ soaktest:	testfixture$(EXE) sqlite3$(EXE)
 fulltestonly:	testfixture$(EXE) sqlite3$(EXE)
 	./testfixture$(EXE) $(TOP)/test/full.test
 queryplantest:	testfixture$(EXE) sqlite3$(EXE)
 	./testfixture$(EXE) $(TOP)/test/permutations.test queryplanner
 test:	testfixture$(EXE) sqlite3$(EXE)
 	./testfixture$(EXE) $(TOP)/test/veryquick.test
--- a/251
+++ b/251
@ -1,12 +1,12 @@
-C Remove\san\sunused\sfunction\sdeclaration\sfrom\sthe\sFTS3\ssource\scode.
+C Cut\sover\sthe\snext\sgeneration\squery\splanner.\s\sIncrease\sthe\sversion\snumber\nto\s3.8.0.
-D 2013-06-21T18:36:44.416
+D 2013-06-26T11:43:18.908
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc 7d226394826f060f232c0a02a468e8651819b7c2
 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
-F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa
+F VERSION f135b651727f978b7191bd6fa12c7fc1e13e13ac
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
 F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
@ -78,7 +78,7 @@ F ext/fts3/README.content fdc666a70d5257a64fee209f97cf89e0e6e32b51
 F ext/fts3/README.syntax a19711dc5458c20734b8e485e75fb1981ec2427a
 F ext/fts3/README.tokenizers e0a8b81383ea60d0334d274fadf305ea14a8c314
 F ext/fts3/README.txt 8c18f41574404623b76917b9da66fcb0ab38328d
-F ext/fts3/fts3.c 3cb4afd0accf903fbe66e2cc48d6f44e5ccb8a76
+F ext/fts3/fts3.c 6dbb5c424144465782d5bf0d23be89907c972454
 F ext/fts3/fts3.h 3a10a0af180d502cecc50df77b1b22df142817fe
 F ext/fts3/fts3Int.h a50cd231e906da818f00f0a81845bbf7bbeba002
 F ext/fts3/fts3_aux.c b02632f6dd0e375ce97870206d914ea6d8df5ccd
@ -107,8 +107,8 @@ F ext/icu/README.txt d9fbbad0c2f647c3fdf715fc9fd64af53aedfc43
 F ext/icu/icu.c 7538f98eab2854cf17fa5f7797bffa6c76e3863b
 F ext/icu/sqliteicu.h 728867a802baa5a96de7495e9689a8e01715ef37
 F ext/misc/amatch.c eae8454cd9dcb287b2a3ec2e65a865a4ac5f0d06
-F ext/misc/closure.c 40788c54c59190a1f52f6492a260d8894a246fe9
+F ext/misc/closure.c 997c20ddf35f85ab399f4a02a557a9baa822ec32
-F ext/misc/fuzzer.c 51bd96960b6b077d41d6f3cedefbcb57f29efaa2
+F ext/misc/fuzzer.c 136533c53cfce0957f0b48fa11dba27e21c5c01d
 F ext/misc/ieee754.c 2565ce373d842977efe0922dc50b8a41b3289556
 F ext/misc/nextchar.c 1131e2b36116ffc6fe6b2e3464bfdace27978b1e
 F ext/misc/percentile.c 4fb5e46c4312b0be74e8e497ac18f805f0e3e6c5
@ -124,9 +124,9 @@ F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
 F ext/rtree/rtree3.test a494da55c30ee0bc9b01a91c80c81b387b22d2dc
 F ext/rtree/rtree4.test c8fe384f60ebd49540a5fecc990041bf452eb6e0
 F ext/rtree/rtree5.test 6a510494f12454bf57ef28f45bc7764ea279431e
-F ext/rtree/rtree6.test 3ff9113b4a872fa935309e3511cd9b7cdb4d2472
+F ext/rtree/rtree6.test fb94b98c1145b7f44c72635d11492f35349ab27e
 F ext/rtree/rtree7.test 1fa710b9e6bf997a0c1a537b81be7bb6fded1971
-F ext/rtree/rtree8.test 9772e16da71e17e02bdebf0a5188590f289ab37d
+F ext/rtree/rtree8.test db79c812f9e4a11f9b1f3f9934007884610a713a
 F ext/rtree/rtree9.test d86ebf08ff6328895613ed577dd8a2a37c472c34
 F ext/rtree/rtreeA.test ace05e729a36e342d40cf94e9efc7b4723d9dcdf
 F ext/rtree/rtreeB.test 983e567b49b5dca165940f66b87e161aa30e82b2
@ -138,7 +138,7 @@ F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt f2b23a6bde8f1c6e86b957e4d94eab0add520b0d
-F main.mk e536751ac719806209c51f5dc63022a5dd40c631
+F main.mk c4335dbdb004d37e00e23d6ff226e55df0db5b21
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@ -159,19 +159,19 @@ F src/alter.c f8db986c03eb0bfb221523fc9bbb9d0b70de3168
 F src/analyze.c 27e541b9b5b48b41eb899b22a49ff42384899151
 F src/attach.c 1816f5a9eea8d2010fc2b22b44f0f63eb3a62704
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
-F src/backup.c b266767351ae2d847716c56fcb2a1fea7c761c03
+F src/backup.c 43b348822db3e4cef48b2ae5a445fbeb6c73a165
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
 F src/btree.c 7fba377c29573adfc6091832e27ee1fcbefb51d0
 F src/btree.h 6fa8a3ff2483d0bb64a9f0105a8cedeac9e00cca
 F src/btreeInt.h eecc84f02375b2bb7a44abbcbbe3747dde73edb2
-F src/build.c 1ecf68522356a90471b07178e186277090d0b027
+F src/build.c 42239cfd95533e4aacf4d58b4724c8f858de5ced
 F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc
 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267
 F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4
 F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778
-F src/expr.c ac9d259eea3123faa05fabe6dd8717696aca72b1
+F src/expr.c 2b47ae9da6c9f34eff6736962ea2e102c6c4a755
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179
 F src/func.c 5c50c1ea31fd864b0fe921fe1a8d4c55acd609ef
@ -191,7 +191,7 @@ F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa
 F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
 F src/mem3.c 61c9d47b792908c532ca3a62b999cf21795c6534
 F src/mem5.c c2c63b7067570b00bf33d751c39af24182316f7f
-F src/memjournal.c 41a598445c8f249bd9b26ecae700c60dcf34cbf3
+F src/memjournal.c 0683aac6cab6ec2b5374c0db37c0deb2436a3785
 F src/mutex.c d3b66a569368015e0fcb1ac15f81c119f504d3bc
 F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea
 F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553
@ -202,7 +202,7 @@ F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be
 F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 9eafa5458cf2ff684ddccff82c9bb113c7cad847
-F src/os_win.c 5f018dbd4cec25c5b47e11432b946a7d2ccee60b
+F src/os_win.c 074cb2b9bca6a1c2bd72acf04666cdc554bfaa9b
 F src/pager.c 79df56da9dd49aceaa4cac207484a9a82cba40ae
 F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1
 F src/parse.y 9acfcc83ddbf0cf82f0ed9582ccf0ad6c366ff37
@ -210,22 +210,22 @@ F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
 F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
 F src/pcache1.c d23d07716de96c7c0c2503ec5051a4384c3fb938
 F src/pragma.c 67a611bd4be0754f27ee13eb87932c3b14415862
-F src/prepare.c 743e484233c51109666d402f470523553b41797c
+F src/prepare.c 2306be166bbeddf454e18bf8b21dba8388d05328
 F src/printf.c bff529ed47657098c55c9910b9c69b1b3b1a1353
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
-F src/select.c 22ee971346a736ddefdc4497d07c92f2e9978afc
+F src/select.c d5a1b9bc3fb451e68ce907df253c6ac17e7310f7
 F src/shell.c ab6eea968c8745be3aa74e45fedb37d057b4cd0d
 F src/sqlite.h.in 5b390ca5d94e09e56e7fee6a51ddde4721b89f8e
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5
-F src/sqliteInt.h 46fb17f604ce941551fe64c342dbeb4dbed3edaa
+F src/sqliteInt.h 82a0f3e7c3410cc748c80268e0831dba5ea98cb4
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9
 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 F src/tclsqlite.c b8835978e853a89bf58de88acc943a5ca94d752e
-F src/test1.c 6d2a340eea1d866bf7059894491652a69a7ee802
+F src/test1.c 5f9837aee1a0708ab2dbf67ce0b9c18e658cd36b
 F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
 F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
@ -272,7 +272,7 @@ F src/test_vfstrace.c 34b544e80ba7fb77be15395a609c669df2e660a2
 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
 F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
 F src/trigger.c 5c0ea9b8755e7c5e1a700f3e27ac4f8d92dd221e
-F src/update.c 4c0c6864c4349ba292042e984a56d15985b57f4e
+F src/update.c 8e76c3d03e4b7b21cb250bd2df0c05e12993e577
 F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f
 F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9
 F src/vacuum.c ddf21cc9577c4cb459d08bee9863a78ec000c5bb
@ -289,29 +289,29 @@ F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83
 F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d
 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4
 F src/walker.c 4fa43583d0a84b48f93b1e88f11adf2065be4e73
-F src/where.c 5c4cbc1e5205d8d534c483fa4495c81513b45dea
+F src/where.c 8d6c07d9641bf107e03a2b613550d90b8c7f4a82
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2
 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6
 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87
-F test/all.test 705b516d4df89be56b0f52577df0966e93d2ce72
+F test/all.test 6ff7b43c2b4b905c74dc4a813d201d0fa64c5783
 F test/alter.test 57d96ec9b320bd07af77567034488dcb6642c748
 F test/alter2.test 7ea05c7d92ac99349a802ef7ada17294dd647060
 F test/alter3.test 49c9d9fba2b8fcdce2dedeca97bbf1f369cc548d
 F test/alter4.test b2debc14d8cbe4c1d12ccd6a41eef88a8c1f15d5
 F test/altermalloc.test e81ac9657ed25c6c5bb09bebfa5a047cd8e4acfc
 F test/analyze.test f8ab7d15858b4093b06caf5e57e2a5ff7104bdae
-F test/analyze3.test c3c7f6c3951900c188cf94b2d5ee3246d6b3ff89
+F test/analyze3.test 69863b446539f8849a996c2aa0b50461c9cecea4
-F test/analyze4.test 757b37875cf9bb528d46f74497bc789c88365045
+F test/analyze4.test eff2df19b8dd84529966420f29ea52edc6b56213
-F test/analyze5.test 713354664c5ff1853ab2cbcb740f0cf5cb7c802e
+F test/analyze5.test 3e57f192307be931f9ab2f6ff456f9063358ac77
-F test/analyze6.test aa8dae5066bbed35c5f45a507fb87f2d342f2c99
+F test/analyze6.test cdbf9887d40ab41301f570fe85c6e1525dd3b1c9
-F test/analyze7.test bd09e89264c664d8d8d2450b6866dcdfae080a13
+F test/analyze7.test 7de3ab66e1981303e783102a012d62cb876bf1d5
-F test/analyze8.test 4ca170de2ba30ccb1af2c0406803db72262f9691
+F test/analyze8.test ea4972c76820ac8d6a0754e6f5b851292f0f5a61
 F test/async.test 1d0e056ba1bb9729283a0f22718d3a25e82c277b
 F test/async2.test c0a9bd20816d7d6a2ceca7b8c03d3d69c28ffb8b
 F test/async3.test d73a062002376d7edc1fe3edff493edbec1fc2f7
 F test/async4.test 1787e3952128aa10238bf39945126de7ca23685a
-F test/async5.test 0dd8701bd588bf6e70c2557a22ae3f22b2567b4c
+F test/async5.test 383ab533fdb9f7ad228cc99ee66e1acb34cc0dc0
 F test/atof1.test 9bf1d25180a2e05fc12ce3940cc8003033642f68
 F test/attach.test 0d112b7713611fdf0340260192749737135fda5f
 F test/attach2.test e54436ed956d3d88bdee61221da59bf3935a0966
@ -322,20 +322,20 @@ F test/auth.test 4a4c3b034fff7750513520defa910f376c96ab49
 F test/auth2.test a2a371aa6df15f8b0c8109b33d3d7f0f73e4c9aa
 F test/auth3.test a4755e6a2a2fea547ffe63c874eb569e60a28eb5
 F test/autoinc.test bd30d372d00045252f6c2e41b5f41455e1975acf
-F test/autoindex1.test f88146c4c889ea0afbb620e49d83b5fbf5ee4d06
+F test/autoindex1.test 314f12f87667861ac965c41587f9df82c42fff65
 F test/autovacuum.test 9f22a7733f39c56ef6a5665d10145ac25d8cb574
 F test/autovacuum_ioerr2.test 8a367b224183ad801e0e24dcb7d1501f45f244b4
 F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
 F test/backcompat.test ecd841f3a3bfb81518721879cc56a760670e3198
 F test/backup.test c9cdd23a495864b9edf75a9fa66f5cb7e10fcf62
 F test/backup2.test 34986ef926ea522911a51dfdb2f8e99b7b75ebcf
-F test/backup4.test 4d90389daeb781fe718816a4fc836ad1b06791d8
+F test/backup4.test 2a2e4a64388090b152de753fd9e123f28f6a3bd4
 F test/backup_ioerr.test 4c3c7147cee85b024ecf6e150e090c32fdbb5135
 F test/backup_malloc.test 7162d604ec2b4683c4b3799a48657fb8b5e2d450
 F test/badutf.test d5360fc31f643d37a973ab0d8b4fb85799c3169f
 F test/badutf2.test f5bc7f2d280670ecd79b9cf4f0f1760c607fe51f
 F test/bc_common.tcl 5c8689cc6d2fb44b7c0968ae4f85eb26d50022fa
-F test/between.test 16b1776c6323faadb097a52d673e8e3d8be7d070
+F test/between.test 34d375fb5ce1ae283ffe82b6b233e9f38e84fc6c
 F test/bigfile.test aa74f4e5db51c8e54a1d9de9fa65d01d1eb20b59
 F test/bigfile2.test 7c79f1ef0c6c2c2bc1e7bd895596fab32bfb4796
 F test/bigrow.test f0aeb7573dcb8caaafea76454be3ade29b7fc747
@ -351,7 +351,7 @@ F test/boundary3.tcl 8901d6a503d0bf64251dd81cc74e5ad3add4b119
 F test/boundary3.test 56ef82096b4329aca2be74fa1e2b0f762ea0eb45
 F test/boundary4.tcl 0bb4b1a94f4fc5ae59b79b9a2b7a140c405e2983
 F test/boundary4.test 89e02fa66397b8a325d5eb102b5806f961f8ec4b
-F test/btreefault.test f52c593513bda80a506c848325c73c840590884d
+F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3
 F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0
 F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de
 F test/capi2.test e8b18cc61090b6e5e388f54d6b125d711d1b265a
@ -359,14 +359,14 @@ F test/capi3.test 56ab450125ead38846cbae7e5b6a216686c3cffa
 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4
 F test/capi3c.test 93d24621c9ff84da9da060f30431e0453db1cdb0
 F test/capi3d.test 17b57ca28be3e37e14c2ba8f787d292d84b724a1
-F test/capi3e.test f7408dda65c92b9056199fdc180f893015f83dde
+F test/capi3e.test ad90088b18b0367125ff2d4b5400153fd2f99aab
 F test/cast.test 4c275cbdc8202d6f9c54a3596701719868ac7dc3
 F test/check.test 2eb93611139a7dfaed3be80067c7dc5ceb5fb287
-F test/close.test e37610d60e9c9b9979a981f3f50071d7dff28616
+F test/close.test 340bd24cc58b16c6bc01967402755027c37eb815
 F test/closure01.test dbb28f1ea9eeaf0a53ec5bc0fed352e479def8c7
 F test/coalesce.test cee0dccb9fbd2d494b77234bccf9dc6c6786eb91
 F test/collate1.test b709989e6e6ff6e1d2bd64231c2c1d8146846c9e
-F test/collate2.test 04cebe4a033be319d6ddbb3bbc69464e01700b49
+F test/collate2.test 285cef1b58ce2b3cf074a386f763ce753c81c97f
 F test/collate3.test 79558a286362cb9ed603c6fa543f1cda7f563f0f
 F test/collate4.test 031f7265c13308b724ba3c49f41cc04612bd92b1
 F test/collate5.test 65d928034d30d2d263a80f6359f7549ee1598ec6
@ -378,6 +378,7 @@ F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
 F test/colmeta.test 087c42997754b8c648819832241daf724f813322
 F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
 F test/conflict.test 0b3922d2304a14a47e3ccd61bbd6824327af659b
 F test/contrib01.test 2a1cbc0f2f48955d7d073f725765da6fbceda6b4
 F test/corrupt.test 4aabd06cff3fe759e3e658bcc17b71789710665e
 F test/corrupt2.test 9c0ab4becd50e9050bc1ebb8675456a4e5587bf0
 F test/corrupt3.test 889d7cdb811800303aa722d7813fe8a4299cf726
@ -392,7 +393,7 @@ F test/corruptB.test 20d4a20cbed23958888c3e8995b424a47223d647
 F test/corruptC.test 62a767fe64acb1975f58cc6171192839c783edbb
 F test/corruptD.test 3b09903a2e2fe07ecafe775fea94177f8a4bb34f
 F test/corruptE.test d3a3d7e864a95978195741744dda4abfd8286018
-F test/corruptF.test 984b1706c9c0e4248141b056c21124612628d12e
+F test/corruptF.test 1c7b6f77cf3f237fb7fbb5b61d6c921fd4c7b993
 F test/count.test 454e1ce985c94d13efeac405ce54439f49336163
 F test/coveridxscan.test cdb47d01acc4a634a34fd25abe85189e0d0f1e62
 F test/crash.test fb9dc4a02dcba30d4aa5c2c226f98b220b2b959f
@ -414,18 +415,18 @@ F test/default.test 6faf23ccb300114924353007795aa9a8ec0aa9dc
 F test/delete.test a065b05d2ebf60fd16639c579a4adfb7c381c701
 F test/delete2.test 3a03f2cca1f9a67ec469915cb8babd6485db43fa
 F test/delete3.test 555e84a00a99230b7d049d477a324a631126a6ab
-F test/descidx1.test 533dcbda614b0463b0ea029527fd27e5a9ab2d66
+F test/descidx1.test 6d03b44c8538fe0eb4924e19fba10cdd8f3c9240
 F test/descidx2.test 9f1a0c83fd57f8667c82310ca21b30a350888b5d
 F test/descidx3.test 09ddbe3f5295f482d2f8b687cf6db8bad7acd9a2
 F test/diskfull.test 106391384780753ea6896b7b4f005d10e9866b6e
-F test/distinct.test 84da1414b2e6887fffd5ed571311b344c5b082ce
+F test/distinct.test 44028aaf161a5e80a2f229622b3a174d3b352810
 F test/distinctagg.test 1a6ef9c87a58669438fc771450d7a72577417376
-F test/e_createtable.test d4e17024b1831e7480f5736cf4e02516a5c90927
+F test/e_createtable.test ddf3b2e4506e0813f46b69ccf55757c5570cc181
 F test/e_delete.test 89aa84d3d1bd284a0689ede04bce10226a5aeaa5
 F test/e_droptrigger.test afd5c4d27dec607f5997a66bf7e2498a082cb235
 F test/e_dropview.test 583411e470458c5d76148542cfb5a5fa84c8f93e
 F test/e_expr.test 5489424d3d9a452ac3701cdf4b680ae31a157894
-F test/e_fkey.test 79a985d95340c6072a884359426ce95cf33e656a
+F test/e_fkey.test 17cfb40002d165299681f39aac0cb5890c359935
 F test/e_fts3.test 5c02288842e4f941896fd44afdef564dd5fc1459
 F test/e_insert.test d5331cc95e101af2508159fc98b6801631659ffe
 F test/e_reindex.test 5e6dff3a060b5234d496f6e84c3e59a94b4dce4d
@ -439,17 +440,17 @@ F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
 F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473
 F test/enc3.test 90683ad0e6ea587b9d5542ca93568af9a9858c40
 F test/enc4.test c8f1ce3618508fd0909945beb8b8831feef2c020
-F test/eqp.test 46aa946dd55c90635327898275d3e533d23a9845
+F test/eqp.test 8ef4d89dc44d8988b3ea6e60902905d739508db0
 F test/errmsg.test 050717f1c6a5685de9c79f5f9f6b83d7c592f73a
 F test/eval.test bc269c365ba877554948441e91ad5373f9f91be3
-F test/exclusive.test a1b324cb21834a490cd052d409d34789cfef57cb
+F test/exclusive.test c7ebbc756eacf544c108b15eed64d7d4e5f86b75
 F test/exclusive2.test 881193eccec225cfed9d7f744b65e57f26adee25
 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7
 F test/exists.test 8f7b27b61c2fbe5822f0a1f899c715d14e416e30
 F test/expr.test 67c9fd6f8f829e239dc8b0f4a08a73c08b09196d
-F test/fallocate.test b5d34437bd7ab01d41b1464b8117aefd4d32160e
+F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 F test/filectrl.test 14fa712e42c4cb791e09dfd58a6a03efb47ef13a
-F test/filefmt.test dbee33e57818249cdffbbb7b13464635217beff1
+F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
 F test/fkey1.test 01c7de578e11747e720c2d9aeef27f239853c4da
 F test/fkey2.test 06e0b4cc9e1b3271ae2ae6feeb19755468432111
 F test/fkey3.test 5ec899d12b13bcf1e9ef40eff7fb692fdb91392e
@ -494,7 +495,7 @@ F test/fts2r.test b154c30b63061d8725e320fba1a39e2201cadd5e
 F test/fts2token.test d8070b241a15ff13592a9ae4a8b7c171af6f445a
 F test/fts3.test 672a040ea57036fb4b6fdc09027c18d7d24ab654
 F test/fts3_common.tcl 99cf6659b87c0f74f55963c2aea03b3a7d66ceb0
-F test/fts3aa.test 909d5f530d30a8e36b9328d67285eae6537c79c0
+F test/fts3aa.test ad272d695095a55c16a5091dbdcce7c5f55da605
 F test/fts3ab.test 09aeaa162aee6513d9ff336b6932211008b9d1f9
 F test/fts3ac.test 636ed7486043055d4f126a0e385f2d5a82ebbf63
 F test/fts3ad.test e40570cb6f74f059129ad48bcef3d7cbc20dda49
@ -508,43 +509,43 @@ F test/fts3ak.test bd14deafe9d1586e8e9bf032411026ac4f8c925d
 F test/fts3al.test 07d64326e79bbdbab20ee87fc3328fbf01641c9f
 F test/fts3am.test 218aa6ba0dfc50c7c16b2022aac5c6be593d08d8
 F test/fts3an.test a49ccadc07a2f7d646ec1b81bc09da2d85a85b18
-F test/fts3ao.test e7b80272efcced57d1d087a9da5c690dd7c21fd9
+F test/fts3ao.test 71b0675e3df5c512a5a03daaa95ee1916de23dda
-F test/fts3atoken.test fb398ab50aa232489e2a17f9b29d7ad3a3885f36
+F test/fts3atoken.test fca30fd86db9241d571c637751e9a8a2f50f1451
-F test/fts3auto.test 74315a7377403a57ba82a652a33704197fe1e4be
+F test/fts3auto.test b981fea19b132b4e6878f50d7c1f369b28f68eb9
-F test/fts3aux1.test 03cec2dea379931c219dd4406817485caa69d1d8
+F test/fts3aux1.test f8f287a4a73f381f8fa15b6a70f36245f903d221
 F test/fts3b.test e93bbb653e52afde110ad53bbd793f14fe7a8984
 F test/fts3c.test fc723a9cf10b397fdfc2b32e73c53c8b1ec02958
 F test/fts3comp1.test a0f5b16a2df44dd0b15751787130af2183167c0c
 F test/fts3conf.test ee8500c86dd58ec075e8831a1e216a79989436de
-F test/fts3corrupt.test 7b0f91780ca36118d73324ec803187208ad33b32
+F test/fts3corrupt.test 2710b77983cc7789295ddbffea52c1d3b7506dbb
 F test/fts3corrupt2.test 6d96efae2f8a6af3eeaf283aba437e6d0e5447ba
 F test/fts3cov.test e0fb00d8b715ddae4a94c305992dfc3ef70353d7
 F test/fts3d.test bf640d79722b720fa1c81834c48cdaa45d531b1a
 F test/fts3defer.test 0be4440b73a2e651fc1e472066686d6ada4b9963
-F test/fts3defer2.test 83f8744407b7663e36716a9066302d53d49ddf8b
+F test/fts3defer2.test a3b6cbeabaf28c9398652a4d101ea224d9358479
 F test/fts3drop.test 1b906e293d6773812587b3dc458cb9e8f3f0c297
 F test/fts3e.test 1f6c6ac9cc8b772ca256e6b22aaeed50c9350851
 F test/fts3expr.test 5e745b2b6348499d9ef8d59015de3182072c564c
 F test/fts3expr2.test 18da930352e5693eaa163a3eacf96233b7290d1a
-F test/fts3expr3.test 1bfb762b53a794f990f3dffaae8bbea5736422f7
+F test/fts3expr3.test 9e91b8edbcb197bf2e92161aa7696446d96dce5f
 F test/fts3fault.test cb72dccb0a3b9f730f16c5240f3fcb9303eb1660
 F test/fts3fault2.test 3198eef2804deea7cac8403e771d9cbcb752d887
 F test/fts3first.test dbdedd20914c8d539aa3206c9b34a23775644641
-F test/fts3malloc.test 1e3df7598534e77a7072aad610d46554cface3e9
+F test/fts3malloc.test b0e4c133b8d61d4f6d112d8110f8320e9e453ef6
-F test/fts3matchinfo.test ecb08f586d027eb03941bcfcded6cb9d8ccb3a66
+F test/fts3matchinfo.test 3f297e14e3f0d5be8595246f5fcd426625cc5881
 F test/fts3near.test 12895557870b0f9af7cc0be81a0171abb2d12f12
 F test/fts3prefix.test b36d4f00b128a51e7b386cc013a874246d9d7dc1
-F test/fts3prefix2.test 477ca96e67f60745b7ac931cfa6e9b080c562da5
+F test/fts3prefix2.test e1f0a822ca661dced7f12ce392e14eaf65609dce
-F test/fts3query.test ef79d31fdb355d094baec1c1b24b60439a1fb8a2
+F test/fts3query.test 4fefd43ff24993bc2c9b2778f2bec0cc7629e7ed
 F test/fts3rnd.test 1320d8826a845e38a96e769562bf83d7a92a15d0
-F test/fts3shared.test c2f60e152e8554549eb25f0a7593ea01389c5037
+F test/fts3shared.test 57e26a801f21027b7530da77db54286a6fe4997e
-F test/fts3snippet.test 8e956051221a34c7daeb504f023cb54d5fa5a8b2
+F test/fts3snippet.test 24d6ff1920a70fd970c401a8525834b4ad12cece
-F test/fts3sort.test 95be0b19d7e41c44b29014f13ea8bddd495fd659
+F test/fts3sort.test ed34c716a11cc2009a35210e84ad5f9c102362ca
-F test/fts3tok1.test 4d9e7401679dc71f6b2f76416309b923210bfdbe
+F test/fts3tok1.test b10d0a12a0ab5f905cea1200b745de233f37443f
-F test/fts3tok_err.test 41e5413139c2ef536ffadfcd1584ee50b1665ec0
+F test/fts3tok_err.test 52273cd193b9036282f7bacb43da78c6be87418d
 F test/fts4aa.test 95f448fb02c4a976968b08d1b4ce134e720946ae
 F test/fts4check.test 66fa274cab2b615f2fb338b257713aba8fad88a8
-F test/fts4content.test 6efc53b4fd03cab167e6998d2b0b7d4b7d419ee6
+F test/fts4content.test 2e7252557d6d24afa101d9ba1de710d6140e6d06
 F test/fts4langid.test 24a6e41063b416bbdf371ff6b4476fa41c194aa7
 F test/fts4merge.test c424309743fdd203f8e56a1f1cd7872cd66cc0ee
 F test/fts4merge2.test 5faa558d1b672f82b847d2a337465fa745e46891
@ -562,7 +563,7 @@ F test/fuzz2.test 207d0f9d06db3eaf47a6b7bfc835b8e2fc397167
 F test/fuzz3.test aec64345184d1662bd30e6a17851ff659d596dc5
 F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
 F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
-F test/fuzzer1.test 41bd5aa6ae0cf18d06342a4476e3cad98604ae48
+F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36
 F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
 F test/hook.test 45cb22b940c3cc0af616ba7430f666e245711a48
 F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
@ -573,20 +574,20 @@ F test/in4.test 64f3cc1acde1b9161ccdd8e5bde3daefdb5b2617
 F test/in5.test 99f9a40af01711b06d2d614ecfe96129f334fba3
 F test/incrblob.test e81846d214f3637622620fbde7cd526781cfe328
 F test/incrblob2.test edc3a96e557bd61fb39acc8d2edd43371fbbaa19
-F test/incrblob3.test aedbb35ea1b6450c33b98f2b6ed98e5020be8dc7
+F test/incrblob3.test d8d036fde015d4a159cd3cbae9d29003b37227a4
-F test/incrblob4.test 09be37d3dd996a31ea6993bba7837ece549414a8
+F test/incrblob4.test f26502a5697893e5acea268c910f16478c2f0fab
 F test/incrblob_err.test d2562d2771ebffd4b3af89ef64c140dd44371597
-F test/incrblobfault.test 917c0292224c64a56ef7215fd633a3a82f805be0
+F test/incrblobfault.test 280474078f6da9e732cd2a215d3d854969014b6e
 F test/incrvacuum.test d2a6ddf5e429720b5fe502766af747915ccf6c32
 F test/incrvacuum2.test 379eeb8740b0ef60c372c439ad4cbea20b34bb9b
-F test/incrvacuum3.test 2ffa9e4a23f072bd7902b9ae6471f8822a6522a7
+F test/incrvacuum3.test 75256fb1377e7c39ef2de62bfc42bbff67be295a
 F test/incrvacuum_ioerr.test 6ae2f783424e47a0033304808fe27789cf93e635
 F test/index.test b5429732b3b983fa810e3ac867d7ca85dae35097
 F test/index2.test ee83c6b5e3173a3d7137140d945d9a5d4fdfb9d6
 F test/index3.test 423a25c789fc8cc51aaf2a4370bbdde2d9e9eed7
 F test/index4.test 2983216eb8c86ee62d9ed7cb206b5cc3331c0026
 F test/index5.test fc07c14193c0430814e7a08b5da46888ee795c33
-F test/indexedby.test be501e381b82b2f8ab406309ba7aac46e221f4ad
+F test/indexedby.test 0e959308707c808515c3a51363f7a9835027108c
 F test/indexfault.test 31d4ab9a7d2f6e9616933eb079722362a883eb1d
 F test/init.test 15c823093fdabbf7b531fe22cf037134d09587a7
 F test/insert.test 489aa12a027c83d291f5034a83c8c32e6be1dca2
@ -597,14 +598,14 @@ F test/insert5.test 394f96728d1258f406fe5f5aeb0aaf29487c39a6
 F test/instr.test a34e1d46a9eefb098a7167ef0e730a4a3d82fba0
 F test/intarray.test 066b7d7ac38d25bf96f87f1b017bfc687551cdd4
 F test/interrupt.test dfe9a67a94b0b2d8f70545ba1a6cca10780d71cc
-F test/intpkey.test 7af30f6ae852d8d1c2b70e4bf1551946742e92d8
+F test/intpkey.test a9674fc6195e0952e4e6105a9981ce1e48e7f215
-F test/io.test ecf44cc81664ad54d8253e2d88fc705b6554abe3
+F test/io.test 3a7abcef18727cc0f2399e04b0e8903eccae50f8
 F test/ioerr.test 40bb2cfcab63fb6aa7424cd97812a84bc16b5fb8
 F test/ioerr2.test 9d71166f8466eda510f1af6137bdabaa82b5408d
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
 F test/ioerr5.test 2edfa4fb0f896f733071303b42224df8bedd9da4
-F test/ioerr6.test cf25523b921d1a6a0e5b536cd4acb3c3d979ea52
+F test/ioerr6.test a395a6ab144b26a9e3e21059a1ab6a7149cca65b
 F test/join.test 8d63cc4d230a7affafa4b6ab0b97c49b8ccb365c
 F test/join2.test f2171c265e57ee298a27e57e7051d22962f9f324
 F test/join3.test 6f0c774ff1ba0489e6c88a3e77b9d3528fb4fda0
@ -620,7 +621,7 @@ F test/jrnlmode3.test 556b447a05be0e0963f4311e95ab1632b11c9eaa
 F test/keyword1.test a2400977a2e4fde43bf33754c2929fda34dbca05
 F test/lastinsert.test 474d519c68cb79d07ecae56a763aa7f322c72f51
 F test/laststmtchanges.test ae613f53819206b3222771828d024154d51db200
-F test/like.test 0e5412f4dac4a849f613e1ef8b529d56a6e31d08
+F test/like.test 935fb4f608e3ea126891496a6e99b9468372bf5c
 F test/like2.test 3b2ee13149ba4a8a60b59756f4e5d345573852da
 F test/limit.test cc0ab63385239b63c72452b0e93700bf5e8f0b99
 F test/loadext.test 92e6dfefd1229c3ef4aaabd87419efd8fa57a7a5
@ -631,7 +632,7 @@ F test/lock3.test f271375930711ae044080f4fe6d6eda930870d00
 F test/lock4.test e175ae13865bc87680607563bafba21f31a26f12
 F test/lock5.test 5ad6a1f536036ff1be915cfdd41481aeafda3273
 F test/lock6.test ad5b387a3a8096afd3c68a55b9535056431b0cf5
-F test/lock7.test 64006c84c1c616657e237c7ad6532b765611cf64
+F test/lock7.test 49f1eaff1cdc491cc5dee3669f3c671d9f172431
 F test/lock_common.tcl 0c270b121d40959fa2f3add382200c27045b3d95
 F test/lookaside.test 93f07bac140c5bb1d49f3892d2684decafdc7af2
 F test/main.test 39c4bb8a157f57298ed1659d6df89d9f35aaf2c8
@ -673,7 +674,7 @@ F test/misc3.test fe55130a43e444ee75e2156ff75dc96e964b5738
 F test/misc4.test 9c078510fbfff05a9869a0b6d8b86a623ad2c4f6
 F test/misc5.test 528468b26d03303b1f047146e5eefc941b9069f5
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test dd82ec9250b89178b96cd28b2aca70639d21e5b3
+F test/misc7.test 50c02c35ef7924c246eb3d8d71dfbf90ba352f8f
 F test/misuse.test ba4fb5d1a6101d1c171ea38b3c613d0661c83054
 F test/mmap1.test 93d167b328255cbe6679fe1e1a23be1b1197d07b
 F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022
@ -686,28 +687,29 @@ F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660
 F test/nan.test e9648b9d007c7045242af35e11a984d4b169443a
 F test/notify1.test 669b2b743618efdc18ca4b02f45423d5d2304abf
 F test/notify2.test ce23eb522c9e1fff6443f96376fe67872202061c
-F test/notify3.test a86259abbfb923aa27d30f0fc038c88e5251488a
+F test/notify3.test 10ff25cde502e72a92053a2f215d64bece4ef934
 F test/notnull.test 2afad748d18fd66d01f66463de73b3e2501fb226
 F test/null.test a8b09b8ed87852742343b33441a9240022108993
 F test/numcast.test 5d126f7f581432e86a90d1e35cac625164aec4a1
 F test/openv2.test 0d3040974bf402e19b7df4b783e447289d7ab394
-F test/orderby1.test f33968647da5c546528fe4d2bf86c6a6a2e5a7ae
+F test/orderby1.test 9b524aff9147288da43a6d7ddfdcff47fa2303c6
 F test/orderby2.test bc11009f7cd99d96b1b11e57b199b00633eb5b04
 F test/orderby3.test 8619d06a3debdcd80a27c0fdea5c40b468854b99
 F test/orderby4.test 4d39bfbaaa3ae64d026ca2ff166353d2edca4ba4
 F test/orderby5.test 02eca502a0f97c77ce383b0dfa17e99c6a107b8d
 F test/oserror.test 50417780d0e0d7cd23cf12a8277bb44024765df3
-F test/pager1.test 30e63afd425fea12285e9ec5fa1fd000808031f1
+F test/pager1.test 16b649c8f0b38d446acbcff8a7bf055a9be43276
 F test/pager2.test 67b8f40ae98112bcdba1f2b2d03ea83266418c71
 F test/pager3.test 3856d9c80839be0668efee1b74811b1b7f7fc95f
-F test/pagerfault.test 8483e65d33d5636e5b7656204bb274d826e728d9
+F test/pagerfault.test 7285379906ab2f1108b8e82bbdf2d386cc8ff3ff
-F test/pagerfault2.test 1f79ea40d1133b2683a2f811b00f2399f7ec2401
+F test/pagerfault2.test caf4c7facb914fd3b03a17b31ae2b180c8d6ca1f
-F test/pagerfault3.test f16e2efcb5fc9996d1356f7cbc44c998318ae1d7
+F test/pagerfault3.test 1003fcda009bf48a8e22a516e193b6ef0dd1bbd8
 F test/pageropt.test 6b8f6a123a5572c195ad4ae40f2987007923bbd6
 F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0
 F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16
 F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025
 F test/percentile.test 4614301e38398df7fdd5f28f4ed8f272b328251b
-F test/permutations.test 7161be2569550924a8a437272acabfe9e6f48b86
+F test/permutations.test 461ef4ea10db02cd421dfe5f988eac3e99b5cd9a
 F test/pragma.test 5e7de6c32a5d764f09437d2025f07e4917b9e178
 F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947
 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@ -743,7 +745,7 @@ F test/schema3.test 1bc1008e1f8cb5654b248c55f27249366eb7ed38
 F test/schema4.test e6a66e20cc69f0e306667c08be7fda3d11707dc5
 F test/schema5.test 0103e4c0313b3725b5ae5600bdca53006ab53db3
 F test/securedel.test 87a2561151af1f1e349071a89fdd77059f50113c
-F test/securedel2.test f13a916155f790a6b9de835049641b14ef312986
+F test/securedel2.test 2d54c28e46eb1fd6902089958b20b1b056c6f1c5
 F test/select1.test deba017eed9daa5af33de868676c997e7eebb931
 F test/select2.test 352480e0e9c66eda9c3044e412abdf5be0215b56
 F test/select3.test 2ce595f8fb8e2ac10071d3b4e424cadd4634a054
@ -765,11 +767,11 @@ F test/shared3.test ebf77f023f4bdaa8f74f65822b559e86ce5c6257
 F test/shared4.test 72d90821e8d2fc918a08f16d32880868d8ee8e9d
 F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
 F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
-F test/shared8.test b27befbefbe7f4517f1d6b7ff8f64a41ec74165d
+F test/shared8.test 00a07bf5e1337ecf72e94542bdefdc330d7a2538
 F test/shared9.test 5f2a8f79b4d6c7d107a01ffa1ed05ae7e6333e21
 F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
 F test/shared_err.test 0079c05c97d88cfa03989b7c20a8b266983087aa
-F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
+F test/sharedlock.test 927a4b6da11978c82b857dbdb20a932aad732123
 F test/shell1.test 4a2f57952719972c6f862134463f8712e953c038
 F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a
 F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59
@ -793,7 +795,7 @@ F test/spellfix.test bea537caf587df30d430c2c6a8fe9f64b8712834
 F test/sqllimits1.test b1aae27cc98eceb845e7f7adf918561256e31298
 F test/stat.test be8d477306006ec696bc86757cfb34bec79447ce
 F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9
-F test/subquery.test 869562de9e8c5d8147e0451a2ce5b58cf55ce389
+F test/subquery.test 3b97763ada8b3a4092d2c80db3ebc0e7870e7eaf
 F test/subquery2.test 91e1e364072aeff431d1f9689b15147e421d88c7
 F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4
 F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a
@ -807,7 +809,7 @@ F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
-F test/tester.tcl 3b08771e6d601612fe62d13787db0e50aac4cf7b
+F test/tester.tcl 63b24679c75a952c51f924de2802b2b57cddd22d
 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@ -821,16 +823,16 @@ F test/threadtest2.c ace893054fa134af3fc8d6e7cfecddb8e3acefb9
 F test/threadtest3.c 0ed13e09690f6204d7455fac3b0e8ece490f6eef
 F test/tkt-02a8e81d44.test 6c80d9c7514e2a42d4918bf87bf6bc54f379110c
 F test/tkt-26ff0c2d1e.test 888324e751512972c6e0d1a09df740d8f5aaf660
-F test/tkt-2a5629202f.test 1ab32e084e9fc3d36be6dee2617530846a0eb0b6
+F test/tkt-2a5629202f.test 0521bd25658428baa26665aa53ffed9367d33af2
 F test/tkt-2d1a5c67d.test d371279946622698ab393ff88cad9f5f6d82960b
 F test/tkt-2ea2425d34.test 1cf13e6f75d149b3209a0cb32927a82d3d79fb28
 F test/tkt-31338dca7e.test 6fb8807851964da0d24e942f2e19c7c705b9fb58
 F test/tkt-313723c356.test c47f8a9330523e6f35698bf4489bcb29609b53ac
-F test/tkt-385a5b56b9.test 7782a382912a51f09f1d1a1442bca1e75f9c549b
+F test/tkt-385a5b56b9.test c0a06ada41d7f06b1686da0e718553f853771d1e
 F test/tkt-38cb5df375.test f3cc8671f1eb604d4ae9cf886ed4366bec656678
 F test/tkt-3998683a16.test 6d1d04d551ed1704eb3396ca87bb9ccc8c5c1eb7
-F test/tkt-3a77c9714e.test 32bb28afa8c63fc76e972e996193139b63551ed9
+F test/tkt-3a77c9714e.test b08bca26de1140bdf004a37716582a43d7bd8be8
-F test/tkt-3fe897352e.test 10de1a67bd5c66b238a4c96abe55531b37bb4f00
+F test/tkt-3fe897352e.test 27e26eb0f1811aeba4d65aba43a4c52e99da5e70
 F test/tkt-4a03edc4c8.test 2865e4edbc075b954daa82f8da7cc973033ec76e
 F test/tkt-4dd95f6943.test 3d0ce415d2ee15d3d564121960016b9c7be79407
 F test/tkt-54844eea3f.test a12b851128f46a695e4e378cca67409b9b8f5894
@ -839,9 +841,9 @@ F test/tkt-5e10420e8d.test 904d1687b3c06d43e5b3555bbcf6802e7c0ffd84
 F test/tkt-5ee23731f.test 9db6e1d7209dc0794948b260d6f82b2b1de83a9f
 F test/tkt-6bfb98dfc0.test 24780633627b5cfc0635a5500c2389ebfb563336
 F test/tkt-752e1646fc.test ea78d88d14fe9866bdd991c634483334639e13bf
-F test/tkt-78e04e52ea.test 703e0bfb23d543edf0426a97e3bbd0ca346508ec
+F test/tkt-78e04e52ea.test 787b70cfb0488c356266bb8d5ad8a657f9efceb8
-F test/tkt-7a31705a7e6.test 5a7889fdb095ffbe1622413e0145de1637d421bd
+F test/tkt-7a31705a7e6.test e75a2bba4eec801b92c8040eb22096ac6d35e844
-F test/tkt-7bbfb7d442.test dfa5c8097a8c353ae40705d6cddeb1f99c18b81a
+F test/tkt-7bbfb7d442.test 7b2cd79c7a17ae6750e75ec1a7846712a69c9d18
 F test/tkt-80ba201079.test 105a721e6aad0ae3c5946d7615d1e4d03f6145b8
 F test/tkt-80e031a00f.test 9a154173461a4dbe2de49cda73963e04842d52f7
 F test/tkt-8454a207b9.test c583a9f814a82a2b5ba95207f55001c9f0cd816c
@ -854,15 +856,15 @@ F test/tkt-b351d95f9.test d14a503c414c5c58fdde3e80f9a3cfef986498c0
 F test/tkt-b72787b1.test a95e8cdad0b98af1853ac7f0afd4ab27b77bf5f3
 F test/tkt-bd484a090c.test 60460bf946f79a79712b71f202eda501ca99b898
 F test/tkt-bdc6bbbb38.test fc38bb09bdd440e3513a1f5f98fc60a075182d7d
-F test/tkt-c48d99d690.test bed446e3513ae10eec1b86fdd186ef750226c408
+F test/tkt-c48d99d690.test ba61977d62ab612fc515b3c488a6fbd6464a2447
 F test/tkt-cbd054fa6b.test 9c27ed07b333eed458e5d4543f91ecdcf05aeb19
-F test/tkt-d11f09d36e.test fb44f7961aa6d4b632fb7b9768239832210b5fc7
+F test/tkt-d11f09d36e.test d999b548fef885d1d1afa49a0e8544ecf436869d
 F test/tkt-d635236375.test 9d37e988b47d87505bc9445be0ca447002df5d09
 F test/tkt-d82e3f3721.test bcc0dfba658d15bab30fd4a9320c9e35d214ce30
-F test/tkt-f3e5abed55.test 669bb076f2ac573c7398ce00f40cd0ca502043a9
+F test/tkt-f3e5abed55.test d5a0126118142d13e27f6ce9f4c47096e9321c00
 F test/tkt-f777251dc7a.test af6531446c64bfd268416f07b4df7be7f9c749d2
 F test/tkt-f7b4edec.test d998a08ff2b18b7f62edce8e3044317c45efe6c7
-F test/tkt-f973c7ac31.test 1da0ed15ec2c7749fb5ce2828cd69d07153ad9f4
+F test/tkt-f973c7ac31.test 28ef85c7f015477916795246d8286aeda39d4ead
 F test/tkt-fa7bf5ec.test 9102dfea58aa371d78969da735f9392c57e2e035
 F test/tkt-fc62af4523.test 72825d3febdedcd5593a27989fc05accdbfc2bb4
 F test/tkt-fc7bd6358f.test 634bb4af7d661e82d6b61b80c86727bad698e08f
@ -914,7 +916,7 @@ F test/tkt3346.test 6f67c3ed7db94dfc5df4f5f0b63809a1f611e01a
 F test/tkt3357.test 77c37c6482b526fe89941ce951c22d011f5922ed
 F test/tkt3419.test 1bbf36d7ea03b638c15804251287c2391f5c1f6b
 F test/tkt3424.test 61f831bd2b071bd128fa5d00fbda57e656ca5812
-F test/tkt3442.test 0adb70e9fe9cb750a702065a68ad647409dbc158
+F test/tkt3442.test 53840ec5325bb94544792aad4c20476f81dc26b1
 F test/tkt3457.test 44e980fe5334753dcc27b94fa4deabc485a92f74
 F test/tkt3461.test 228ea328a5a21e8663f80ee3d212a6ad92549a19
 F test/tkt3493.test 1686cbde85f8721fc1bdc0ee72f2ef2f63139218
@ -942,9 +944,9 @@ F test/tkt3841.test 4659845bc53f809a5932c61c6ce8c5bb9d6b947f
 F test/tkt3871.test 43ecbc8d90dc83908e2a454aef345acc9d160c6f
 F test/tkt3879.test 2ad5bef2c87e9991ce941e054c31abe26ef7fb90
 F test/tkt3911.test 74cd324f3ba653040cc6d94cc4857b290d12d633
-F test/tkt3918.test e6cdf6bfcfe9ba939d86a4238a9dc55d6eec5d42
+F test/tkt3918.test ea78bf164e4d55cbde0d83c671ef6fbe930a0032
 F test/tkt3922.test f26be40ab4fe6c00795629bd2006d96e270d9b1a
-F test/tkt3929.test 75a862e45bcb39e9a7944c89b92afa531304afca
+F test/tkt3929.test cdf67acf5aa936ec4ffead81db87f8a71fe40e59
 F test/tkt3935.test e15261fedb9e30a4305a311da614a5d8e693c767
 F test/tkt3992.test f3e7d548ac26f763b47bc0f750da3d03c81071da
 F test/tkt3997.test a335fa41ca3985660a139df7b734a26ef53284bd
@ -975,7 +977,7 @@ F test/types2.test 3555aacf8ed8dc883356e59efc314707e6247a84
 F test/types3.test 99e009491a54f4dc02c06bdbc0c5eea56ae3e25a
 F test/unique.test cadb172bbd5a2e83cd644d186ccd602085e54edc
 F test/unixexcl.test a9870e46cc6f8390a494513d4f2bf55b5a8b3e46
-F test/unordered.test 93dce7b6c97a817a4fe26980c484605a4511f614
+F test/unordered.test ef85ac8f2f3c93ed2b9e811b684de73175fc464c
 F test/update.test 8bc86fd7ef1a00014f76dc6a6a7c974df4aef172
 F test/uri.test 63e03df051620a18f794b4f4adcdefb3c23b6751
 F test/utf16align.test 54cd35a27c005a9b6e7815d887718780b6a462ae
@ -984,14 +986,14 @@ F test/vacuum2.test af432e6e3bfc0ea20a80cb86a03c7d9876d38324
 F test/vacuum3.test 77ecdd54592b45a0bcb133339f99f1ae0ae94d0d
 F test/vacuum4.test d3f8ecff345f166911568f397d2432c16d2867d9
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
-F test/veryquick.test 7701bb609fe8bf6535514e8b849a309e8f00573b
+F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test 4057630287bfa5955628fe90a13d4c225d1c7352
-F test/vtab1.test 4403f987860ebddef1ce2de6db7216421035339d
+F test/vtab1.test 1550abf90bc2b996f8c34e0be3fdb251af54fa41
 F test/vtab2.test 7bcffc050da5c68f4f312e49e443063e2d391c0d
 F test/vtab3.test baad99fd27217f5d6db10660522e0b7192446de1
 F test/vtab4.test 942f8b8280b3ea8a41dae20e7822d065ca1cb275
 F test/vtab5.test 889f444970393c73f1e077e2bdc5d845e157a391
-F test/vtab6.test c7f290d172609d636fbfc58166eadcb55d5c117c
+F test/vtab6.test 5f5380c425e52993560ab4763db4f826d2ba7b09
 F test/vtab7.test ae560ebea870ed04e9aa4177cc302f910faaabb5
 F test/vtab8.test e19fa4a538fcd1bb66c22825fa8f71618fb13583
 F test/vtab9.test ea58d2b95d61955f87226381716b2d0b1d4e4f9b
@ -1011,40 +1013,40 @@ F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 F test/wal5.test 8f888b50f66b78821e61ed0e233ded5de378224b
 F test/wal6.test 2e3bc767d9c2ce35c47106148d43fcbd072a93b3
 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
-F test/wal8.test b3ee739fe8f7586aaebdc2367f477ebcf3e3b034
+F test/wal8.test 75c42e1bc4545c277fed212f8fc9b7723cd02216
 F test/wal9.test 378e76a9ad09cd9bee06c172ad3547b0129a6750
 F test/wal_common.tcl a98f17fba96206122eff624db0ab13ec377be4fe
 F test/walbak.test b9f68e39646375c2b877be906babcc15d38b4877
 F test/walbig.test f437473a16cfb314867c6b5d1dbcd519e73e3434
-F test/walcksum.test f5447800a157c9e2234fbb8e80243f0813941bde
+F test/walcksum.test 9afeb96240296c08c72fc524d199c912cfe34daa
-F test/walcrash.test 4457436593be8c136f9148487c7dccd5e9013af2
+F test/walcrash.test 451d79e528add5c42764cea74aa2750754171b25
-F test/walcrash2.test 019d60b89d96c1937adb2b30b850ac7e86e5a142
+F test/walcrash2.test a0edab4e5390f03b99a790de89aad15d6ec70b36
-F test/walcrash3.test 595e44c6197f0d0aa509fc135be2fd0209d11a2c
+F test/walcrash3.test e426aa58122d20f2b9fbe9a507f9eb8cab85b8af
 F test/walfault.test 54ad6e849c727f4da463964b9eb8c8e8e155cf82
 F test/walhook.test ed00a40ba7255da22d6b66433ab61fab16a63483
 F test/walmode.test 4022fe03ae6e830583672caa101f046438a0473c
 F test/walnoshm.test 84ca10c544632a756467336b7c3b864d493ee496
 F test/walpersist.test 8c6b7e3ec1ba91b5e4dc4e0921d6d3f87cd356a6
-F test/walro.test a31deb621033442a76c3a61e44929250d06f81b1
+F test/walro.test 6cc247a0cc9b36aeea2057dd28a922a1cdfbd630
-F test/walshared.test 6dda2293880c300baf5d791c307f653094585761
+F test/walshared.test 0befc811dcf0b287efae21612304d15576e35417
 F test/walslow.test e7be6d9888f83aa5d3d3c7c08aa9b5c28b93609a
 F test/walthread.test de8dbaf6d9e41481c460ba31ca61e163d7348f8e
-F test/where.test 15ac8611c9439a2c5f4a6ac10cfe4c1ec9854c24
+F test/where.test da54153a4c1571ea1b95659e5bec8119edf786aa
-F test/where2.test 399b3178289925a0aa976b3d60ef139740540ecd
+F test/where2.test dcf0ffafe0de55051c1373835a5a57aee6b50094
-F test/where3.test 667e75642102c97a00bf9b23d3cb267db321d006
+F test/where3.test 157071521ceabc06bfd4d37106e4270a8956364d
 F test/where4.test e9b9e2f2f98f00379e6031db6a6fca29bae782a2
 F test/where5.test fdf66f96d29a064b63eb543e28da4dfdccd81ad2
 F test/where6.test 5da5a98cec820d488e82708301b96cb8c18a258b
-F test/where7.test 5c566388f0cc318b0032ce860f4ac5548e3c265a
+F test/where7.test 5a4b0abc207d71da4deecd734ad8579e8dd40aa8
-F test/where8.test d6a283eb7348a8967d44e2a753f117ab0d21d4f3
+F test/where8.test f6b9559723564a042927ee0f22003ac9bed71b21
 F test/where8m.test da346596e19d54f0aba35ebade032a7c47d79739
-F test/where9.test 1b4387c6eacc9a32b28b4d837c27f857c785d0d8
+F test/where9.test 9a7fda4a4512abc26a855e8b2b6572b200f6019b
 F test/whereA.test 24c234263c8fe358f079d5e57d884fb569d2da0a
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
-F test/whereC.test 13ff5ec0dba407c0e0c075980c75b3275a6774e5
+F test/whereC.test d6f4ecd4fa2d9429681a5b22a25d2bda8e86ab8a
-F test/whereD.test 3f3ee93825c94804f1fc91eef2de0d365981759a
+F test/whereD.test 6c2feb79ef1f68381b07f39017fe5f9b96da8d62
-F test/whereE.test 7bd34945797efef15819368479bacc34215e4e1d
+F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
-F test/whereF.test a0e296643cabe5278379bc1a0aa158cf3c54a1c9
+F test/whereF.test 136a7301512d72a08a272806c8767066311b7bc1
 F test/wherelimit.test 5e9fd41e79bb2b2d588ed999d641d9c965619b31
 F test/win32lock.test 7a6bd73a5dcdee39b5bb93e92395e1773a194361
 F test/zeroblob.test caaecfb4f908f7bc086ed238668049f96774d688
@ -1093,8 +1095,9 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 361084e1eb281e985568d19fe217263be92be31d
+P 096ae1d8f9a08f92daedece6b0615f4d22b05023 19ab4811d542ba781aeb6a4eb3c74642677225e1
-R 0d6c636b8cfd628682ea33e027cb07be
+R f73808040fac6ead247f9d2a50c342d8
 U drh
-Z 55b5720fc386809651d148c0a8415781
+Z e52529fd895183a80c4903c58cf391c1
--- a/manifest.uuid
+++ b/manifest.uuid
@ -1 +1 @@
-096ae1d8f9a08f92daedece6b0615f4d22b05023
+0fe31f60cadc5fe5a9d87e110bfaed5fd026cba1
--- a/src/backup.c
+++ b/src/backup.c
@ -15,12 +15,6 @@
 #include "sqliteInt.h"
 #include "btreeInt.h"
 /* Macro to find the minimum of two numeric values.
 */
 #ifndef MIN
 # define MIN(x,y) ((x)<(y)?(x):(y))
 #endif
 /*
 ** Structure allocated for each backup operation.
 */
--- a/src/build.c
+++ b/src/build.c
@ -2696,6 +2696,7 @@ Index *sqlite3CreateIndex(
  pIndex->pTable = pTab;
  pIndex->nColumn = pList->nExpr;
  pIndex->onError = (u8)onError;
  pIndex->uniqNotNull = onError==OE_Abort;
  pIndex->autoIndex = (u8)(pName==0);
  pIndex->pSchema = db->aDb[iDb].pSchema;
  assert( sqlite3SchemaMutexHeld(db, iDb, 0) );
@ -2754,6 +2755,7 @@ Index *sqlite3CreateIndex(
    pIndex->azColl[i] = zColl;
    requestedSortOrder = pListItem->sortOrder & sortOrderMask;
    pIndex->aSortOrder[i] = (u8)requestedSortOrder;
    if( pTab->aCol[j].notNull==0 ) pIndex->uniqNotNull = 0;
  }
  sqlite3DefaultRowEst(pIndex);
@ -3185,7 +3187,7 @@ SrcList *sqlite3SrcListEnlarge(
    }
    pSrc = pNew;
    nGot = (sqlite3DbMallocSize(db, pNew) - sizeof(*pSrc))/sizeof(pSrc->a[0])+1;
-    pSrc->nAlloc = (u16)nGot;
+    pSrc->nAlloc = (u8)nGot;
  }
  /* Move existing slots that come after the newly inserted slots
@ -3193,7 +3195,7 @@ SrcList *sqlite3SrcListEnlarge(
  for(i=pSrc->nSrc-1; i>=iStart; i--){
    pSrc->a[i+nExtra] = pSrc->a[i];
  }
-  pSrc->nSrc += (i16)nExtra;
+  pSrc->nSrc += (i8)nExtra;
  /* Zero the newly allocated slots */
  memset(&pSrc->a[iStart], 0, sizeof(pSrc->a[0])*nExtra);
--- a/src/expr.c
+++ b/src/expr.c
@ -920,6 +920,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
    pItem->zSpan = sqlite3DbStrDup(db, pOldItem->zSpan);
    pItem->sortOrder = pOldItem->sortOrder;
    pItem->done = 0;
    pItem->bSpanIsTab = pOldItem->bSpanIsTab;
    pItem->iOrderByCol = pOldItem->iOrderByCol;
    pItem->iAlias = pOldItem->iAlias;
  }
@ -1596,15 +1597,15 @@ int sqlite3FindInIndex(Parse *pParse, Expr *pX, int *prNotFound){
    /* Could not found an existing table or index to use as the RHS b-tree.
    ** We will have to generate an ephemeral table to do the job.
    */
-    double savedNQueryLoop = pParse->nQueryLoop;
+    u32 savedNQueryLoop = pParse->nQueryLoop;
    int rMayHaveNull = 0;
    eType = IN_INDEX_EPH;
    if( prNotFound ){
      *prNotFound = rMayHaveNull = ++pParse->nMem;
      sqlite3VdbeAddOp2(v, OP_Null, 0, *prNotFound);
    }else{
-      testcase( pParse->nQueryLoop>(double)1 );
+      testcase( pParse->nQueryLoop>0 );
-      pParse->nQueryLoop = (double)1;
+      pParse->nQueryLoop = 0;
      if( pX->pLeft->iColumn<0 && !ExprHasAnyProperty(pX, EP_xIsSelect) ){
        eType = IN_INDEX_ROWID;
      }
--- a/src/memjournal.c
+++ b/src/memjournal.c
@ -31,12 +31,6 @@ typedef struct FileChunk FileChunk;
 */
 #define JOURNAL_CHUNKSIZE ((int)(1024-sizeof(FileChunk*)))
 /* Macro to find the minimum of two numeric values.
 */
 #ifndef MIN
 # define MIN(x,y) ((x)<(y)?(x):(y))
 #endif
 /*
 ** The rollback journal is composed of a linked list of these structures.
 */
--- a/src/os_win.c
+++ b/src/os_win.c
@ -84,13 +84,6 @@ WINBASEAPI LPVOID WINAPI MapViewOfFile(HANDLE, DWORD, DWORD, DWORD, SIZE_T);
 WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID);
 #endif /* SQLITE_WIN32_FILEMAPPING_API && !defined(SQLITE_OMIT_WAL) */
 /*
 ** Macro to find the minimum of two numeric values.
 */
 #ifndef MIN
 # define MIN(x,y) ((x)<(y)?(x):(y))
 #endif
 /*
 ** Some Microsoft compilers lack this definition.
 */
--- a/src/prepare.c
+++ b/src/prepare.c
@ -592,7 +592,7 @@ static int sqlite3Prepare(
  sqlite3VtabUnlockList(db);
  pParse->db = db;
-  pParse->nQueryLoop = (double)1;
+  pParse->nQueryLoop = 0;  /* Logarithmic, so 0 really means 1 */
  if( nBytes>=0 && (nBytes==0 || zSql[nBytes-1]!=0) ){
    char *zSqlCopy;
    int mxLen = db->aLimit[SQLITE_LIMIT_SQL_LENGTH];
@ -614,7 +614,7 @@ static int sqlite3Prepare(
  }else{
    sqlite3RunParser(pParse, zSql, &zErrMsg);
  }
-  assert( 1==(int)pParse->nQueryLoop );
+  assert( 0==pParse->nQueryLoop );
  if( db->mallocFailed ){
    pParse->rc = SQLITE_NOMEM;
--- a/src/select.c
+++ b/src/select.c
@ -1538,8 +1538,8 @@ static void computeLimitRegisters(Parse *pParse, Select *p, int iBreak){
      VdbeComment((v, "LIMIT counter"));
      if( n==0 ){
        sqlite3VdbeAddOp2(v, OP_Goto, 0, iBreak);
-      }else{
+      }else if( n>=0 && p->nSelectRow>(u64)n ){
-        if( p->nSelectRow > (double)n ) p->nSelectRow = (double)n;
+        p->nSelectRow = n;
      }
    }else{
      sqlite3ExprCode(pParse, p->pLimit, iLimit);
@ -1733,9 +1733,9 @@ static int multiSelect(
      p->nSelectRow += pPrior->nSelectRow;
      if( pPrior->pLimit
       && sqlite3ExprIsInteger(pPrior->pLimit, &nLimit)
-       && p->nSelectRow > (double)nLimit 
+       && nLimit>0 && p->nSelectRow > (u64)nLimit 
      ){
-        p->nSelectRow = (double)nLimit;
+        p->nSelectRow = nLimit;
      }
      if( addr ){
        sqlite3VdbeJumpHere(v, addr);
@ -3884,11 +3884,10 @@ static void explainSimpleCount(
  Index *pIdx                     /* Index used to optimize scan, or NULL */
 ){
  if( pParse->explain==2 ){
-    char *zEqp = sqlite3MPrintf(pParse->db, "SCAN TABLE %s %s%s(~%d rows)",
+    char *zEqp = sqlite3MPrintf(pParse->db, "SCAN TABLE %s%s%s",
        pTab->zName, 
-        pIdx ? "USING COVERING INDEX " : "",
+        pIdx ? " USING COVERING INDEX " : "",
-        pIdx ? pIdx->zName : "",
+        pIdx ? pIdx->zName : ""
        pTab->nRowEst
    );
    sqlite3VdbeAddOp4(
        pParse->pVdbe, OP_Explain, pParse->iSelectId, 0, 0, zEqp, P4_DYNAMIC
@ -4239,7 +4238,7 @@ int sqlite3Select(
  /* Set the limiter.
  */
  iEnd = sqlite3VdbeMakeLabel(v);
-  p->nSelectRow = (double)LARGEST_INT64;
+  p->nSelectRow = LARGEST_INT64;
  computeLimitRegisters(pParse, p, iEnd);
  if( p->iLimit==0 && addrSortIndex>=0 ){
    sqlite3VdbeGetOp(v, addrSortIndex)->opcode = OP_SorterOpen;
@ -4267,9 +4266,13 @@ int sqlite3Select(
    /* Begin the database scan. */
    pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pOrderBy, pDist, 0,0);
    if( pWInfo==0 ) goto select_end;
-    if( pWInfo->nRowOut < p->nSelectRow ) p->nSelectRow = pWInfo->nRowOut;
+    if( sqlite3WhereOutputRowCount(pWInfo) < p->nSelectRow ){
-    if( pWInfo->eDistinct ) sDistinct.eTnctType = pWInfo->eDistinct;
+      p->nSelectRow = sqlite3WhereOutputRowCount(pWInfo);
-    if( pOrderBy && pWInfo->nOBSat==pOrderBy->nExpr ) pOrderBy = 0;
+    }
    if( sqlite3WhereIsDistinct(pWInfo) ){
      sDistinct.eTnctType = sqlite3WhereIsDistinct(pWInfo);
    }
    if( pOrderBy && sqlite3WhereIsOrdered(pWInfo) ) pOrderBy = 0;
    /* If sorting index that was created by a prior OP_OpenEphemeral 
    ** instruction ended up not being needed, then change the OP_OpenEphemeral
@ -4282,7 +4285,8 @@ int sqlite3Select(
    /* Use the standard inner loop. */
    selectInnerLoop(pParse, p, pEList, 0, 0, pOrderBy, &sDistinct, pDest,
-                    pWInfo->iContinue, pWInfo->iBreak);
+                    sqlite3WhereContinueLabel(pWInfo),
                    sqlite3WhereBreakLabel(pWInfo));
    /* End the database scan loop.
    */
@ -4315,9 +4319,9 @@ int sqlite3Select(
      for(k=pGroupBy->nExpr, pItem=pGroupBy->a; k>0; k--, pItem++){
        pItem->iAlias = 0;
      }
-      if( p->nSelectRow>(double)100 ) p->nSelectRow = (double)100;
+      if( p->nSelectRow>100 ) p->nSelectRow = 100;
    }else{
-      p->nSelectRow = (double)1;
+      p->nSelectRow = 1;
    }
@ -4397,9 +4401,10 @@ int sqlite3Select(
      ** in the right order to begin with.
      */
      sqlite3VdbeAddOp2(v, OP_Gosub, regReset, addrReset);
-      pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, 0, 0, 0);
+      pWInfo = sqlite3WhereBegin(pParse, pTabList, pWhere, pGroupBy, 0, 
                                 WHERE_GROUPBY, 0);
      if( pWInfo==0 ) goto select_end;
-      if( pWInfo->nOBSat==pGroupBy->nExpr ){
+      if( sqlite3WhereIsOrdered(pWInfo) ){
        /* The optimizer is able to deliver rows in group by order so
        ** we do not have to sort.  The OP_OpenEphemeral table will be
        ** cancelled later because we still need to use the pKeyInfo
@ -4680,8 +4685,8 @@ int sqlite3Select(
        }
        updateAccumulator(pParse, &sAggInfo);
        assert( pMinMax==0 || pMinMax->nExpr==1 );
-        if( pWInfo->nOBSat>0 ){
+        if( sqlite3WhereIsOrdered(pWInfo) ){
-          sqlite3VdbeAddOp2(v, OP_Goto, 0, pWInfo->iBreak);
+          sqlite3VdbeAddOp2(v, OP_Goto, 0, sqlite3WhereBreakLabel(pWInfo));
          VdbeComment((v, "%s() by index",
                (flag==WHERE_ORDERBY_MIN?"min":"max")));
        }
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@ -395,6 +395,12 @@
 #define offsetof(STRUCTURE,FIELD) ((int)((char*)&((STRUCTURE*)0)->FIELD))
 #endif
 /*
 ** Macros to compute minimum and maximum of two numbers.
 */
 #define MIN(A,B) ((A)<(B)?(A):(B))
 #define MAX(A,B) ((A)>(B)?(A):(B))
 /*
 ** Check to see if this machine uses EBCDIC.  (Yes, believe it or
 ** not, there are still machines out there that use EBCDIC.)
@ -720,9 +726,7 @@ typedef struct UnpackedRecord UnpackedRecord;
 typedef struct VTable VTable;
 typedef struct VtabCtx VtabCtx;
 typedef struct Walker Walker;
 typedef struct WherePlan WherePlan;
 typedef struct WhereInfo WhereInfo;
 typedef struct WhereLevel WhereLevel;
 /*
 ** Defer sourcing vdbe.h and btree.h until after the "u8" and 
@ -1545,6 +1549,7 @@ struct Index {
  u8 onError;              /* OE_Abort, OE_Ignore, OE_Replace, or OE_None */
  unsigned autoIndex:2;    /* 1==UNIQUE, 2==PRIMARY KEY, 0==CREATE INDEX */
  unsigned bUnordered:1;   /* Use this index for == or IN queries only */
  unsigned uniqNotNull:1;  /* True if UNIQUE and NOT NULL for all columns */
 #ifdef SQLITE_ENABLE_STAT3
  int nSample;             /* Number of elements in aSample[] */
  tRowcnt avgEq;           /* Average nEq value for key values not in aSample */
@ -1890,6 +1895,11 @@ typedef u64 Bitmask;
 */
 #define BMS  ((int)(sizeof(Bitmask)*8))
 /*
 ** A bit in a Bitmask
 */
 #define MASKBIT(n)   (((Bitmask)1)<<(n))
 /*
 ** The following structure describes the FROM clause of a SELECT statement.
 ** Each table or subquery in the FROM clause is a separate element of
@ -1910,8 +1920,8 @@ typedef u64 Bitmask;
 ** contains more than 63 columns and the 64-th or later column is used.
 */
 struct SrcList {
-  i16 nSrc;        /* Number of tables or subqueries in the FROM clause */
+  u8 nSrc;        /* Number of tables or subqueries in the FROM clause */
-  i16 nAlloc;      /* Number of entries allocated in a[] below */
+  u8 nAlloc;      /* Number of entries allocated in a[] below */
  struct SrcList_item {
    Schema *pSchema;  /* Schema to which this item is fixed */
    char *zDatabase;  /* Name of database holding this table */
@ -1949,79 +1959,6 @@ struct SrcList {
 #define JT_ERROR     0x0040    /* unknown or unsupported join type */
 /*
 ** A WherePlan object holds information that describes a lookup
 ** strategy.
 **
 ** This object is intended to be opaque outside of the where.c module.
 ** It is included here only so that that compiler will know how big it
 ** is.  None of the fields in this object should be used outside of
 ** the where.c module.
 **
 ** Within the union, pIdx is only used when wsFlags&WHERE_INDEXED is true.
 ** pTerm is only used when wsFlags&WHERE_MULTI_OR is true.  And pVtabIdx
 ** is only used when wsFlags&WHERE_VIRTUALTABLE is true.  It is never the
 ** case that more than one of these conditions is true.
 */
 struct WherePlan {
  u32 wsFlags;                   /* WHERE_* flags that describe the strategy */
  u16 nEq;                       /* Number of == constraints */
  u16 nOBSat;                    /* Number of ORDER BY terms satisfied */
  double nRow;                   /* Estimated number of rows (for EQP) */
  union {
    Index *pIdx;                   /* Index when WHERE_INDEXED is true */
    struct WhereTerm *pTerm;       /* WHERE clause term for OR-search */
    sqlite3_index_info *pVtabIdx;  /* Virtual table index to use */
  } u;
 };
 /*
 ** For each nested loop in a WHERE clause implementation, the WhereInfo
 ** structure contains a single instance of this structure.  This structure
 ** is intended to be private to the where.c module and should not be
 ** access or modified by other modules.
 **
 ** The pIdxInfo field is used to help pick the best index on a
 ** virtual table.  The pIdxInfo pointer contains indexing
 ** information for the i-th table in the FROM clause before reordering.
 ** All the pIdxInfo pointers are freed by whereInfoFree() in where.c.
 ** All other information in the i-th WhereLevel object for the i-th table
 ** after FROM clause ordering.
 */
 struct WhereLevel {
  WherePlan plan;       /* query plan for this element of the FROM clause */
  int iLeftJoin;        /* Memory cell used to implement LEFT OUTER JOIN */
  int iTabCur;          /* The VDBE cursor used to access the table */
  int iIdxCur;          /* The VDBE cursor used to access pIdx */
  int addrBrk;          /* Jump here to break out of the loop */
  int addrNxt;          /* Jump here to start the next IN combination */
  int addrCont;         /* Jump here to continue with the next loop cycle */
  int addrFirst;        /* First instruction of interior of the loop */
  u8 iFrom;             /* Which entry in the FROM clause */
  u8 op, p5;            /* Opcode and P5 of the opcode that ends the loop */
  int p1, p2;           /* Operands of the opcode used to ends the loop */
  union {               /* Information that depends on plan.wsFlags */
    struct {
      int nIn;              /* Number of entries in aInLoop[] */
      struct InLoop {
        int iCur;              /* The VDBE cursor used by this IN operator */
        int addrInTop;         /* Top of the IN loop */
        u8 eEndLoopOp;         /* IN Loop terminator. OP_Next or OP_Prev */
      } *aInLoop;           /* Information about each nested IN operator */
    } in;                 /* Used when plan.wsFlags&WHERE_IN_ABLE */
    Index *pCovidx;       /* Possible covering index for WHERE_MULTI_OR */
  } u;
  double rOptCost;      /* "Optimal" cost for this level */
  /* The following field is really not part of the current level.  But
  ** we need a place to cache virtual table index information for each
  ** virtual table in the FROM clause and the WhereLevel structure is
  ** a convenient place since there is one WhereLevel for each FROM clause
  ** element.
  */
  sqlite3_index_info *pIdxInfo;  /* Index info for n-th source table */
 };
 /*
 ** Flags appropriate for the wctrlFlags parameter of sqlite3WhereBegin()
 ** and the WhereInfo.wctrlFlags member.
@ -2035,33 +1972,11 @@ struct WhereLevel {
 #define WHERE_FORCE_TABLE      0x0020 /* Do not use an index-only search */
 #define WHERE_ONETABLE_ONLY    0x0040 /* Only code the 1st table in pTabList */
 #define WHERE_AND_ONLY         0x0080 /* Don't use indices for OR terms */
 #define WHERE_GROUPBY          0x0100 /* pOrderBy is really a GROUP BY */
 #define WHERE_DISTINCTBY       0x0200 /* pOrderby is really a DISTINCT clause */
-/*
+/* Allowed return values from sqlite3WhereIsDistinct()
 ** The WHERE clause processing routine has two halves.  The
 ** first part does the start of the WHERE loop and the second
 ** half does the tail of the WHERE loop.  An instance of
 ** this structure is returned by the first half and passed
 ** into the second half to give some continuity.
 */
 struct WhereInfo {
  Parse *pParse;            /* Parsing and code generating context */
  SrcList *pTabList;        /* List of tables in the join */
  u16 nOBSat;               /* Number of ORDER BY terms satisfied by indices */
  u16 wctrlFlags;           /* Flags originally passed to sqlite3WhereBegin() */
  u8 okOnePass;             /* Ok to use one-pass algorithm for UPDATE/DELETE */
  u8 untestedTerms;         /* Not all WHERE terms resolved by outer loop */
  u8 eDistinct;             /* One of the WHERE_DISTINCT_* values below */
  int iTop;                 /* The very beginning of the WHERE loop */
  int iContinue;            /* Jump here to continue with next record */
  int iBreak;               /* Jump here to break out of the loop */
  int nLevel;               /* Number of nested loop */
  struct WhereClause *pWC;  /* Decomposition of the WHERE clause */
  double savedNQueryLoop;   /* pParse->nQueryLoop outside the WHERE loop */
  double nRowOut;           /* Estimated number of output rows */
  WhereLevel a[1];          /* Information about each nest loop in WHERE */
 };
 /* Allowed values for WhereInfo.eDistinct and DistinctCtx.eTnctType */
 #define WHERE_DISTINCT_NOOP      0  /* DISTINCT keyword not used */
 #define WHERE_DISTINCT_UNIQUE    1  /* No duplicates */
 #define WHERE_DISTINCT_ORDERED   2  /* All duplicates are adjacent */
@ -2135,7 +2050,7 @@ struct Select {
  u16 selFlags;          /* Various SF_* values */
  int iLimit, iOffset;   /* Memory registers holding LIMIT & OFFSET counters */
  int addrOpenEphm[3];   /* OP_OpenEphem opcodes related to this select */
-  double nSelectRow;     /* Estimated number of result rows */
+  u64 nSelectRow;        /* Estimated number of result rows */
  SrcList *pSrc;         /* The FROM clause */
  Expr *pWhere;          /* The WHERE clause */
  ExprList *pGroupBy;    /* The GROUP BY clause */
@ -2319,7 +2234,7 @@ struct Parse {
  /* Information used while coding trigger programs. */
  Parse *pToplevel;    /* Parse structure for main program (or NULL) */
  Table *pTriggerTab;  /* Table triggers are being coded for */
-  double nQueryLoop;   /* Estimated number of iterations of a query */
+  u32 nQueryLoop;      /* Est number of iterations of a query (10*log2(N)) */
  u32 oldmask;         /* Mask of old.* columns referenced */
  u32 newmask;         /* Mask of new.* columns referenced */
  u8 eTriggerOp;       /* TK_UPDATE, TK_INSERT or TK_DELETE */
@ -2889,6 +2804,12 @@ void sqlite3DeleteFrom(Parse*, SrcList*, Expr*);
 void sqlite3Update(Parse*, SrcList*, ExprList*, Expr*, int);
 WhereInfo *sqlite3WhereBegin(Parse*,SrcList*,Expr*,ExprList*,ExprList*,u16,int);
 void sqlite3WhereEnd(WhereInfo*);
 u64 sqlite3WhereOutputRowCount(WhereInfo*);
 int sqlite3WhereIsDistinct(WhereInfo*);
 int sqlite3WhereIsOrdered(WhereInfo*);
 int sqlite3WhereContinueLabel(WhereInfo*);
 int sqlite3WhereBreakLabel(WhereInfo*);
 int sqlite3WhereOkOnePass(WhereInfo*);
 int sqlite3ExprCodeGetColumn(Parse*, Table*, int, int, int, u8);
 void sqlite3ExprCodeGetColumnOfTable(Vdbe*, Table*, int, int, int);
 void sqlite3ExprCodeMove(Parse*, int, int, int);
--- a/src/test1.c
+++ b/src/test1.c
@ -6302,8 +6302,6 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
  extern int sqlite3WalTrace;
 #endif
 #ifdef SQLITE_TEST
  extern char sqlite3_query_plan[];
  static char *query_plan = sqlite3_query_plan;
 #ifdef SQLITE_ENABLE_FTS3
  extern int sqlite3_fts3_enable_parentheses;
 #endif
@ -6357,8 +6355,11 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
      (char*)&sqlite3_os_type, TCL_LINK_INT);
 #endif
 #ifdef SQLITE_TEST
-  Tcl_LinkVar(interp, "sqlite_query_plan",
+  {
-      (char*)&query_plan, TCL_LINK_STRING|TCL_LINK_READ_ONLY);
+    static const char *query_plan = "*** OBSOLETE VARIABLE ***";
    Tcl_LinkVar(interp, "sqlite_query_plan",
       (char*)&query_plan, TCL_LINK_STRING|TCL_LINK_READ_ONLY);
  }
 #endif
 #ifdef SQLITE_DEBUG
  Tcl_LinkVar(interp, "sqlite_where_trace",
--- a/src/update.c
+++ b/src/update.c
@ -318,7 +318,7 @@ void sqlite3Update(
      pParse, pTabList, pWhere, 0, 0, WHERE_ONEPASS_DESIRED, 0
  );
  if( pWInfo==0 ) goto update_cleanup;
-  okOnePass = pWInfo->okOnePass;
+  okOnePass = sqlite3WhereOkOnePass(pWInfo);
  /* Remember the rowid of every item to be updated.
  */
--- a/src/where.c
+++ b/src/where.c
--- a/test/all.test
+++ b/test/all.test
@ -48,5 +48,3 @@ if {$::tcl_platform(platform)=="unix"} {
 }
 finish_test
--- a/test/analyze3.test
+++ b/test/analyze3.test
@ -97,10 +97,10 @@ do_test analyze3-1.1.1 {
 do_eqp_test analyze3-1.1.2 {
  SELECT sum(y) FROM t1 WHERE x>200 AND x<300
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (x>? AND x<?) (~179 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (x>? AND x<?)}}
 do_eqp_test analyze3-1.1.3 {
  SELECT sum(y) FROM t1 WHERE x>0 AND x<1100 
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (x>? AND x<?) (~959 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (x>? AND x<?)}}
 do_test analyze3-1.1.4 {
  sf_execsql { SELECT sum(y) FROM t1 WHERE x>200 AND x<300 }
@ -146,10 +146,10 @@ do_test analyze3-1.2.1 {
 } {}
 do_eqp_test analyze3-1.2.2 {
  SELECT sum(y) FROM t2 WHERE x>1 AND x<2
-} {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?) (~196 rows)}}
+} {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?)}}
 do_eqp_test analyze3-1.2.3 {
  SELECT sum(y) FROM t2 WHERE x>0 AND x<99
-} {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?) (~968 rows)}}
+} {0 0 0 {SEARCH TABLE t2 USING INDEX i2 (x>? AND x<?)}}
 do_test analyze3-1.2.4 {
  sf_execsql { SELECT sum(y) FROM t2 WHERE x>12 AND x<20 }
 } {161 0 4760}
@ -193,10 +193,10 @@ do_test analyze3-1.3.1 {
 } {}
 do_eqp_test analyze3-1.3.2 {
  SELECT sum(y) FROM t3 WHERE x>200 AND x<300
-} {0 0 0 {SEARCH TABLE t3 USING INDEX i3 (x>? AND x<?) (~156 rows)}}
+} {0 0 0 {SEARCH TABLE t3 USING INDEX i3 (x>? AND x<?)}}
 do_eqp_test analyze3-1.3.3 {
  SELECT sum(y) FROM t3 WHERE x>0 AND x<1100
-} {0 0 0 {SEARCH TABLE t3 USING INDEX i3 (x>? AND x<?) (~989 rows)}}
+} {0 0 0 {SEARCH TABLE t3 USING INDEX i3 (x>? AND x<?)}}
 do_test analyze3-1.3.4 {
  sf_execsql { SELECT sum(y) FROM t3 WHERE x>200 AND x<300 }
@ -248,10 +248,10 @@ do_test analyze3-2.1 {
 } {}
 do_eqp_test analyze3-2.2 {
  SELECT count(a) FROM t1 WHERE b LIKE 'a%'
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (b>? AND b<?) (~31250 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (b>? AND b<?)}}
 do_eqp_test analyze3-2.3 {
  SELECT count(a) FROM t1 WHERE b LIKE '%a'
-} {0 0 0 {SCAN TABLE t1 (~500000 rows)}}
+} {0 0 0 {SCAN TABLE t1}}
 do_test analyze3-2.4 {
  sf_execsql { SELECT count(*) FROM t1 WHERE b LIKE 'a%' }
@ -330,7 +330,7 @@ do_test analyze3-3.2.5 {
 do_test analyze3-3.2.6 {
  sqlite3_bind_text $S 1 "abc" 3
  sqlite3_expired $S
-} {0}
+} {1}
 do_test analyze3-3.2.7 {
  sqlite3_finalize $S
 } {SQLITE_OK}
--- a/test/analyze4.test
+++ b/test/analyze4.test
@ -38,7 +38,7 @@ do_test analyze4-1.0 {
  # Should choose the t1a index since it is more specific than t1b.
  db eval {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=5 AND b IS NULL}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 # Verify that the t1b index shows that it does not narrow down the
 # search any at all.
--- a/test/analyze5.test
+++ b/test/analyze5.test
@ -156,13 +156,14 @@ foreach {testid where index rows} {
 } {
  # Verify that the expected index is used with the expected row count
-  do_test analyze5-1.${testid}a {
+  # No longer valid due to an EXPLAIN QUERY PLAN output format change
-    set x [lindex [eqp "SELECT * FROM t1 WHERE $where"] 3]
+  # do_test analyze5-1.${testid}a {
-    set idx {}
+  #   set x [lindex [eqp "SELECT * FROM t1 WHERE $where"] 3]
-    regexp {INDEX (t1.) } $x all idx
+  #   set idx {}
-    regexp {~([0-9]+) rows} $x all nrow
+  #   regexp {INDEX (t1.) } $x all idx
-    list $idx $nrow
+  #   regexp {~([0-9]+) rows} $x all nrow
-  } [list $index $rows]
+  #   list $idx $nrow
  # } [list $index $rows]
  # Verify that the same result is achieved regardless of whether or not
  # the index is used
@ -202,15 +203,14 @@ foreach {testid where index rows} {
 } {
  # Verify that the expected index is used with the expected row count
-if {$testid==50299} {breakpoint; set sqlite_where_trace 1}
+  # No longer valid due to an EXPLAIN QUERY PLAN format change
-  do_test analyze5-1.${testid}a {
+  # do_test analyze5-1.${testid}a {
-    set x [lindex [eqp "SELECT * FROM t1 WHERE $where"] 3]
+  #   set x [lindex [eqp "SELECT * FROM t1 WHERE $where"] 3]
-    set idx {}
+  #   set idx {}
-    regexp {INDEX (t1.) } $x all idx
+  #   regexp {INDEX (t1.) } $x all idx
-    regexp {~([0-9]+) rows} $x all nrow
+  #   regexp {~([0-9]+) rows} $x all nrow
-    list $idx $nrow
+  #   list $idx $nrow
-  } [list $index $rows]
+  # } [list $index $rows]
 if {$testid==50299} exit
  # Verify that the same result is achieved regardless of whether or not
  # the index is used
--- a/test/analyze6.test
+++ b/test/analyze6.test
@ -61,14 +61,14 @@ do_test analyze6-1.0 {
 #
 do_test analyze6-1.1 {
  eqp {SELECT count(*) FROM ev, cat WHERE x=y}
-} {0 0 1 {SCAN TABLE cat USING COVERING INDEX catx (~16 rows)} 0 1 0 {SEARCH TABLE ev USING COVERING INDEX evy (y=?) (~32 rows)}}
+} {0 0 1 {SCAN TABLE cat USING COVERING INDEX catx} 0 1 0 {SEARCH TABLE ev USING COVERING INDEX evy (y=?)}}
 # The same plan is chosen regardless of the order of the tables in the
 # FROM clause.
 #
 do_test analyze6-1.2 {
  eqp {SELECT count(*) FROM cat, ev WHERE x=y}
-} {0 0 0 {SCAN TABLE cat USING COVERING INDEX catx (~16 rows)} 0 1 1 {SEARCH TABLE ev USING COVERING INDEX evy (y=?) (~32 rows)}}
+} {0 0 0 {SCAN TABLE cat USING COVERING INDEX catx} 0 1 1 {SEARCH TABLE ev USING COVERING INDEX evy (y=?)}}
 # Ticket [83ea97620bd3101645138b7b0e71c12c5498fe3d] 2011-03-30
@ -82,26 +82,26 @@ do_test analyze6-2.1 {
    ANALYZE;
  }
  eqp {SELECT * FROM t201 WHERE z=5}
-} {0 0 0 {SEARCH TABLE t201 USING INDEX t201z (z=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INDEX t201z (z=?)}}
 do_test analyze6-2.2 {
  eqp {SELECT * FROM t201 WHERE y=5}
-} {0 0 0 {SEARCH TABLE t201 USING INDEX sqlite_autoindex_t201_1 (y=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INDEX sqlite_autoindex_t201_1 (y=?)}}
 do_test analyze6-2.3 {
  eqp {SELECT * FROM t201 WHERE x=5}
-} {0 0 0 {SEARCH TABLE t201 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INTEGER PRIMARY KEY (rowid=?)}}
 do_test analyze6-2.4 {
  execsql {
    INSERT INTO t201 VALUES(1,2,3);
    ANALYZE t201;
  }
  eqp {SELECT * FROM t201 WHERE z=5}
-} {0 0 0 {SEARCH TABLE t201 USING INDEX t201z (z=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INDEX t201z (z=?)}}
 do_test analyze6-2.5 {
  eqp {SELECT * FROM t201 WHERE y=5}
-} {0 0 0 {SEARCH TABLE t201 USING INDEX sqlite_autoindex_t201_1 (y=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INDEX sqlite_autoindex_t201_1 (y=?)}}
 do_test analyze6-2.6 {
  eqp {SELECT * FROM t201 WHERE x=5}
-} {0 0 0 {SEARCH TABLE t201 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INTEGER PRIMARY KEY (rowid=?)}}
 do_test analyze6-2.7 {
  execsql {
    INSERT INTO t201 VALUES(4,5,7);
@ -111,12 +111,12 @@ do_test analyze6-2.7 {
    ANALYZE t201;
  }
  eqp {SELECT * FROM t201 WHERE z=5}
-} {0 0 0 {SEARCH TABLE t201 USING INDEX t201z (z=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INDEX t201z (z=?)}}
 do_test analyze6-2.8 {
  eqp {SELECT * FROM t201 WHERE y=5}
-} {0 0 0 {SEARCH TABLE t201 USING INDEX sqlite_autoindex_t201_1 (y=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INDEX sqlite_autoindex_t201_1 (y=?)}}
 do_test analyze6-2.9 {
  eqp {SELECT * FROM t201 WHERE x=5}
-} {0 0 0 {SEARCH TABLE t201 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t201 USING INTEGER PRIMARY KEY (rowid=?)}}
 finish_test
--- a/test/analyze7.test
+++ b/test/analyze7.test
@ -37,13 +37,13 @@ do_test analyze7-1.0 {
                    WHERE value BETWEEN 1 AND 256;
    EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;
  }
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test analyze7-1.1 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b=123;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?)}}
 do_test analyze7-1.2 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?)}}
 # Run an analyze on one of the three indices.  Verify that this
 # effects the row-count estimate on the one query that uses that
@ -53,20 +53,20 @@ do_test analyze7-2.0 {
  execsql {ANALYZE t1a;}
  db cache flush
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test analyze7-2.1 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b=123;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?)}}
 do_test analyze7-2.2 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?)}}
 # Verify that since the query planner now things that t1a is more
 # selective than t1b, it prefers to use t1a.
 #
 do_test analyze7-2.3 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123 AND b=123}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 # Run an analysis on another of the three indices.  Verify  that this
 # new analysis works and does not disrupt the previous analysis.
@ -75,39 +75,39 @@ do_test analyze7-3.0 {
  execsql {ANALYZE t1cd;}
  db cache flush;
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test analyze7-3.1 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b=123;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?)}}
 do_test analyze7-3.2.1 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=?;}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~86 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?)}}
 ifcapable stat3 {
  # If ENABLE_STAT3 is defined, SQLite comes up with a different estimated
  # row count for (c=2) than it does for (c=?).
  do_test analyze7-3.2.2 {
    execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;}
-  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~57 rows)}}
+  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?)}}
 } else {
  # If ENABLE_STAT3 is not defined, the expected row count for (c=2) is the
  # same as that for (c=?).
  do_test analyze7-3.2.3 {
    execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2;}
-  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?) (~86 rows)}}
+  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=?)}}
 }
 do_test analyze7-3.3 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123 AND b=123}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 ifcapable {!stat3} {
  do_test analyze7-3.4 {
    execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=123 AND b=123}
-  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~2 rows)}}
+  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?)}}
  do_test analyze7-3.5 {
    execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123 AND c=123}
-  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+  } {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 }
 do_test analyze7-3.6 {
  execsql {EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=123 AND d=123 AND b=123}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=? AND d=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1cd (c=? AND d=?)}}
 finish_test
--- a/test/analyze8.test
+++ b/test/analyze8.test
@ -61,25 +61,25 @@ do_test 1.0 {
 #
 do_test 1.1 {
  eqp {SELECT * FROM t1 WHERE a=100 AND b=55}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?)}}
 do_test 1.2 {
  eqp {SELECT * FROM t1 WHERE a=99 AND b=55}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test 1.3 {
  eqp {SELECT * FROM t1 WHERE a=101 AND b=55}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test 1.4 {
  eqp {SELECT * FROM t1 WHERE a=100 AND b=56}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b=?)}}
 do_test 1.5 {
  eqp {SELECT * FROM t1 WHERE a=99 AND b=56}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test 1.6 {
  eqp {SELECT * FROM t1 WHERE a=101 AND b=56}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test 2.1 {
  eqp {SELECT * FROM t1 WHERE a=100 AND b BETWEEN 50 AND 54}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b>? AND b<?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b>? AND b<?)}}
 # There are many more values of c between 0 and 100000 than there are
 # between 800000 and 900000.  So t1c is more selective for the latter
@ -87,17 +87,17 @@ do_test 2.1 {
 #
 do_test 3.1 {
  eqp {SELECT * FROM t1 WHERE b BETWEEN 50 AND 54 AND c BETWEEN 0 AND 100000}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b>? AND b<?) (~6 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1b (b>? AND b<?)}}
 do_test 3.2 {
  eqp {SELECT * FROM t1
       WHERE b BETWEEN 50 AND 54 AND c BETWEEN 800000 AND 900000}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1c (c>? AND c<?) (~4 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1c (c>? AND c<?)}}
 do_test 3.3 {
  eqp {SELECT * FROM t1 WHERE a=100 AND c BETWEEN 0 AND 100000}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?) (~63 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1a (a=?)}}
 do_test 3.4 {
  eqp {SELECT * FROM t1
       WHERE a=100 AND c BETWEEN 800000 AND 900000}
-} {0 0 0 {SEARCH TABLE t1 USING INDEX t1c (c>? AND c<?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX t1c (c>? AND c<?)}}
 finish_test
--- a/test/async5.test
+++ b/test/async5.test
@ -66,4 +66,3 @@ sqlite3async_control halt never
 sqlite3async_shutdown
 set sqlite3async_trace 0
 finish_test
--- a/test/autoindex1.test
+++ b/test/autoindex1.test
@ -78,6 +78,9 @@ do_test autoindex1-202 {
 do_test autoindex1-210 {
  db eval {
    PRAGMA automatic_index=ON;
    ANALYZE;
    UPDATE sqlite_stat1 SET stat='10000' WHERE tbl='t1';
    ANALYZE sqlite_master;
    SELECT b, (SELECT d FROM t2 WHERE c=a) FROM t1;
  }
 } {11 911 22 922 33 933 44 944 55 955 66 966 77 977 88 988}
@ -143,22 +146,25 @@ do_test autoindex1-401 {
 do_execsql_test autoindex1-500 {
  CREATE TABLE t501(a INTEGER PRIMARY KEY, b);
  CREATE TABLE t502(x INTEGER PRIMARY KEY, y);
  INSERT INTO sqlite_stat1(tbl,idx,stat) VALUES('t501',null,'1000000');
  INSERT INTO sqlite_stat1(tbl,idx,stat) VALUES('t502',null,'1000');
  ANALYZE sqlite_master;
  EXPLAIN QUERY PLAN
  SELECT b FROM t501
   WHERE t501.a IN (SELECT x FROM t502 WHERE y=?);
 } {
-  0 0 0 {SEARCH TABLE t501 USING INTEGER PRIMARY KEY (rowid=?) (~25 rows)} 
+  0 0 0 {SEARCH TABLE t501 USING INTEGER PRIMARY KEY (rowid=?)} 
  0 0 0 {EXECUTE LIST SUBQUERY 1} 
-  1 0 0 {SCAN TABLE t502 (~100000 rows)}
+  1 0 0 {SCAN TABLE t502}
 }
 do_execsql_test autoindex1-501 {
  EXPLAIN QUERY PLAN
  SELECT b FROM t501
   WHERE t501.a IN (SELECT x FROM t502 WHERE y=t501.b);
 } {
-  0 0 0 {SCAN TABLE t501 (~500000 rows)} 
+  0 0 0 {SCAN TABLE t501} 
  0 0 0 {EXECUTE CORRELATED LIST SUBQUERY 1} 
-  1 0 0 {SEARCH TABLE t502 USING AUTOMATIC COVERING INDEX (y=?) (~7 rows)}
+  1 0 0 {SEARCH TABLE t502 USING AUTOMATIC COVERING INDEX (y=?)}
 }
 do_execsql_test autoindex1-502 {
  EXPLAIN QUERY PLAN
@ -166,9 +172,9 @@ do_execsql_test autoindex1-502 {
   WHERE t501.a=123
     AND t501.a IN (SELECT x FROM t502 WHERE y=t501.b);
 } {
-  0 0 0 {SEARCH TABLE t501 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)} 
+  0 0 0 {SEARCH TABLE t501 USING INTEGER PRIMARY KEY (rowid=?)} 
  0 0 0 {EXECUTE CORRELATED LIST SUBQUERY 1} 
-  1 0 0 {SCAN TABLE t502 (~100000 rows)}
+  1 0 0 {SCAN TABLE t502}
 }
@ -240,12 +246,12 @@ do_execsql_test autoindex1-600 {
   WHERE y.sheep_no IS NULL
   ORDER BY x.registering_flock;
 } {
-  1 0 0 {SCAN TABLE sheep AS s (~1000000 rows)} 
+  1 0 0 {SCAN TABLE sheep AS s} 
-  1 1 1 {SEARCH TABLE flock_owner AS prev USING INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date<?) (~2 rows)} 
+  1 1 1 {SEARCH TABLE flock_owner AS prev USING INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date<?)} 
  1 0 0 {EXECUTE CORRELATED SCALAR SUBQUERY 2} 
-  2 0 0 {SEARCH TABLE flock_owner AS later USING COVERING INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date>? AND owner_change_date<?) (~1 rows)} 
+  2 0 0 {SEARCH TABLE flock_owner AS later USING COVERING INDEX sqlite_autoindex_flock_owner_1 (flock_no=? AND owner_change_date>? AND owner_change_date<?)} 
-  0 0 0 {SCAN TABLE sheep AS x USING INDEX sheep_reg_flock_index (~1000000 rows)} 
+  0 0 0 {SCAN TABLE sheep AS x USING INDEX sheep_reg_flock_index} 
-  0 1 1 {SEARCH SUBQUERY 1 AS y USING AUTOMATIC COVERING INDEX (sheep_no=?) (~8 rows)}
+  0 1 1 {SEARCH SUBQUERY 1 AS y USING AUTOMATIC COVERING INDEX (sheep_no=?)}
 }
@ -253,7 +259,7 @@ do_execsql_test autoindex1-700 {
  CREATE TABLE t5(a, b, c);
  EXPLAIN QUERY PLAN SELECT a FROM t5 WHERE b=10 ORDER BY c;
 } {
-  0 0 0 {SCAN TABLE t5 (~100000 rows)} 
+  0 0 0 {SCAN TABLE t5} 
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
--- a/test/backup4.test
+++ b/test/backup4.test
@ -101,4 +101,3 @@ do_test 3.3 {
 do_test 3.4 { file size test.db2 } 0
 finish_test
--- a/test/between.test
+++ b/test/between.test
@ -48,14 +48,24 @@ do_test between-1.0 {
 # This procedure executes the SQL.  Then it appends to the result the
 # "sort" or "nosort" keyword depending on whether or not any sorting
-# is done.  Then it appends the ::sqlite_query_plan variable.
+# is done.  Then it appends the names of the table and index used.
 #
 proc queryplan {sql} {
  set ::sqlite_sort_count 0
  set data [execsql $sql]
  if {$::sqlite_sort_count} {set x sort} {set x nosort}
  lappend data $x
-  return [concat $data $::sqlite_query_plan]
+  set eqp [execsql "EXPLAIN QUERY PLAN $sql"]
  # puts eqp=$eqp
  foreach {a b c x} $eqp {
    if {[regexp { TABLE (\w+ AS )?(\w+) USING.* INDEX (\w+)\y} \
        $x all as tab idx]} {
      lappend data $tab $idx
    } elseif {[regexp { TABLE (\w+ AS )?(\w+)\y} $x all as tab]} {
      lappend data $tab *
    }
  }
  return $data   
 }
 do_test between-1.1.1 {
@ -67,7 +77,7 @@ do_test between-1.1.2 {
  queryplan {
    SELECT * FROM t1 WHERE +w BETWEEN 5 AND 6 ORDER BY +w
  }
-} {5 2 36 38 6 2 49 51 sort t1 {}}
+} {5 2 36 38 6 2 49 51 sort t1 *}
 do_test between-1.2.1 {
  queryplan {
    SELECT * FROM t1 WHERE w BETWEEN 5 AND 65-y ORDER BY +w
@ -77,7 +87,7 @@ do_test between-1.2.2 {
  queryplan {
    SELECT * FROM t1 WHERE +w BETWEEN 5 AND 65-y ORDER BY +w
  }
-} {5 2 36 38 6 2 49 51 sort t1 {}}
+} {5 2 36 38 6 2 49 51 sort t1 *}
 do_test between-1.3.1 {
  queryplan {
    SELECT * FROM t1 WHERE w BETWEEN 41-y AND 6 ORDER BY +w
@ -87,12 +97,12 @@ do_test between-1.3.2 {
  queryplan {
    SELECT * FROM t1 WHERE +w BETWEEN 41-y AND 6 ORDER BY +w
  }
-} {5 2 36 38 6 2 49 51 sort t1 {}}
+} {5 2 36 38 6 2 49 51 sort t1 *}
 do_test between-1.4 {
  queryplan {
    SELECT * FROM t1 WHERE w BETWEEN 41-y AND 65-y ORDER BY +w
  }
-} {5 2 36 38 6 2 49 51 sort t1 {}}
+} {5 2 36 38 6 2 49 51 sort t1 *}
 do_test between-1.5.1 {
  queryplan {
    SELECT * FROM t1 WHERE 26 BETWEEN y AND z ORDER BY +w
@ -107,7 +117,7 @@ do_test between-1.5.3 {
  queryplan {
    SELECT * FROM t1 WHERE 26 BETWEEN y AND +z ORDER BY +w
  }
-} {4 2 25 27 sort t1 {}}
+} {4 2 25 27 sort t1 *}
 finish_test
--- a/test/btreefault.test
+++ b/test/btreefault.test
@ -55,4 +55,3 @@ do_faultsim_test 1 -prep {
 }
 finish_test
--- a/test/capi3e.test
+++ b/test/capi3e.test
@ -60,7 +60,7 @@ proc utf8 {str} {
 db close
 # here's the list of file names we're testing
-set names {t 1 t. 1. t.d 1.d t-1 1-1 t.db ä.db ë.db ö.db ü.db ÿ.db}
+set names {t 1 t. 1. t.d 1.d t-1 1-1 t.db ä.db ë.db ö.db ü.db ÿ.db}
 set i 0
 foreach name $names {
--- a/test/close.test
+++ b/test/close.test
@ -76,4 +76,3 @@ do_test 1.4.4 {
 } {SQLITE_OK}
 finish_test
--- a/test/collate2.test
+++ b/test/collate2.test
@ -636,13 +636,15 @@ do_test collate2-4.2 {
 do_test collate2-4.3 {
  execsql {
    SELECT collate2t1.a FROM collate2t1, collate2t3 
-      WHERE collate2t1.b = collate2t3.b||'';
+      WHERE collate2t1.b = collate2t3.b||''
      ORDER BY +collate2t1.a DESC;
  }
 } {aa aA Aa AA}
 do_test collate2-4.4 {
  execsql {
    SELECT collate2t1.a FROM collate2t1, collate2t3 
-      WHERE collate2t3.b||'' = collate2t1.b;
+      WHERE collate2t3.b||'' = collate2t1.b
      ORDER BY +collate2t1.a DESC;
  }
 } {aa aA Aa AA}
--- a/test/contrib01.test
+++ b/test/contrib01.test
@ -0,0 +1,90 @@
 # 2013-06-05
 #
 # 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.
 #
 # This file contains test cases that were contributed on the sqlite-users
 # mailing list on 2013-06-05 by Mi Chen at mi.chen@echostar.com.
 #
 # At the time it was contributed, this test failed on trunk, but 
 # worked on the NGQP.
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 # Build some test data
 #
 do_test contrib01-1.0 {
  db eval {
    CREATE TABLE T1 (B INTEGER NOT NULL,
                     C INTEGER NOT NULL,
                     D INTEGER NOT NULL,
                     E INTEGER NOT NULL,
                     F INTEGER NOT NULL,
                     G INTEGER NOT NULL,
                     H INTEGER NOT NULL,
                     PRIMARY KEY (B, C, D));
    CREATE TABLE T2 (A INTEGER NOT NULL,
                     B INTEGER NOT NULL,
                     C INTEGER NOT NULL,
                     PRIMARY KEY (A, B, C));
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15527);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15560);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15561);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15563);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15564);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15566);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15567);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15569);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15612);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15613);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15638);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15681);
    INSERT INTO T2(A, B, C) VALUES(702118,16183,15682);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15527,6,0,5,5,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15560,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15561,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15563,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15564,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15566,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15567,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15569,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15612,6,0,5,5,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15613,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15638,6,0,5,2,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15681,6,0,5,5,0);
    INSERT INTO T1(B, C, D, E, F, G, H) VALUES(16183,15682,6,0,5,2,0);
  }
 } {}
 do_test contrib01-1.1 {
  db eval {
    SELECT T2.A, T2.B, T1.D, T1.E, T1.F, T1.G, T1.H, MAX(T1.C), '^'
      FROM T1, T2
     WHERE T1.B = T2.B
       AND T1.C = T2.C
     GROUP BY T2.A, T2.B, T1.D, T1.E, T1.F, T1.G, T1.H
     ORDER BY +max(t1.c);
  }
 } {702118 16183 6 0 5 5 0 15681 ^ 702118 16183 6 0 5 2 0 15682 ^}
 do_test contrib01-1.2 {
  db eval {
   SELECT T2.A, T2.B, T1.D, T1.E, T1.F, T1.G, T1.H, MAX(T1.C), '^'
     FROM T1, T2
    WHERE T1.B = T2.B
      AND T1.C = T2.C
    GROUP BY T2.A, T2.B, T1.F, T1.D, T1.E, T1.G, T1.H
    ORDER BY +max(t1.c);
  }
 } {702118 16183 6 0 5 5 0 15681 ^ 702118 16183 6 0 5 2 0 15682 ^}
 finish_test
--- a/test/corruptF.test
+++ b/test/corruptF.test
@ -147,4 +147,3 @@ for {set i 127} {$i >= 0} {incr i -1} {
 }
 finish_test
--- a/test/descidx1.test
+++ b/test/descidx1.test
@ -197,12 +197,12 @@ ifcapable bloblit {
  } {1.0 2.2 2.0 2.1 2.3 3.0 4.0 5.0 6.0}
  do_test descidx1-4.3 {
    execsql {
-      SELECT d FROM t2 WHERE a>=2;
+      SELECT d FROM t2 WHERE a>=2 ORDER BY a;
    }
  } {2.2 2.0 2.1 2.3 3.0 4.0 5.0 6.0}
  do_test descidx1-4.4 {
    execsql {
-      SELECT d FROM t2 WHERE a>2;
+      SELECT d FROM t2 WHERE a>2 ORDER BY a;
    }
  } {3.0 4.0 5.0 6.0}
  do_test descidx1-4.5 {
--- a/test/distinct.test
+++ b/test/distinct.test
@ -165,7 +165,7 @@ foreach {tn sql temptables res} {
  3   "a, b, c FROM t1"                                    {hash}  {a b c A B C}
  4   "a, b, c FROM t1 ORDER BY a, b, c"                   {btree} {A B C a b c}
  5   "b FROM t1 WHERE a = 'a'"                            {}      {b}
-  6   "b FROM t1"                                          {hash}  {b B}
+  6   "b FROM t1 ORDER BY +b COLLATE binary"          {btree hash} {B b}
  7   "a FROM t1"                                          {}      {A a}
  8   "b COLLATE nocase FROM t1"                           {}      {b}
  9   "b COLLATE nocase FROM t1 ORDER BY b COLLATE nocase" {}      {b}
--- a/test/e_createtable.test
+++ b/test/e_createtable.test
@ -1368,13 +1368,13 @@ do_execsql_test 4.10.0 {
 }
 do_createtable_tests 4.10 {
  1    "EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b = 5" 
-       {0 0 0 {SEARCH TABLE t1 USING INDEX sqlite_autoindex_t1_1 (b=?) (~1 rows)}}
+       {0 0 0 {SEARCH TABLE t1 USING INDEX sqlite_autoindex_t1_1 (b=?)}}
  2    "EXPLAIN QUERY PLAN SELECT * FROM t2 ORDER BY b, c"
-       {0 0 0 {SCAN TABLE t2 USING INDEX sqlite_autoindex_t2_1 (~1000000 rows)}}
+       {0 0 0 {SCAN TABLE t2 USING INDEX sqlite_autoindex_t2_1}}
  3    "EXPLAIN QUERY PLAN SELECT * FROM t2 WHERE b=10 AND c>10"
-       {0 0 0 {SEARCH TABLE t2 USING INDEX sqlite_autoindex_t2_1 (b=? AND c>?) (~2 rows)}}
+       {0 0 0 {SEARCH TABLE t2 USING INDEX sqlite_autoindex_t2_1 (b=? AND c>?)}}
 }
 # EVIDENCE-OF: R-45493-35653 A CHECK constraint may be attached to a
--- a/test/e_fkey.test
+++ b/test/e_fkey.test
@ -974,15 +974,15 @@ do_execsql_test e_fkey-25.2 {
  EXPLAIN QUERY PLAN DELETE FROM artist WHERE 1;
  EXPLAIN QUERY PLAN SELECT rowid FROM track WHERE trackartist = ?;
 } {
-  0 0 0 {SCAN TABLE artist (~1000000 rows)} 
+  0 0 0 {SCAN TABLE artist} 
-  0 0 0 {SCAN TABLE track (~100000 rows)}
+  0 0 0 {SCAN TABLE track}
 }
 do_execsql_test e_fkey-25.3 {
  PRAGMA foreign_keys = ON;
  EXPLAIN QUERY PLAN DELETE FROM artist WHERE 1;
 } {
-  0 0 0 {SCAN TABLE artist (~1000000 rows)} 
+  0 0 0 {SCAN TABLE artist} 
-  0 0 0 {SCAN TABLE track (~100000 rows)}
+  0 0 0 {SCAN TABLE track}
 }
 do_test e_fkey-25.4 {
  execsql {
@ -1099,15 +1099,15 @@ do_test e_fkey-27.2 {
 do_execsql_test e_fkey-27.3 {
  EXPLAIN QUERY PLAN UPDATE artist SET artistid = ?, artistname = ?
 } {
-  0 0 0 {SCAN TABLE artist (~1000000 rows)} 
+  0 0 0 {SCAN TABLE artist} 
-  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?) (~10 rows)} 
+  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?)} 
-  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?)}
 }
 do_execsql_test e_fkey-27.4 {
  EXPLAIN QUERY PLAN DELETE FROM artist
 } {
-  0 0 0 {SCAN TABLE artist (~1000000 rows)} 
+  0 0 0 {SCAN TABLE artist} 
-  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE track USING COVERING INDEX trackindex (trackartist=?)}
 }
--- a/test/eqp.test
+++ b/test/eqp.test
@ -43,37 +43,37 @@ do_execsql_test 1.1 {
 do_eqp_test 1.2 {
  SELECT * FROM t2, t1 WHERE t1.a=1 OR t1.b=2;
 } {
-  0 0 1 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)} 
+  0 0 1 {SEARCH TABLE t1 USING INDEX i1 (a=?)} 
-  0 0 1 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~10 rows)} 
+  0 0 1 {SEARCH TABLE t1 USING INDEX i2 (b=?)} 
-  0 1 0 {SCAN TABLE t2 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t2}
 }
 do_eqp_test 1.3 {
  SELECT * FROM t2 CROSS JOIN t1 WHERE t1.a=1 OR t1.b=2;
 } {
-  0 0 0 {SCAN TABLE t2 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2}
-  0 1 1 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)} 
+  0 1 1 {SEARCH TABLE t1 USING INDEX i1 (a=?)} 
-  0 1 1 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~10 rows)} 
+  0 1 1 {SEARCH TABLE t1 USING INDEX i2 (b=?)} 
 }
 do_eqp_test 1.3 {
  SELECT a FROM t1 ORDER BY a
 } {
-  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1}
 }
 do_eqp_test 1.4 {
  SELECT a FROM t1 ORDER BY +a
 } {
-  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1}
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 do_eqp_test 1.5 {
  SELECT a FROM t1 WHERE a=4
 } {
-  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?)}
 }
 do_eqp_test 1.6 {
  SELECT DISTINCT count(*) FROM t3 GROUP BY a;
 } {
-  0 0 0 {SCAN TABLE t3 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t3}
  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
  0 0 0 {USE TEMP B-TREE FOR DISTINCT}
 }
@ -81,40 +81,40 @@ do_eqp_test 1.6 {
 do_eqp_test 1.7 {
  SELECT * FROM t3 JOIN (SELECT 1)
 } {
-  0 0 1 {SCAN SUBQUERY 1 (~1 rows)}
+  0 0 1 {SCAN SUBQUERY 1}
-  0 1 0 {SCAN TABLE t3 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t3}
 }
 do_eqp_test 1.8 {
  SELECT * FROM t3 JOIN (SELECT 1 UNION SELECT 2)
 } {
  1 0 0 {COMPOUND SUBQUERIES 2 AND 3 USING TEMP B-TREE (UNION)}
-  0 0 1 {SCAN SUBQUERY 1 (~2 rows)}
+  0 0 1 {SCAN SUBQUERY 1}
-  0 1 0 {SCAN TABLE t3 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t3}
 }
 do_eqp_test 1.9 {
  SELECT * FROM t3 JOIN (SELECT 1 EXCEPT SELECT a FROM t3 LIMIT 17)
 } {
-  3 0 0 {SCAN TABLE t3 (~1000000 rows)}
+  3 0 0 {SCAN TABLE t3}
  1 0 0 {COMPOUND SUBQUERIES 2 AND 3 USING TEMP B-TREE (EXCEPT)}
-  0 0 1 {SCAN SUBQUERY 1 (~17 rows)}
+  0 0 1 {SCAN SUBQUERY 1}
-  0 1 0 {SCAN TABLE t3 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t3}
 }
 do_eqp_test 1.10 {
  SELECT * FROM t3 JOIN (SELECT 1 INTERSECT SELECT a FROM t3 LIMIT 17)
 } {
-  3 0 0 {SCAN TABLE t3 (~1000000 rows)}
+  3 0 0 {SCAN TABLE t3}
  1 0 0 {COMPOUND SUBQUERIES 2 AND 3 USING TEMP B-TREE (INTERSECT)}
-  0 0 1 {SCAN SUBQUERY 1 (~1 rows)}
+  0 0 1 {SCAN SUBQUERY 1}
-  0 1 0 {SCAN TABLE t3 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t3}
 }
 do_eqp_test 1.11 {
  SELECT * FROM t3 JOIN (SELECT 1 UNION ALL SELECT a FROM t3 LIMIT 17)
 } {
-  3 0 0 {SCAN TABLE t3 (~1000000 rows)}
+  3 0 0 {SCAN TABLE t3}
  1 0 0 {COMPOUND SUBQUERIES 2 AND 3 (UNION ALL)}
-  0 0 1 {SCAN SUBQUERY 1 (~17 rows)}
+  0 0 1 {SCAN SUBQUERY 1}
-  0 1 0 {SCAN TABLE t3 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t3}
 }
 #-------------------------------------------------------------------------
@ -129,48 +129,48 @@ do_execsql_test 2.1 {
 }
 det 2.2.1 "SELECT DISTINCT min(x), max(x) FROM t1 GROUP BY x ORDER BY 1" {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
  0 0 0 {USE TEMP B-TREE FOR DISTINCT}
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 det 2.2.2 "SELECT DISTINCT min(x), max(x) FROM t2 GROUP BY x ORDER BY 1" {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1}
  0 0 0 {USE TEMP B-TREE FOR DISTINCT}
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 det 2.2.3 "SELECT DISTINCT * FROM t1" {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
  0 0 0 {USE TEMP B-TREE FOR DISTINCT}
 }
 det 2.2.4 "SELECT DISTINCT * FROM t1, t2" {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
-  0 1 1 {SCAN TABLE t2 (~1000000 rows)}
+  0 1 1 {SCAN TABLE t2}
  0 0 0 {USE TEMP B-TREE FOR DISTINCT}
 }
 det 2.2.5 "SELECT DISTINCT * FROM t1, t2 ORDER BY t1.x" {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
-  0 1 1 {SCAN TABLE t2 (~1000000 rows)}
+  0 1 1 {SCAN TABLE t2}
  0 0 0 {USE TEMP B-TREE FOR DISTINCT}
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 det 2.2.6 "SELECT DISTINCT t2.x FROM t1, t2 ORDER BY t2.x" {
-  0 0 1 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)}
+  0 0 1 {SCAN TABLE t2 USING COVERING INDEX t2i1}
-  0 1 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t1}
 }
 det 2.3.1 "SELECT max(x) FROM t2" {
-  0 0 0 {SEARCH TABLE t2 USING COVERING INDEX t2i1 (~1 rows)}
+  0 0 0 {SEARCH TABLE t2 USING COVERING INDEX t2i1}
 }
 det 2.3.2 "SELECT min(x) FROM t2" {
-  0 0 0 {SEARCH TABLE t2 USING COVERING INDEX t2i1 (~1 rows)}
+  0 0 0 {SEARCH TABLE t2 USING COVERING INDEX t2i1}
 }
 det 2.3.3 "SELECT min(x), max(x) FROM t2" {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1}
 }
 det 2.4.1 "SELECT * FROM t1 WHERE rowid=?" {
-  0 0 0 {SEARCH TABLE t1 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 0 0 {SEARCH TABLE t1 USING INTEGER PRIMARY KEY (rowid=?)}
 }
@ -181,39 +181,39 @@ det 2.4.1 "SELECT * FROM t1 WHERE rowid=?" {
 do_eqp_test 3.1.1 {
  SELECT (SELECT x FROM t1 AS sub) FROM t1;
 } {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
  0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-  1 0 0 {SCAN TABLE t1 AS sub (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 AS sub}
 }
 do_eqp_test 3.1.2 {
  SELECT * FROM t1 WHERE (SELECT x FROM t1 AS sub);
 } {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
  0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-  1 0 0 {SCAN TABLE t1 AS sub (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 AS sub}
 }
 do_eqp_test 3.1.3 {
  SELECT * FROM t1 WHERE (SELECT x FROM t1 AS sub ORDER BY y);
 } {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
  0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-  1 0 0 {SCAN TABLE t1 AS sub (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 AS sub}
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 do_eqp_test 3.1.4 {
  SELECT * FROM t1 WHERE (SELECT x FROM t2 ORDER BY x);
 } {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
  0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-  1 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1}
 }
 det 3.2.1 {
  SELECT * FROM (SELECT * FROM t1 ORDER BY x LIMIT 10) ORDER BY y LIMIT 5
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY} 
-  0 0 0 {SCAN SUBQUERY 1 (~10 rows)} 
+  0 0 0 {SCAN SUBQUERY 1} 
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 det 3.2.2 {
@ -222,34 +222,34 @@ det 3.2.2 {
    (SELECT * FROM t2 ORDER BY x LIMIT 10) AS x2
  ORDER BY x2.y LIMIT 5
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY} 
-  2 0 0 {SCAN TABLE t2 USING INDEX t2i1 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2 USING INDEX t2i1} 
-  0 0 0 {SCAN SUBQUERY 1 AS x1 (~10 rows)} 
+  0 0 0 {SCAN SUBQUERY 1 AS x1} 
-  0 1 1 {SCAN SUBQUERY 2 AS x2 (~10 rows)} 
+  0 1 1 {SCAN SUBQUERY 2 AS x2} 
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 det 3.3.1 {
  SELECT * FROM t1 WHERE y IN (SELECT y FROM t2)
 } {
-  0 0 0 {SCAN TABLE t1 (~100000 rows)} 
+  0 0 0 {SCAN TABLE t1} 
  0 0 0 {EXECUTE LIST SUBQUERY 1} 
-  1 0 0 {SCAN TABLE t2 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t2}
 }
 det 3.3.2 {
  SELECT * FROM t1 WHERE y IN (SELECT y FROM t2 WHERE t1.x!=t2.x)
 } {
-  0 0 0 {SCAN TABLE t1 (~500000 rows)} 
+  0 0 0 {SCAN TABLE t1} 
  0 0 0 {EXECUTE CORRELATED LIST SUBQUERY 1} 
-  1 0 0 {SCAN TABLE t2 (~500000 rows)}
+  1 0 0 {SCAN TABLE t2}
 }
 det 3.3.3 {
  SELECT * FROM t1 WHERE EXISTS (SELECT y FROM t2 WHERE t1.x!=t2.x)
 } {
-  0 0 0 {SCAN TABLE t1 (~500000 rows)} 
+  0 0 0 {SCAN TABLE t1} 
  0 0 0 {EXECUTE CORRELATED SCALAR SUBQUERY 1} 
-  1 0 0 {SCAN TABLE t2 (~500000 rows)}
+  1 0 0 {SCAN TABLE t2}
 }
 #-------------------------------------------------------------------------
@ -258,43 +258,43 @@ det 3.3.3 {
 do_eqp_test 4.1.1 {
  SELECT * FROM t1 UNION ALL SELECT * FROM t2
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION ALL)} 
 }
 do_eqp_test 4.1.2 {
  SELECT * FROM t1 UNION ALL SELECT * FROM t2 ORDER BY 2
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION ALL)} 
 }
 do_eqp_test 4.1.3 {
  SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY 2
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION)} 
 }
 do_eqp_test 4.1.4 {
  SELECT * FROM t1 INTERSECT SELECT * FROM t2 ORDER BY 2
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (INTERSECT)} 
 }
 do_eqp_test 4.1.5 {
  SELECT * FROM t1 EXCEPT SELECT * FROM t2 ORDER BY 2
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)} 
 }
@ -302,35 +302,35 @@ do_eqp_test 4.1.5 {
 do_eqp_test 4.2.2 {
  SELECT * FROM t1 UNION ALL SELECT * FROM t2 ORDER BY 1
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 USING INDEX t2i1 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2 USING INDEX t2i1} 
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION ALL)} 
 }
 do_eqp_test 4.2.3 {
  SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY 1
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (UNION)} 
 }
 do_eqp_test 4.2.4 {
  SELECT * FROM t1 INTERSECT SELECT * FROM t2 ORDER BY 1
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (INTERSECT)} 
 }
 do_eqp_test 4.2.5 {
  SELECT * FROM t1 EXCEPT SELECT * FROM t2 ORDER BY 1
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
  1 0 0 {USE TEMP B-TREE FOR ORDER BY}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)} 
 }
@ -338,28 +338,28 @@ do_eqp_test 4.2.5 {
 do_eqp_test 4.3.1 {
  SELECT x FROM t1 UNION SELECT x FROM t2
 } {
-  1 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  1 0 0 {SCAN TABLE t1} 
-  2 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1} 
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 USING TEMP B-TREE (UNION)} 
 }
 do_eqp_test 4.3.2 {
  SELECT x FROM t1 UNION SELECT x FROM t2 UNION SELECT x FROM t1
 } {
-  2 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t1} 
-  3 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)} 
+  3 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1} 
  1 0 0 {COMPOUND SUBQUERIES 2 AND 3 USING TEMP B-TREE (UNION)}
-  4 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  4 0 0 {SCAN TABLE t1} 
  0 0 0 {COMPOUND SUBQUERIES 1 AND 4 USING TEMP B-TREE (UNION)}
 }
 do_eqp_test 4.3.3 {
  SELECT x FROM t1 UNION SELECT x FROM t2 UNION SELECT x FROM t1 ORDER BY 1
 } {
-  2 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  2 0 0 {SCAN TABLE t1} 
  2 0 0 {USE TEMP B-TREE FOR ORDER BY} 
-  3 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1 (~1000000 rows)} 
+  3 0 0 {SCAN TABLE t2 USING COVERING INDEX t2i1} 
  1 0 0 {COMPOUND SUBQUERIES 2 AND 3 (UNION)} 
-  4 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  4 0 0 {SCAN TABLE t1} 
  4 0 0 {USE TEMP B-TREE FOR ORDER BY} 
  0 0 0 {COMPOUND SUBQUERIES 1 AND 4 (UNION)}
 }
@ -371,127 +371,127 @@ do_eqp_test 4.3.3 {
 drop_all_tables
 # EVIDENCE-OF: R-64208-08323 sqlite> EXPLAIN QUERY PLAN SELECT a, b
-# FROM t1 WHERE a=1; 0|0|0|SCAN TABLE t1 (~100000 rows)
+# FROM t1 WHERE a=1; 0|0|0|SCAN TABLE t1
 do_execsql_test 5.1.0 { CREATE TABLE t1(a, b) }
 det 5.1.1 "SELECT a, b FROM t1 WHERE a=1" {
-  0 0 0 {SCAN TABLE t1 (~100000 rows)}
+  0 0 0 {SCAN TABLE t1}
 }
 # EVIDENCE-OF: R-09022-44606 sqlite> CREATE INDEX i1 ON t1(a);
 # sqlite> EXPLAIN QUERY PLAN SELECT a, b FROM t1 WHERE a=1;
-# 0|0|0|SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING INDEX i1 (a=?)
 do_execsql_test 5.2.0 { CREATE INDEX i1 ON t1(a) }
 det 5.2.1 "SELECT a, b FROM t1 WHERE a=1" {
-  0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}
 }
 # EVIDENCE-OF: R-62228-34103 sqlite> CREATE INDEX i2 ON t1(a, b);
 # sqlite> EXPLAIN QUERY PLAN SELECT a, b FROM t1 WHERE a=1;
-# 0|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?)
 do_execsql_test 5.3.0 { CREATE INDEX i2 ON t1(a, b) }
 det 5.3.1 "SELECT a, b FROM t1 WHERE a=1" {
-  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?)}
 }
 # EVIDENCE-OF: R-22253-05302 sqlite> EXPLAIN QUERY PLAN SELECT t1.*,
 # t2.* FROM t1, t2 WHERE t1.a=1 AND t1.b>2; 0|0|0|SEARCH TABLE t1
-# USING COVERING INDEX i2 (a=? AND b>?) (~3 rows) 0|1|1|SCAN TABLE t2
+# USING COVERING INDEX i2 (a=? AND b>?) 0|1|1|SCAN TABLE t2
-# (~1000000 rows)
+#
 do_execsql_test 5.4.0 {CREATE TABLE t2(c, d)}
 det 5.4.1 "SELECT t1.*, t2.* FROM t1, t2 WHERE t1.a=1 AND t1.b>2" {
-  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=? AND b>?) (~2 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=? AND b>?)}
-  0 1 1 {SCAN TABLE t2 (~1000000 rows)}
+  0 1 1 {SCAN TABLE t2}
 }
 # EVIDENCE-OF: R-21040-07025 sqlite> EXPLAIN QUERY PLAN SELECT t1.*,
 # t2.* FROM t2, t1 WHERE t1.a=1 AND t1.b>2; 0|0|1|SEARCH TABLE t1
-# USING COVERING INDEX i2 (a=? AND b>?) (~3 rows) 0|1|0|SCAN TABLE t2
+# USING COVERING INDEX i2 (a=? AND b>?) 0|1|0|SCAN TABLE t2
-# (~1000000 rows)
+#
 det 5.5 "SELECT t1.*, t2.* FROM t2, t1 WHERE t1.a=1 AND t1.b>2" {
-  0 0 1 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=? AND b>?) (~2 rows)}
+  0 0 1 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=? AND b>?)}
-  0 1 0 {SCAN TABLE t2 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t2}
 }
 # EVIDENCE-OF: R-39007-61103 sqlite> CREATE INDEX i3 ON t1(b);
 # sqlite> EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=1 OR b=2;
-# 0|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?)
-# 0|0|0|SEARCH TABLE t1 USING INDEX i3 (b=?) (~10 rows)
+# 0|0|0|SEARCH TABLE t1 USING INDEX i3 (b=?)
 do_execsql_test 5.5.0 {CREATE INDEX i3 ON t1(b)}
 det 5.6.1 "SELECT * FROM t1 WHERE a=1 OR b=2" {
-  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?)}
-  0 0 0 {SEARCH TABLE t1 USING INDEX i3 (b=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t1 USING INDEX i3 (b=?)}
 }
 # EVIDENCE-OF: R-33025-54904 sqlite> EXPLAIN QUERY PLAN SELECT c, d
-# FROM t2 ORDER BY c; 0|0|0|SCAN TABLE t2 (~1000000 rows) 0|0|0|USE TEMP
+# FROM t2 ORDER BY c; 0|0|0|SCAN TABLE t2 0|0|0|USE TEMP
 # B-TREE FOR ORDER BY
 det 5.7 "SELECT c, d FROM t2 ORDER BY c" {
-  0 0 0 {SCAN TABLE t2 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2}
  0 0 0 {USE TEMP B-TREE FOR ORDER BY}
 }
 # EVIDENCE-OF: R-38854-22809 sqlite> CREATE INDEX i4 ON t2(c);
 # sqlite> EXPLAIN QUERY PLAN SELECT c, d FROM t2 ORDER BY c;
-# 0|0|0|SCAN TABLE t2 USING INDEX i4 (~1000000 rows)
+# 0|0|0|SCAN TABLE t2 USING INDEX i4
 do_execsql_test 5.8.0 {CREATE INDEX i4 ON t2(c)}
 det 5.8.1 "SELECT c, d FROM t2 ORDER BY c" {
-  0 0 0 {SCAN TABLE t2 USING INDEX i4 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING INDEX i4}
 }
 # EVIDENCE-OF: R-29884-43993 sqlite> EXPLAIN QUERY PLAN SELECT
 # (SELECT b FROM t1 WHERE a=0), (SELECT a FROM t1 WHERE b=t2.c) FROM t2;
-# 0|0|0|SCAN TABLE t2 (~1000000 rows) 0|0|0|EXECUTE SCALAR SUBQUERY 1
+# 0|0|0|SCAN TABLE t2 0|0|0|EXECUTE SCALAR SUBQUERY 1
-# 1|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)
+# 1|0|0|SEARCH TABLE t1 USING COVERING INDEX i2 (a=?)
 # 0|0|0|EXECUTE CORRELATED SCALAR SUBQUERY 2 2|0|0|SEARCH TABLE t1 USING
-# INDEX i3 (b=?) (~10 rows)
+# INDEX i3 (b=?)
 det 5.9 {
  SELECT (SELECT b FROM t1 WHERE a=0), (SELECT a FROM t1 WHERE b=t2.c) FROM t2
 } {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX i4 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX i4}
  0 0 0 {EXECUTE SCALAR SUBQUERY 1}
-  1 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?) (~10 rows)}
+  1 0 0 {SEARCH TABLE t1 USING COVERING INDEX i2 (a=?)}
  0 0 0 {EXECUTE CORRELATED SCALAR SUBQUERY 2}
-  2 0 0 {SEARCH TABLE t1 USING INDEX i3 (b=?) (~10 rows)}
+  2 0 0 {SEARCH TABLE t1 USING INDEX i3 (b=?)}
 }
 # EVIDENCE-OF: R-17911-16445 sqlite> EXPLAIN QUERY PLAN SELECT
 # count(*) FROM (SELECT max(b) AS x FROM t1 GROUP BY a) GROUP BY x;
-# 1|0|0|SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows) 0|0|0|SCAN
+# 1|0|0|SCAN TABLE t1 USING COVERING INDEX i2 0|0|0|SCAN
-# SUBQUERY 1 (~1000000 rows) 0|0|0|USE TEMP B-TREE FOR GROUP BY
+# SUBQUERY 1 0|0|0|USE TEMP B-TREE FOR GROUP BY
 det 5.10 {
  SELECT count(*) FROM (SELECT max(b) AS x FROM t1 GROUP BY a) GROUP BY x
 } {
-  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i2}
-  0 0 0 {SCAN SUBQUERY 1 (~100 rows)}
+  0 0 0 {SCAN SUBQUERY 1}
  0 0 0 {USE TEMP B-TREE FOR GROUP BY}
 }
 # EVIDENCE-OF: R-18544-33103 sqlite> EXPLAIN QUERY PLAN SELECT * FROM
 # (SELECT * FROM t2 WHERE c=1), t1; 0|0|0|SEARCH TABLE t2 USING INDEX i4
-# (c=?) (~10 rows) 0|1|1|SCAN TABLE t1 (~1000000 rows)
+# (c=?) 0|1|1|SCAN TABLE t1
 det 5.11 "SELECT * FROM (SELECT * FROM t2 WHERE c=1), t1" {
-  0 0 0 {SEARCH TABLE t2 USING INDEX i4 (c=?) (~10 rows)}
+  0 0 0 {SEARCH TABLE t2 USING INDEX i4 (c=?)}
-  0 1 1 {SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows)}
+  0 1 1 {SCAN TABLE t1 USING COVERING INDEX i2}
 }
 # EVIDENCE-OF: R-40701-42164 sqlite> EXPLAIN QUERY PLAN SELECT a FROM
-# t1 UNION SELECT c FROM t2; 1|0|0|SCAN TABLE t1 (~1000000 rows)
+# t1 UNION SELECT c FROM t2; 1|0|0|SCAN TABLE t1
-# 2|0|0|SCAN TABLE t2 (~1000000 rows) 0|0|0|COMPOUND SUBQUERIES 1 AND 2
+# 2|0|0|SCAN TABLE t2 0|0|0|COMPOUND SUBQUERIES 1 AND 2
 # USING TEMP B-TREE (UNION)
 det 5.12 "SELECT a FROM t1 UNION SELECT c FROM t2" {
-  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i2}
-  2 0 0 {SCAN TABLE t2 USING COVERING INDEX i4 (~1000000 rows)}
+  2 0 0 {SCAN TABLE t2 USING COVERING INDEX i4}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 USING TEMP B-TREE (UNION)}
 }
 # EVIDENCE-OF: R-61538-24748 sqlite> EXPLAIN QUERY PLAN SELECT a FROM
 # t1 EXCEPT SELECT d FROM t2 ORDER BY 1; 1|0|0|SCAN TABLE t1 USING
-# COVERING INDEX i2 (~1000000 rows) 2|0|0|SCAN TABLE t2 (~1000000 rows)
+# COVERING INDEX i2 2|0|0|SCAN TABLE t2
 # 2|0|0|USE TEMP B-TREE FOR ORDER BY 0|0|0|COMPOUND SUBQUERIES 1 AND 2
 # (EXCEPT)
 det 5.13 "SELECT a FROM t1 EXCEPT SELECT d FROM t2 ORDER BY 1" {
-  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows)}
+  1 0 0 {SCAN TABLE t1 USING COVERING INDEX i2}
-  2 0 0 {SCAN TABLE t2 (~1000000 rows)}
+  2 0 0 {SCAN TABLE t2}
  2 0 0 {USE TEMP B-TREE FOR ORDER BY}
  0 0 0 {COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)}
 }
@ -531,8 +531,8 @@ proc do_peqp_test {tn sql res} {
 do_peqp_test 6.1 {
  SELECT a FROM t1 EXCEPT SELECT d FROM t2 ORDER BY 1
 } [string trimleft {
-1 0 0 SCAN TABLE t1 USING COVERING INDEX i2 (~1000000 rows)
+1 0 0 SCAN TABLE t1 USING COVERING INDEX i2
-2 0 0 SCAN TABLE t2 (~1000000 rows)
+2 0 0 SCAN TABLE t2
 2 0 0 USE TEMP B-TREE FOR ORDER BY
 0 0 0 COMPOUND SUBQUERIES 1 AND 2 (EXCEPT)
 }]
@ -550,11 +550,11 @@ do_execsql_test 7.0 {
 }
 det 7.1 "SELECT count(*) FROM t1" {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 0 0 {SCAN TABLE t1}
 }
 det 7.2 "SELECT count(*) FROM t2" {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX i1(~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX i1}
 }
 do_execsql_test 7.3 {
@ -572,11 +572,11 @@ db close
 sqlite3 db test.db
 det 7.4 "SELECT count(*) FROM t1" {
-  0 0 0 {SCAN TABLE t1 (~2 rows)}
+  0 0 0 {SCAN TABLE t1}
 }
 det 7.5 "SELECT count(*) FROM t2" {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX i1(~3 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX i1}
 }
--- a/test/exclusive.test
+++ b/test/exclusive.test
@ -506,4 +506,3 @@ do_execsql_test exclusive-6.5 {
 } {exclusive}
 finish_test
--- a/test/fallocate.test
+++ b/test/fallocate.test
@ -143,4 +143,3 @@ if {!$skipwaltests} {
 finish_test
--- a/test/filefmt.test
+++ b/test/filefmt.test
@ -248,4 +248,3 @@ do_test filefmt-4.4 {
 db2 close
 finish_test
--- a/test/fts3aa.test
+++ b/test/fts3aa.test
@ -224,4 +224,3 @@ do_catchsql_test fts3aa-7.5 {
 finish_test
--- a/test/fts3ao.test
+++ b/test/fts3ao.test
@ -220,4 +220,3 @@ do_execsql_test 5.2 {
 } {0 6}
 finish_test
--- a/test/fts3atoken.test
+++ b/test/fts3atoken.test
@ -193,5 +193,3 @@ do_test fts3token-internal {
 finish_test
--- a/test/fts3auto.test
+++ b/test/fts3auto.test
@ -707,4 +707,3 @@ foreach {tn create} {
 set sqlite_fts3_enable_parentheses $sfep
 finish_test
--- a/test/fts3aux1.test
+++ b/test/fts3aux1.test
@ -105,10 +105,10 @@ db func rec rec
 #
 do_execsql_test 2.1.1.1 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE term='braid'
-} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 1: (~0 rows)} }
+} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 1:} }
 do_execsql_test 2.1.1.2 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE +term='braid'
-} {0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0: (~0 rows)}}
+} {0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0:}}
 # Now show that using "term='braid'" means the virtual table returns
 # only 1 row to SQLite, but "+term='braid'" means all 19 are returned.
@ -154,24 +154,24 @@ do_execsql_test 2.1.5 { SELECT * FROM terms WHERE term=NULL } {}
 do_execsql_test 2.2.1.1 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE term>'brain'
-} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 2: (~0 rows)} }
+} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 2:} }
 do_execsql_test 2.2.1.2 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE +term>'brain'
-} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0: (~0 rows)} }
+} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0:} }
 do_execsql_test 2.2.1.3 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE term<'brain'
-} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 4: (~0 rows)} }
+} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 4:} }
 do_execsql_test 2.2.1.4 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE +term<'brain'
-} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0: (~0 rows)} }
+} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0:} }
 do_execsql_test 2.2.1.5 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE term BETWEEN 'brags' AND 'brain'
-} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 6: (~0 rows)} }
+} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 6:} }
 do_execsql_test 2.2.1.6 {
  EXPLAIN QUERY PLAN SELECT * FROM terms WHERE +term BETWEEN 'brags' AND 'brain'
-} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0: (~0 rows)} }
+} { 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0:} }
 do_test 2.2.2.1 {
  set cnt 0
@ -335,7 +335,7 @@ foreach {tn sort orderby} {
  9    1    "ORDER BY occurrences DESC"
 } {
-  set res [list 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0: (~0 rows)}]
+  set res [list 0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0:}]
  if {$sort} { lappend res 0 0 0 {USE TEMP B-TREE FOR ORDER BY} }
  set sql "SELECT * FROM terms $orderby"
@ -410,32 +410,32 @@ proc do_plansql_test {tn sql r} {
 do_plansql_test 4.2 {
  SELECT y FROM x2, terms WHERE y = term AND col = '*'
 } {
-  0 0 0 {SCAN TABLE x2 (~1000000 rows)} 
+  0 0 0 {SCAN TABLE x2} 
-  0 1 1 {SCAN TABLE terms VIRTUAL TABLE INDEX 1: (~0 rows)} 
+  0 1 1 {SCAN TABLE terms VIRTUAL TABLE INDEX 1:} 
  a b c d e f g h i j k l
 }
 do_plansql_test 4.3 {
  SELECT y FROM terms, x2 WHERE y = term AND col = '*'
 } {
-  0 0 1 {SCAN TABLE x2 (~1000000 rows)} 
+  0 0 1 {SCAN TABLE x2} 
-  0 1 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 1: (~0 rows)} 
+  0 1 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 1:} 
  a b c d e f g h i j k l
 }
 do_plansql_test 4.4 {
  SELECT y FROM x3, terms WHERE y = term AND col = '*'
 } {
-  0 0 1 {SCAN TABLE terms VIRTUAL TABLE INDEX 0: (~0 rows)} 
+  0 0 1 {SCAN TABLE terms VIRTUAL TABLE INDEX 0:} 
-  0 1 0 {SEARCH TABLE x3 USING COVERING INDEX i1 (y=?) (~10 rows)}
+  0 1 0 {SEARCH TABLE x3 USING COVERING INDEX i1 (y=?)}
  a b c d e f g h i j k l
 }
 do_plansql_test 4.5 {
  SELECT y FROM terms, x3 WHERE y = term AND occurrences>1 AND col = '*'
 } {
-  0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0: (~0 rows)} 
+  0 0 0 {SCAN TABLE terms VIRTUAL TABLE INDEX 0:} 
-  0 1 1 {SEARCH TABLE x3 USING COVERING INDEX i1 (y=?) (~10 rows)}
+  0 1 1 {SEARCH TABLE x3 USING COVERING INDEX i1 (y=?)}
  a k l
 }
@ -519,4 +519,3 @@ do_test 8.2 {
 } {1 {SQL logic error or missing database}}
 finish_test
--- a/test/fts3corrupt.test
+++ b/test/fts3corrupt.test
@ -166,4 +166,3 @@ do_test 5.3.1 { sqlite3_extended_errcode db } SQLITE_CORRUPT_VTAB
 finish_test
--- a/test/fts3defer2.test
+++ b/test/fts3defer2.test
@ -153,4 +153,3 @@ foreach {tn sql} {
 finish_test
--- a/test/fts3expr3.test
+++ b/test/fts3expr3.test
@ -204,7 +204,3 @@ do_faultsim_test fts3expr3-fault-1 -faults oom-* -body {
 set sqlite_fts3_enable_parentheses 0
 finish_test
--- a/test/fts3malloc.test
+++ b/test/fts3malloc.test
@ -305,4 +305,3 @@ do_write_test fts3_malloc-5.3 ft_content {
 finish_test
--- a/test/fts3matchinfo.test
+++ b/test/fts3matchinfo.test
@ -427,4 +427,3 @@ do_execsql_test 8.3 {
 }
 finish_test
--- a/test/fts3prefix2.test
+++ b/test/fts3prefix2.test
@ -59,4 +59,3 @@ do_execsql_test 1.3 {
 }
 finish_test
--- a/test/fts3query.test
+++ b/test/fts3query.test
@ -118,26 +118,26 @@ do_test fts3query-4.1 {
 do_eqp_test fts3query-4.2 {
  SELECT t1.number FROM t1, ft WHERE t1.number=ft.rowid ORDER BY t1.date
 } {
-  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
+  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1} 
-  0 1 1 {SCAN TABLE ft VIRTUAL TABLE INDEX 1: (~0 rows)}
+  0 1 1 {SCAN TABLE ft VIRTUAL TABLE INDEX 1:}
 }
 do_eqp_test fts3query-4.3 {
  SELECT t1.number FROM ft, t1 WHERE t1.number=ft.rowid ORDER BY t1.date
 } {
-  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
+  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1} 
-  0 1 0 {SCAN TABLE ft VIRTUAL TABLE INDEX 1: (~0 rows)}
+  0 1 0 {SCAN TABLE ft VIRTUAL TABLE INDEX 1:}
 }
 do_eqp_test fts3query-4.4 {
  SELECT t1.number FROM t1, bt WHERE t1.number=bt.rowid ORDER BY t1.date
 } {
-  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
+  0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1} 
-  0 1 1 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 1 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?)}
 }
 do_eqp_test fts3query-4.5 {
  SELECT t1.number FROM bt, t1 WHERE t1.number=bt.rowid ORDER BY t1.date
 } {
-  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1 (~1000000 rows)} 
+  0 0 1 {SCAN TABLE t1 USING COVERING INDEX i1} 
-  0 1 0 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+  0 1 0 {SEARCH TABLE bt USING INTEGER PRIMARY KEY (rowid=?)}
 }
@ -210,4 +210,3 @@ do_select_tests 6.2 {
 finish_test
--- a/test/fts3shared.test
+++ b/test/fts3shared.test
@ -174,4 +174,3 @@ dbW close
 dbR close
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test
--- a/test/fts3snippet.test
+++ b/test/fts3snippet.test
@ -432,10 +432,10 @@ foreach {DO_MALLOC_TEST enc} {
    {2 2 1 3 3 3 6 3 0 0 0 2 3 2}
  }]
-  # EVIDENCE-OF: R-40630-02268 If used within a SELECT that uses the
+  # EVIDENCE-OF: R-40630-02268 If used within a SELECT that uses the
-  # "query by rowid" or "linear scan" strategies, then the snippet and
+  # "query by rowid" or "linear scan" strategies, then the snippet and
-  # offsets both return an empty string, and the matchinfo function
+  # offsets both return an empty string, and the matchinfo function
-  # returns a blob value zero bytes in size.
+  # returns a blob value zero bytes in size.
  #
  set r 1000000                   ;# A rowid that exists in table ft
  do_select_test $T.10.0 { SELECT rowid FROM ft WHERE rowid = $r } $r
--- a/test/fts3sort.test
+++ b/test/fts3sort.test
@ -182,4 +182,3 @@ do_execsql_test 3.2 {
 finish_test
--- a/test/fts3tok1.test
+++ b/test/fts3tok1.test
@ -113,5 +113,3 @@ do_catchsql_test 2.1 {
 finish_test
--- a/test/fts3tok_err.test
+++ b/test/fts3tok_err.test
@ -45,5 +45,3 @@ do_faultsim_test fts3tok_err-2 -faults oom* -prep {
 finish_test
--- a/test/fts4content.test
+++ b/test/fts4content.test
@ -623,4 +623,3 @@ do_execsql_test 10.7 {
 }
 finish_test
--- a/test/fuzzer1.test
+++ b/test/fuzzer1.test
@ -1728,36 +1728,41 @@ do_execsql_test 8.1 {
 do_execsql_test 8.2.1 {
  SELECT cFrom, cTo, word 
    FROM x3_rules CROSS JOIN x3 
-    WHERE word MATCH 'a' AND cost=distance AND ruleset=2;
+    WHERE word MATCH 'a' AND cost=distance AND ruleset=2
    ORDER BY +cTo;
 } {a x x a y y a z z}
 do_execsql_test 8.2.2 {
  SELECT cFrom, cTo, word 
    FROM x3 CROSS JOIN x3_rules
-    WHERE word MATCH 'a' AND cost=distance AND ruleset=2;
+    WHERE word MATCH 'a' AND cost=distance AND ruleset=2
    ORDER BY +cTo DESC
 } {a z z a y y a x x}
 do_execsql_test 8.2.3 {
  SELECT cFrom, cTo, word 
    FROM x3_rules, x3 
-    WHERE word MATCH 'a' AND cost=distance AND ruleset=2;
+    WHERE word MATCH 'a' AND cost=distance AND ruleset=2
    ORDER BY +cTo DESC;
 } {a z z a y y a x x}
 do_execsql_test 8.2.4 {
  SELECT cFrom, cTo, word 
    FROM x3, x3_rules
-    WHERE word MATCH 'a' AND cost=distance AND ruleset=2;
+    WHERE word MATCH 'a' AND cost=distance AND ruleset=2
    ORDER BY +cTo DESC;
 } {a z z a y y a x x}
 do_execsql_test 8.2.5 {
  CREATE INDEX i1 ON x3_rules(cost);
  SELECT cFrom, cTo, word 
    FROM x3_rules, x3 
-    WHERE word MATCH 'a' AND cost=distance AND ruleset=2;
+    WHERE word MATCH 'a' AND cost=distance AND ruleset=2
    ORDER BY +cTo DESC;
 } {a z z a y y a x x}
 do_execsql_test 8.2.5 {
-  SELECT word FROM x3_rules, x3 WHERE word MATCH x3_rules.cFrom AND ruleset=2;
+  SELECT word FROM x3_rules, x3 WHERE word MATCH x3_rules.cFrom AND ruleset=2
 } {a z y x a z y x a z y x}
 do_execsql_test 8.2.6 {
--- a/test/incrblob3.test
+++ b/test/incrblob3.test
@ -269,4 +269,3 @@ db close
 tvfs delete
 finish_test
--- a/test/incrblob4.test
+++ b/test/incrblob4.test
@ -87,4 +87,3 @@ do_test 3.3 {
 } {}
 finish_test
--- a/test/incrblobfault.test
+++ b/test/incrblobfault.test
@ -67,4 +67,3 @@ do_faultsim_test 3 -prep {
 }
 finish_test
--- a/test/incrvacuum3.test
+++ b/test/incrvacuum3.test
@ -151,4 +151,3 @@ foreach {T jrnl_mode} {
 }
 finish_test
--- a/test/indexedby.test
+++ b/test/indexedby.test
@ -42,15 +42,15 @@ proc EQP {sql} {
 #
 do_execsql_test indexedby-1.2 {
  EXPLAIN QUERY PLAN select * from t1 WHERE a = 10; 
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}}
 do_execsql_test indexedby-1.3 {
  EXPLAIN QUERY PLAN select * from t1 ; 
-} {0 0 0 {SCAN TABLE t1 (~1000000 rows)}}
+} {0 0 0 {SCAN TABLE t1}}
 do_execsql_test indexedby-1.4 {
  EXPLAIN QUERY PLAN select * from t1, t2 WHERE c = 10; 
 } {
-  0 0 1 {SEARCH TABLE t2 USING INDEX i3 (c=?) (~10 rows)} 
+  0 0 1 {SEARCH TABLE t2 USING INDEX i3 (c=?)} 
-  0 1 0 {SCAN TABLE t1 (~1000000 rows)}
+  0 1 0 {SCAN TABLE t1}
 }
 # Parser tests. Test that an INDEXED BY or NOT INDEX clause can be 
@ -85,21 +85,21 @@ do_test indexedby-2.7 {
 #
 do_execsql_test indexedby-3.1 {
  EXPLAIN QUERY PLAN SELECT * FROM t1 NOT INDEXED WHERE a = 'one' AND b = 'two'
-} {0 0 0 {SCAN TABLE t1 (~10000 rows)}}
+} {0 0 0 {SCAN TABLE t1}}
 do_execsql_test indexedby-3.2 {
  EXPLAIN QUERY PLAN 
  SELECT * FROM t1 INDEXED BY i1 WHERE a = 'one' AND b = 'two'
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}}
 do_execsql_test indexedby-3.3 {
  EXPLAIN QUERY PLAN 
  SELECT * FROM t1 INDEXED BY i2 WHERE a = 'one' AND b = 'two'
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?)}}
 do_test indexedby-3.4 {
  catchsql { SELECT * FROM t1 INDEXED BY i2 WHERE a = 'one' }
-} {1 {cannot use index: i2}}
+} {1 {no query solution}}
 do_test indexedby-3.5 {
  catchsql { SELECT * FROM t1 INDEXED BY i2 ORDER BY a }
-} {1 {cannot use index: i2}}
+} {1 {no query solution}}
 do_test indexedby-3.6 {
  catchsql { SELECT * FROM t1 INDEXED BY i1 WHERE a = 'one' }
 } {0 {}}
@ -110,14 +110,14 @@ do_test indexedby-3.7 {
 do_execsql_test indexedby-3.8 {
  EXPLAIN QUERY PLAN 
  SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 ORDER BY e 
-} {0 0 0 {SCAN TABLE t3 USING INDEX sqlite_autoindex_t3_1 (~1000000 rows)}}
+} {0 0 0 {SCAN TABLE t3 USING INDEX sqlite_autoindex_t3_1}}
 do_execsql_test indexedby-3.9 {
  EXPLAIN QUERY PLAN 
  SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 WHERE e = 10 
-} {0 0 0 {SEARCH TABLE t3 USING INDEX sqlite_autoindex_t3_1 (e=?) (~1 rows)}}
+} {0 0 0 {SEARCH TABLE t3 USING INDEX sqlite_autoindex_t3_1 (e=?)}}
 do_test indexedby-3.10 {
  catchsql { SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_1 WHERE f = 10 }
-} {1 {cannot use index: sqlite_autoindex_t3_1}}
+} {1 {no query solution}}
 do_test indexedby-3.11 {
  catchsql { SELECT * FROM t3 INDEXED BY sqlite_autoindex_t3_2 WHERE f = 10 }
 } {1 {no such index: sqlite_autoindex_t3_2}}
@ -127,25 +127,25 @@ do_test indexedby-3.11 {
 do_execsql_test indexedby-4.1 {
  EXPLAIN QUERY PLAN SELECT * FROM t1, t2 WHERE a = c 
 } {
-  0 0 0 {SCAN TABLE t1 (~1000000 rows)} 
+  0 0 0 {SCAN TABLE t1} 
-  0 1 1 {SEARCH TABLE t2 USING INDEX i3 (c=?) (~10 rows)}
+  0 1 1 {SEARCH TABLE t2 USING INDEX i3 (c=?)}
 }
 do_execsql_test indexedby-4.2 {
  EXPLAIN QUERY PLAN SELECT * FROM t1 INDEXED BY i1, t2 WHERE a = c 
 } {
-  0 0 1 {SCAN TABLE t2 (~1000000 rows)} 
+  0 0 1 {SCAN TABLE t2} 
-  0 1 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~10 rows)}
+  0 1 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}
 }
 do_test indexedby-4.3 {
  catchsql {
    SELECT * FROM t1 INDEXED BY i1, t2 INDEXED BY i3 WHERE a=c
  }
-} {1 {cannot use index: i1}}
+} {1 {no query solution}}
 do_test indexedby-4.4 {
  catchsql {
    SELECT * FROM t2 INDEXED BY i3, t1 INDEXED BY i1 WHERE a=c
  }
-} {1 {cannot use index: i3}}
+} {1 {no query solution}}
 # Test embedding an INDEXED BY in a CREATE VIEW statement. This block
 # also tests that nothing bad happens if an index refered to by
@ -154,10 +154,10 @@ do_test indexedby-4.4 {
 do_execsql_test indexedby-5.1 {
  CREATE VIEW v2 AS SELECT * FROM t1 INDEXED BY i1 WHERE a > 5;
  EXPLAIN QUERY PLAN SELECT * FROM v2 
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?) (~250000 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?)}}
 do_execsql_test indexedby-5.2 {
  EXPLAIN QUERY PLAN SELECT * FROM v2 WHERE b = 10 
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?) (~25000 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?)}}
 do_test indexedby-5.3 {
  execsql { DROP INDEX i1 }
  catchsql { SELECT * FROM v2 }
@ -166,7 +166,7 @@ do_test indexedby-5.4 {
  # Recreate index i1 in such a way as it cannot be used by the view query.
  execsql { CREATE INDEX i1 ON t1(b) }
  catchsql { SELECT * FROM v2 }
-} {1 {cannot use index: i1}}
+} {1 {no query solution}}
 do_test indexedby-5.5 {
  # Drop and recreate index i1 again. This time, create it so that it can
  # be used by the query.
@ -178,54 +178,54 @@ do_test indexedby-5.5 {
 # 
 do_execsql_test indexedby-6.1 {
  EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b = 10 ORDER BY rowid 
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?)}}
 do_execsql_test indexedby-6.2 {
  EXPLAIN QUERY PLAN SELECT * FROM t1 NOT INDEXED WHERE b = 10 ORDER BY rowid 
-} {0 0 0 {SCAN TABLE t1 USING INTEGER PRIMARY KEY (~100000 rows)}}
+} {0 0 0 {SCAN TABLE t1}}
 # Test that "INDEXED BY" can be used in a DELETE statement.
 # 
 do_execsql_test indexedby-7.1 {
  EXPLAIN QUERY PLAN DELETE FROM t1 WHERE a = 5 
-} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?)}}
 do_execsql_test indexedby-7.2 {
  EXPLAIN QUERY PLAN DELETE FROM t1 NOT INDEXED WHERE a = 5 
-} {0 0 0 {SCAN TABLE t1 (~100000 rows)}}
+} {0 0 0 {SCAN TABLE t1}}
 do_execsql_test indexedby-7.3 {
  EXPLAIN QUERY PLAN DELETE FROM t1 INDEXED BY i1 WHERE a = 5 
-} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?)}}
 do_execsql_test indexedby-7.4 {
  EXPLAIN QUERY PLAN DELETE FROM t1 INDEXED BY i1 WHERE a = 5 AND b = 10
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}}
 do_execsql_test indexedby-7.5 {
  EXPLAIN QUERY PLAN DELETE FROM t1 INDEXED BY i2 WHERE a = 5 AND b = 10
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?)}}
 do_test indexedby-7.6 {
  catchsql { DELETE FROM t1 INDEXED BY i2 WHERE a = 5}
-} {1 {cannot use index: i2}}
+} {1 {no query solution}}
 # Test that "INDEXED BY" can be used in an UPDATE statement.
 # 
 do_execsql_test indexedby-8.1 {
  EXPLAIN QUERY PLAN UPDATE t1 SET rowid=rowid+1 WHERE a = 5 
-} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?)}}
 do_execsql_test indexedby-8.2 {
  EXPLAIN QUERY PLAN UPDATE t1 NOT INDEXED SET rowid=rowid+1 WHERE a = 5 
-} {0 0 0 {SCAN TABLE t1 (~100000 rows)}}
+} {0 0 0 {SCAN TABLE t1}}
 do_execsql_test indexedby-8.3 {
  EXPLAIN QUERY PLAN UPDATE t1 INDEXED BY i1 SET rowid=rowid+1 WHERE a = 5 
-} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (a=?)}}
 do_execsql_test indexedby-8.4 {
  EXPLAIN QUERY PLAN 
  UPDATE t1 INDEXED BY i1 SET rowid=rowid+1 WHERE a = 5 AND b = 10
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}}
 do_execsql_test indexedby-8.5 {
  EXPLAIN QUERY PLAN 
  UPDATE t1 INDEXED BY i2 SET rowid=rowid+1 WHERE a = 5 AND b = 10
-} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?) (~2 rows)}}
+} {0 0 0 {SEARCH TABLE t1 USING INDEX i2 (b=?)}}
 do_test indexedby-8.6 {
  catchsql { UPDATE t1 INDEXED BY i2 SET rowid=rowid+1 WHERE a = 5}
-} {1 {cannot use index: i2}}
+} {1 {no query solution}}
 # Test that bug #3560 is fixed.
 #
@ -243,10 +243,10 @@ do_test indexedby-9.2 {
    joinme as j indexed by joinme_id_text_idx
    on ( m.id  = j.id_int)
  }
-} {1 {cannot use index: joinme_id_text_idx}}
+} {1 {no query solution}}
 do_test indexedby-9.3 {
  catchsql { select * from maintable, joinme INDEXED by joinme_id_text_idx }
-} {1 {cannot use index: joinme_id_text_idx}}
+} {1 {no query solution}}
 # Make sure we can still create tables, indices, and columns whose name
 # is "indexed".
--- a/test/intpkey.test
+++ b/test/intpkey.test
@ -125,8 +125,11 @@ do_test intpkey-1.12.1 {
  }
 } {4 one two}
 do_test intpkey-1.12.2 {
-  set sqlite_query_plan
+  execsql {
-} {t1 *}
+    EXPLAIN QUERY PLAN
    SELECT * FROM t1 WHERE a==4;
  }
 } {/SEARCH TABLE t1 /}
 # Try to insert a non-integer value into the primary key field.  This
 # should result in a data type mismatch.
--- a/test/io.test
+++ b/test/io.test
@ -641,4 +641,3 @@ foreach {tn sql} {
 sqlite3_simulate_device -char {} -sectorsize 0
 finish_test
--- a/test/ioerr6.test
+++ b/test/ioerr6.test
@ -89,4 +89,3 @@ do_faultsim_test 3 -faults full* -prep {
 }
 finish_test
--- a/test/like.test
+++ b/test/like.test
@ -156,14 +156,27 @@ ifcapable !like_opt {
 # This procedure executes the SQL.  Then it appends to the result the
 # "sort" or "nosort" keyword (as in the cksort procedure above) then
-# it appends the ::sqlite_query_plan variable.
+# it appends the names of the table and index used.
 #
 proc queryplan {sql} {
  set ::sqlite_sort_count 0
  set data [execsql $sql]
  if {$::sqlite_sort_count} {set x sort} {set x nosort}
  lappend data $x
-  return [concat $data $::sqlite_query_plan]
+  set eqp [execsql "EXPLAIN QUERY PLAN $sql"]
  # puts eqp=$eqp
  foreach {a b c x} $eqp {
    if {[regexp { TABLE (\w+ AS )?(\w+) USING COVERING INDEX (\w+)\y} \
        $x all as tab idx]} {
      lappend data {} $idx
    } elseif {[regexp { TABLE (\w+ AS )?(\w+) USING.* INDEX (\w+)\y} \
        $x all as tab idx]} {
      lappend data $tab $idx
    } elseif {[regexp { TABLE (\w+ AS )?(\w+)\y} $x all as tab]} {
      lappend data $tab *
    }
  }
  return $data   
 }
 # Perform tests on the like optimization.
@ -176,7 +189,7 @@ do_test like-3.1 {
  queryplan {
    SELECT x FROM t1 WHERE x LIKE 'abc%' ORDER BY 1;
  }
-} {ABC {ABC abc xyz} abc abcd sort t1 {}}
+} {ABC {ABC abc xyz} abc abcd sort t1 *}
 do_test like-3.2 {
  set sqlite_like_count
 } {12}
@ -269,8 +282,8 @@ do_test like-3.12 {
 #
 do_test like-3.13 {
  set sqlite_like_count 0
  db eval {PRAGMA case_sensitive_like=off;}
  queryplan {
    PRAGMA case_sensitive_like=off;
    SELECT x FROM t1 WHERE x LIKE 'abc%' ORDER BY 1;
  }
 } {ABC {ABC abc xyz} abc abcd nosort {} i1}
@ -282,12 +295,14 @@ do_test like-3.14 {
 #
 do_test like-3.15 {
  set sqlite_like_count 0
-  queryplan {
+  db eval {
    PRAGMA case_sensitive_like=on;
    DROP INDEX i1;
  }
  queryplan {
    SELECT x FROM t1 WHERE x LIKE 'abc%' ORDER BY 1;
  }
-} {abc abcd sort t1 {}}
+} {abc abcd sort t1 *}
 do_test like-3.16 {
  set sqlite_like_count
 } 12
@ -299,7 +314,7 @@ do_test like-3.17 {
  queryplan {
    SELECT x FROM t1 WHERE x GLOB 'abc*' ORDER BY 1;
  }
-} {abc abcd sort t1 {}}
+} {abc abcd sort t1 *}
 do_test like-3.18 {
  set sqlite_like_count
 } 12
@ -318,8 +333,8 @@ do_test like-3.20 {
 } 0
 do_test like-3.21 {
  set sqlite_like_count 0
  db eval {PRAGMA case_sensitive_like=on;}
  queryplan {
    PRAGMA case_sensitive_like=on;
    SELECT x FROM t1 WHERE x GLOB 'abc*' ORDER BY 1;
  }
 } {abc abcd nosort {} i1}
@ -328,8 +343,8 @@ do_test like-3.22 {
 } 0
 do_test like-3.23 {
  set sqlite_like_count 0
  db eval {PRAGMA case_sensitive_like=off;}
  queryplan {
    PRAGMA case_sensitive_like=off;
    SELECT x FROM t1 WHERE x GLOB 'a[bc]d' ORDER BY 1;
  }
 } {abd acd nosort {} i1}
@ -809,60 +824,66 @@ do_test like-11.0 {
  }
 } {12}
 do_test like-11.1 {
  db eval {PRAGMA case_sensitive_like=OFF;}
  queryplan {
    PRAGMA case_sensitive_like=OFF;
    SELECT b FROM t11 WHERE b LIKE 'abc%' ORDER BY a;
  }
 } {abc abcd ABC ABCD nosort t11 *}
 do_test like-11.2 {
  db eval {PRAGMA case_sensitive_like=ON;}
  queryplan {
    PRAGMA case_sensitive_like=ON;
    SELECT b FROM t11 WHERE b LIKE 'abc%' ORDER BY a;
  }
 } {abc abcd nosort t11 *}
 do_test like-11.3 {
-  queryplan {
+  db eval {
    PRAGMA case_sensitive_like=OFF;
    CREATE INDEX t11b ON t11(b);
  }
  queryplan {
    SELECT b FROM t11 WHERE b LIKE 'abc%' ORDER BY +a;
  }
 } {abc abcd ABC ABCD sort {} t11b}
 do_test like-11.4 {
  db eval {PRAGMA case_sensitive_like=ON;}
  queryplan {
    PRAGMA case_sensitive_like=ON;
    SELECT b FROM t11 WHERE b LIKE 'abc%' ORDER BY a;
  }
 } {abc abcd nosort t11 *}
 do_test like-11.5 {
-  queryplan {
+  db eval {
    PRAGMA case_sensitive_like=OFF;
    DROP INDEX t11b;
    CREATE INDEX t11bnc ON t11(b COLLATE nocase);
  }
  queryplan {
    SELECT b FROM t11 WHERE b LIKE 'abc%' ORDER BY +a;
  }
 } {abc abcd ABC ABCD sort {} t11bnc}
 do_test like-11.6 {
  db eval {CREATE INDEX t11bb ON t11(b COLLATE binary);}
  queryplan {
    CREATE INDEX t11bb ON t11(b COLLATE binary);
    SELECT b FROM t11 WHERE b LIKE 'abc%' ORDER BY +a;
  }
 } {abc abcd ABC ABCD sort {} t11bnc}
 do_test like-11.7 {
  db eval {PRAGMA case_sensitive_like=ON;}
  queryplan {
    PRAGMA case_sensitive_like=ON;
    SELECT b FROM t11 WHERE b LIKE 'abc%' ORDER BY +a;
  }
 } {abc abcd sort {} t11bb}
 do_test like-11.8 {
  db eval {PRAGMA case_sensitive_like=OFF;}
  queryplan {
    PRAGMA case_sensitive_like=OFF;
    SELECT b FROM t11 WHERE b GLOB 'abc*' ORDER BY +a;
  }
 } {abc abcd sort {} t11bb}
 do_test like-11.9 {
-  queryplan {
+  db eval {
    CREATE INDEX t11cnc ON t11(c COLLATE nocase);
    CREATE INDEX t11cb ON t11(c COLLATE binary);
  }
  queryplan {
    SELECT c FROM t11 WHERE c LIKE 'abc%' ORDER BY +a;
  }
 } {abc abcd ABC ABCD sort {} t11cnc}
--- a/test/lock7.test
+++ b/test/lock7.test
@ -58,4 +58,3 @@ db1 close
 db2 close
 finish_test
--- a/test/misc7.test
+++ b/test/misc7.test
@ -269,17 +269,17 @@ ifcapable explain {
    CREATE TABLE abc(a PRIMARY KEY, b, c);
    EXPLAIN QUERY PLAN SELECT * FROM abc AS t2 WHERE rowid = 1;
  } {
-    0 0 0 {SEARCH TABLE abc AS t2 USING INTEGER PRIMARY KEY (rowid=?) (~1 rows)}
+    0 0 0 {SEARCH TABLE abc AS t2 USING INTEGER PRIMARY KEY (rowid=?)}
  }
  do_execsql_test misc7-14.2 {
    EXPLAIN QUERY PLAN SELECT * FROM abc AS t2 WHERE a = 1;
  } {0 0 0 
-     {SEARCH TABLE abc AS t2 USING INDEX sqlite_autoindex_abc_1 (a=?) (~1 rows)}
+     {SEARCH TABLE abc AS t2 USING INDEX sqlite_autoindex_abc_1 (a=?)}
  }
  do_execsql_test misc7-14.3 {
    EXPLAIN QUERY PLAN SELECT * FROM abc AS t2 ORDER BY a;
  } {0 0 0 
-     {SCAN TABLE abc AS t2 USING INDEX sqlite_autoindex_abc_1 (~1000000 rows)}
+     {SCAN TABLE abc AS t2 USING INDEX sqlite_autoindex_abc_1}
  }
 }
--- a/test/notify3.test
+++ b/test/notify3.test
@ -150,4 +150,3 @@ catch { db2 close }
 sqlite3_enable_shared_cache $esc
 finish_test
--- a/test/orderby1.test
+++ b/test/orderby1.test
@ -48,7 +48,7 @@ do_test 1.0 {
 } {}
 do_test 1.1a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
 } {one-a one-c two-a two-b three-a three-c}
@ -66,7 +66,7 @@ do_test 1.1b {
 #
 do_test 1.2a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn
  }
 } {one-a one-c two-a two-b three-a three-c}
@ -75,7 +75,7 @@ do_test 1.2a {
 do_test 1.2b {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn
  }
 } {/ORDER BY/}   ;# separate sorting pass due to "+" on ORDER BY terms
@ -85,13 +85,13 @@ do_test 1.3a {
  optimization_control db order-by-idx-join 0
  db cache flush
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
 } {one-a one-c two-a two-b three-a three-c}
 do_test 1.3b {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
 } {/ORDER BY/}   ;# separate sorting pass due to disabled optimization
 optimization_control db all 1
@ -101,55 +101,57 @@ db cache flush
 #
 do_test 1.4a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn
  }
 } {three-a three-c two-a two-b one-a one-c}
 do_test 1.4b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title DESC, +tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title DESC, +tn
  }
 } {three-a three-c two-a two-b one-a one-c}  ;# verify same order after sorting
 do_test 1.4c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn
  }
-} {~/ORDER BY/}  ;# optimized out
+} {~/ORDER BY/}  ;# ORDER BY suppressed due to uniqueness constraints
 do_test 1.5a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn DESC
  }
 } {one-c one-a two-b two-a three-c three-a}
 do_test 1.5b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn DESC
  }
 } {one-c one-a two-b two-a three-c three-a}  ;# verify same order after sorting
 do_test 1.5c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn DESC
  }
-} {~/ORDER BY/}  ;# optimized out
+} {~/ORDER BY/}  ;# ORDER BY suppressed due to uniqueness constraints
 do_test 1.6a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn DESC
+    SELECT name FROM album CROSS JOIN track USING (aid)
     ORDER BY title DESC, tn DESC
  }
 } {three-c three-a two-b two-a one-c one-a}
 do_test 1.6b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title DESC, +tn DESC
+    SELECT name FROM album CROSS JOIN track USING (aid)
     ORDER BY +title DESC, +tn DESC
  }
 } {three-c three-a two-b two-a one-c one-a}  ;# verify same order after sorting
 do_test 1.6c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn DESC
+    SELECT name FROM album CROSS JOIN track USING (aid)
     ORDER BY title DESC, tn DESC
  }
-} {~/ORDER BY/}  ;# ORDER BY optimized-out
+} {~/ORDER BY/}  ;# ORDER BY 
 # Reconstruct the test data to use indices rather than integer primary keys.
@ -183,7 +185,7 @@ do_test 2.0 {
 } {}
 do_test 2.1a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
 } {one-a one-c two-a two-b three-a three-c}
@ -192,28 +194,28 @@ do_test 2.1a {
 do_test 2.1b {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
-} {~/ORDER BY/}  ;# ORDER BY optimized out
+} {/ORDER BY/}  ;# ORDER BY required because of missing aid term in ORDER BY
 do_test 2.1c {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, aid, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, aid, tn
  }
 } {one-a one-c two-a two-b three-a three-c}
 do_test 2.1d {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, aid, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, aid, tn
  }
-} {~/ORDER BY/}  ;# ORDER BY optimized out
+} {/ORDER BY/}  ;# ORDER BY required in this case
 # The same query with ORDER BY clause optimization disabled via + operators
 # should give exactly the same answer.
 #
 do_test 2.2a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn
  }
 } {one-a one-c two-a two-b three-a three-c}
@ -222,7 +224,7 @@ do_test 2.2a {
 do_test 2.2b {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn
  }
 } {/ORDER BY/}   ;# separate sorting pass due to "+" on ORDER BY terms
@ -232,13 +234,13 @@ do_test 2.3a {
  optimization_control db order-by-idx-join 0
  db cache flush
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
 } {one-a one-c two-a two-b three-a three-c}
 do_test 2.3b {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
 } {/ORDER BY/}   ;# separate sorting pass due to disabled optimization
 optimization_control db all 1
@ -248,55 +250,55 @@ db cache flush
 #
 do_test 2.4a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn
  }
 } {three-a three-c two-a two-b one-a one-c}
 do_test 2.4b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title DESC, +tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title DESC, +tn
  }
 } {three-a three-c two-a two-b one-a one-c}  ;# verify same order after sorting
 do_test 2.4c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn
  }
-} {~/ORDER BY/}  ;# optimized out
+} {/ORDER BY/}  ;# separate sorting pass due to mixed DESC/ASC
 do_test 2.5a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn DESC
  }
 } {one-c one-a two-b two-a three-c three-a}
 do_test 2.5b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn DESC
  }
 } {one-c one-a two-b two-a three-c three-a}  ;# verify same order after sorting
 do_test 2.5c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn DESC
  }
-} {~/ORDER BY/}  ;# optimized out
+} {/ORDER BY/}  ;# separate sorting pass due to mixed ASC/DESC
 do_test 2.6a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn DESC
  }
 } {three-c three-a two-b two-a one-c one-a}
 do_test 2.6b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title DESC, +tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title DESC, +tn DESC
  }
 } {three-c three-a two-b two-a one-c one-a}  ;# verify same order after sorting
 do_test 2.6c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn DESC
  }
-} {~/ORDER BY/}  ;# ORDER BY optimized out
+} {/ORDER BY/}  ;# ORDER BY required
 # Generate another test dataset, but this time using mixed ASC/DESC indices.
@ -348,7 +350,7 @@ do_test 3.1b {
 #
 do_test 3.2a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn DESC
  }
 } {one-c one-a two-b two-a three-c three-a}
@ -357,7 +359,7 @@ do_test 3.2a {
 do_test 3.2b {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn DESC
  }
 } {/ORDER BY/}   ;# separate sorting pass due to "+" on ORDER BY terms
@ -367,13 +369,13 @@ do_test 3.3a {
  optimization_control db order-by-idx-join 0
  db cache flush
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn DESC
  }
 } {one-c one-a two-b two-a three-c three-a}
 do_test 3.3b {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn DESC
  }
 } {/ORDER BY/}   ;# separate sorting pass due to disabled optimization
 optimization_control db all 1
@ -383,38 +385,37 @@ db cache flush
 #
 do_test 3.4a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
 } {one-a one-c two-a two-b three-a three-c}
 do_test 3.4b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title, +tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title, +tn
  }
 } {one-a one-c two-a two-b three-a three-c}  ;# verify same order after sorting
 do_test 3.4c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title, tn
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title, tn
  }
-} {~/ORDER BY/}  ;# optimized out
+} {~/ORDER BY/}  ;# ORDER BY suppressed by uniqueness constraints
 do_test 3.5a {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn DESC
  }
 } {three-c three-a two-b two-a one-c one-a}
 do_test 3.5b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title DESC, +tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY +title DESC, +tn DESC
  }
 } {three-c three-a two-b two-a one-c one-a}  ;# verify same order after sorting
 do_test 3.5c {
  db eval {
    EXPLAIN QUERY PLAN
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY title DESC, tn DESC
+    SELECT name FROM album JOIN track USING (aid) ORDER BY title DESC, tn DESC
  }
-} {~/ORDER BY/}  ;# optimzed out
+} {~/ORDER BY/}  ;# ORDER BY suppressed by uniqueness constraints
 do_test 3.6a {
@ -424,7 +425,8 @@ do_test 3.6a {
 } {three-a three-c two-a two-b one-a one-c}
 do_test 3.6b {
  db eval {
-    SELECT name FROM album CROSS JOIN track USING (aid) ORDER BY +title DESC, +tn
+    SELECT name FROM album CROSS JOIN track USING (aid)
     ORDER BY +title DESC, +tn
  }
 } {three-a three-c two-a two-b one-a one-c}  ;# verify same order after sorting
 do_test 3.6c {
@ -434,5 +436,22 @@ do_test 3.6c {
  }
 } {~/ORDER BY/}  ;# inverted ASC/DESC is optimized out
 # Ticket 5ed1772895bf3deeab78c5e3519b1da9165c541b (2013-06-04)
 # Incorrect ORDER BY on an indexed JOIN
 #
 do_test 4.0 {
  db eval {
    CREATE TABLE t41(a INT UNIQUE NOT NULL, b INT NOT NULL);
    CREATE INDEX t41ba ON t41(b,a);
    CREATE TABLE t42(x INT NOT NULL REFERENCES t41(a), y INT NOT NULL);
    CREATE UNIQUE INDEX t42xy ON t42(x,y);
    INSERT INTO t41 VALUES(1,1),(3,1);
    INSERT INTO t42 VALUES(1,13),(1,15),(3,14),(3,16);
    SELECT b, y FROM t41 CROSS JOIN t42 ON x=a ORDER BY b, y;
  }
 } {1 13 1 14 1 15 1 16}
 finish_test
--- a/test/orderby5.test
+++ b/test/orderby5.test
@ -0,0 +1,97 @@
 # 2013-06-14
 #
 # 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 file is testing that the optimizations that disable
 # ORDER BY clauses work correctly
 #
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
 set ::testprefix orderby5
 # Generate test data for a join.  Verify that the join gets the
 # correct answer.
 #
 do_execsql_test 1.1 {
  CREATE TABLE t1(a,b,c);
  CREATE INDEX t1bc ON t1(b,c);
  EXPLAIN QUERY PLAN
  SELECT DISTINCT a, b, c FROM t1 WHERE a=0;
 } {~/B-TREE/}
 do_execsql_test 1.2.1 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT a, c, b FROM t1 WHERE a=0;
 } {~/B-TREE/}
 do_execsql_test 1.2.2 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT a, c, b FROM t1 WHERE a='xyz' COLLATE nocase;
 } {/B-TREE/}
 do_execsql_test 1.2.3 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT a COLLATE nocase, c, b FROM t1 WHERE a='xyz';
 } {/B-TREE/}
 do_execsql_test 1.2.4 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT a COLLATE nocase, c, b FROM t1 WHERE a='xyz' COLLATE nocase;
 } {~/B-TREE/}
 do_execsql_test 1.3 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT b, a, c FROM t1 WHERE a=0;
 } {~/B-TREE/}
 do_execsql_test 1.4 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT b, c, a FROM t1 WHERE a=0;
 } {~/B-TREE/}
 do_execsql_test 1.5 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT c, a, b FROM t1 WHERE a=0;
 } {~/B-TREE/}
 do_execsql_test 1.6 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT c, b, a FROM t1 WHERE a=0;
 } {~/B-TREE/}
 do_execsql_test 1.7 {
  EXPLAIN QUERY PLAN
  SELECT DISTINCT c, b, a FROM t1 WHERE +a=0;
 } {/B-TREE/}
 do_execsql_test 2.1 {
  EXPLAIN QUERY PLAN
  SELECT * FROM t1 WHERE a=0 ORDER BY a, b, c;
 } {~/B-TREE/}
 do_execsql_test 2.2 {
  EXPLAIN QUERY PLAN
  SELECT * FROM t1 WHERE +a=0 ORDER BY a, b, c;
 } {/B-TREE/}
 do_execsql_test 2.3 {
  EXPLAIN QUERY PLAN
  SELECT * FROM t1 WHERE a=0 ORDER BY b, a, c;
 } {~/B-TREE/}
 do_execsql_test 2.4 {
  EXPLAIN QUERY PLAN
  SELECT * FROM t1 WHERE a=0 ORDER BY b, c, a;
 } {~/B-TREE/}
 do_execsql_test 2.5 {
  EXPLAIN QUERY PLAN
  SELECT * FROM t1 WHERE a=0 ORDER BY a, c, b;
 } {/B-TREE/}
 do_execsql_test 2.6 {
  EXPLAIN QUERY PLAN
  SELECT * FROM t1 WHERE a=0 ORDER BY c, a, b;
 } {/B-TREE/}
 do_execsql_test 2.7 {
  EXPLAIN QUERY PLAN
  SELECT * FROM t1 WHERE a=0 ORDER BY c, b, a;
 } {/B-TREE/}
 finish_test
--- a/test/pager1.test
+++ b/test/pager1.test
@ -2815,4 +2815,3 @@ do_test 43.3 {
 } {0 1 0}
 finish_test
--- a/test/pagerfault.test
+++ b/test/pagerfault.test
@ -1546,4 +1546,3 @@ sqlite3_shutdown
 sqlite3_config_uri 0
 finish_test
--- a/test/pagerfault2.test
+++ b/test/pagerfault2.test
@ -96,4 +96,3 @@ do_faultsim_test pagerfault2-2 -faults oom-transient -prep {
 sqlite3_memdebug_vfs_oom_test 1
 finish_test
--- a/test/pagerfault3.test
+++ b/test/pagerfault3.test
@ -61,4 +61,3 @@ do_faultsim_test pagerfault3-1 -faults ioerr-transient -prep {
 }
 finish_test
--- a/test/permutations.test
+++ b/test/permutations.test
@ -213,6 +213,82 @@ test_suite "nofaultsim" -prefix "" -description {
  unset -nocomplain ::G(valgrind)
 }
 test_suite "queryplanner" -prefix "" -description {
  Tests of the query planner and query optimizer
 } -files {
  alter2.test alter3.test alter4.test alter.test analyze3.test
  analyze4.test analyze5.test analyze6.test analyze7.test analyze8.test
  analyze.test attach2.test attach3.test attach4.test
  attach.test autoinc.test autoindex1.test between.test cast.test
  check.test closure01.test coalesce.test collate1.test collate2.test
  collate3.test collate4.test collate5.test collate6.test collate7.test
  collate8.test collate9.test collateA.test colmeta.test colname.test
  conflict.test count.test coveridxscan.test createtab.test cse.test
  date.test dbstatus2.test dbstatus.test default.test delete2.test
  delete3.test delete.test descidx1.test descidx2.test descidx3.test
  distinctagg.test distinct.test e_createtable.test e_delete.test
  e_droptrigger.test e_dropview.test e_expr.test e_insert.test
  eqp.test e_reindex.test e_resolve.test e_select2.test e_select.test
  e_update.test exists.test expr.test fkey1.test fkey2.test fkey3.test
  fkey4.test fkey5.test func2.test func3.test func.test 
  in3.test in4.test in5.test index2.test index3.test
  index4.test index5.test indexedby.test index.test
  insert2.test insert3.test insert4.test insert5.test insert.test
  instr.test in.test intpkey.test join2.test join3.test join4.test
  join5.test join6.test join.test like2.test like.test limit.test
  minmax2.test minmax3.test minmax4.test minmax.test misc1.test misc2.test
  misc3.test misc4.test misc5.test misc6.test misc7.test orderby1.test
  orderby2.test orderby3.test orderby4.test randexpr1.test regexp1.test
  reindex.test rowhash.test rowid.test schema2.test schema3.test
  schema4.test schema5.test schema.test
  select1.test select2.test select3.test select4.test select5.test
  select6.test select7.test select8.test select9.test selectA.test
  selectB.test selectC.test selectD.test selectE.test sidedelete.test
  sort.test spellfix.test subquery2.test subquery.test subselect.test
  substr.test tkt-02a8e81d44.test tkt1435.test tkt1443.test tkt1444.test
  tkt1449.test tkt1473.test tkt1501.test tkt1512.test tkt1514.test
  tkt1536.test tkt1537.test tkt1567.test tkt1644.test tkt1667.test
  tkt1873.test tkt2141.test tkt2192.test tkt2213.test tkt2251.test
  tkt2285.test tkt2332.test tkt2339.test tkt2391.test tkt2409.test
  tkt2450.test tkt2565.test tkt2640.test tkt2643.test tkt2686.test
  tkt-26ff0c2d1e.test tkt2767.test tkt2817.test tkt2820.test tkt2822.test
  tkt2832.test tkt2854.test tkt2920.test tkt2927.test tkt2942.test
  tkt-2a5629202f.test tkt-2d1a5c67d.test tkt-2ea2425d34.test tkt3080.test
  tkt3093.test tkt3121.test tkt-31338dca7e.test tkt-313723c356.test
  tkt3201.test tkt3292.test tkt3298.test tkt3334.test tkt3346.test
  tkt3357.test tkt3419.test tkt3424.test tkt3442.test tkt3457.test
  tkt3461.test tkt3493.test tkt3508.test tkt3522.test tkt3527.test
  tkt3541.test tkt3554.test tkt3581.test tkt35xx.test tkt3630.test
  tkt3718.test tkt3731.test tkt3757.test tkt3761.test tkt3762.test
  tkt3773.test tkt3791.test tkt3793.test tkt3810.test tkt3824.test
  tkt3832.test tkt3838.test tkt3841.test tkt-385a5b56b9.test tkt3871.test
  tkt3879.test tkt-38cb5df375.test tkt3911.test tkt3918.test tkt3922.test
  tkt3929.test tkt3935.test tkt3992.test tkt3997.test tkt-3998683a16.test
  tkt-3a77c9714e.test tkt-3fe897352e.test tkt4018.test tkt-4a03edc4c8.test
  tkt-4dd95f6943.test tkt-54844eea3f.test tkt-5d863f876e.test
  tkt-5e10420e8d.test tkt-5ee23731f.test tkt-6bfb98dfc0.test
  tkt-752e1646fc.test tkt-78e04e52ea.test tkt-7a31705a7e6.test
  tkt-7bbfb7d442.test tkt-80ba201079.test tkt-80e031a00f.test
  tkt-8454a207b9.test tkt-91e2e8ba6f.test tkt-94c04eaadb.test
  tkt-9d68c883.test tkt-a7b7803e.test tkt-b1d3a2e531.test
  tkt-b351d95f9.test tkt-b72787b1.test tkt-bd484a090c.test
  tkt-bdc6bbbb38.test tkt-c48d99d690.test tkt-cbd054fa6b.test
  tkt-d11f09d36e.test tkt-d635236375.test tkt-d82e3f3721.test
  tkt-f3e5abed55.test tkt-f777251dc7a.test tkt-f7b4edec.test
  tkt-f973c7ac31.test tkt-fa7bf5ec.test tkt-fc62af4523.test
  tkt-fc7bd6358f.test trigger1.test trigger2.test trigger3.test
  trigger4.test trigger5.test trigger6.test trigger7.test trigger8.test
  trigger9.test triggerA.test triggerB.test triggerC.test triggerD.test
  types2.test types3.test types.test unique.test unordered.test
  update.test view.test vtab1.test vtab2.test vtab3.test vtab4.test
  vtab5.test vtab6.test vtab7.test vtab8.test vtab9.test vtab_alter.test
  vtabA.test vtabB.test vtabC.test vtabD.test vtabE.test
  vtabF.test where2.test where3.test where4.test where5.test where6.test
  where7.test where8m.test where8.test where9.test whereA.test whereB.test
  whereC.test whereD.test whereE.test whereF.test wherelimit.test
  where.test
 }
 lappend ::testsuitelist xxx
 #-------------------------------------------------------------------------
 # Define the coverage related test suites:
--- a/test/securedel2.test
+++ b/test/securedel2.test
@ -92,4 +92,3 @@ do_test 1.6.2 {
 } {0}
 finish_test
--- a/test/shared8.test
+++ b/test/shared8.test
@ -110,4 +110,3 @@ do_test 1.8 {
 foreach db {db1 db2 db3 db4} { catch { $db close } }
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test
--- a/test/sharedlock.test
+++ b/test/sharedlock.test
@ -52,4 +52,3 @@ db2 close
 sqlite3_enable_shared_cache $::enable_shared_cache
 finish_test
--- a/test/subquery.test
+++ b/test/subquery.test
@ -241,8 +241,11 @@ do_test subquery-2.5.3.1 {
 } {10.0}
 do_test subquery-2.5.3.2 {
  # Verify that the t4i index was not used in the previous query
-  set ::sqlite_query_plan
+  execsql {
-} {t4 {}}
+    EXPLAIN QUERY PLAN
    SELECT * FROM t4 WHERE x IN (SELECT a FROM t3);
  }
 } {/SCAN TABLE t4 /}
 do_test subquery-2.5.4 {
  execsql {
    DROP TABLE t3;
--- a/test/tester.tcl
+++ b/test/tester.tcl
@ -551,6 +551,9 @@ proc do_test {name cmd expected} {
      fail_test $name
    } else {
      if {[regexp {^~?/.*/$} $expected]} {
        # "expected" is of the form "/PATTERN/" then the result if correct if
        # regular expression PATTERN matches the result.  "~/PATTERN/" means
        # the regular expression must not match.
        if {[string index $expected 0]=="~"} {
          set re [string map {# {[-0-9.]+}} [string range $expected 2 end-1]]
          set ok [expr {![regexp $re $result]}]
@ -558,6 +561,16 @@ proc do_test {name cmd expected} {
          set re [string map {# {[-0-9.]+}} [string range $expected 1 end-1]]
          set ok [regexp $re $result]
        }
      } elseif {[regexp {^~?\*.*\*$} $expected]} {
        # "expected" is of the form "*GLOB*" then the result if correct if
        # glob pattern GLOB matches the result.  "~/GLOB/" means
        # the glob must not match.
        if {[string index $expected 0]=="~"} {
          set e [string range $expected 1 end]
          set ok [expr {![string match $e $result]}]
        } else {
          set ok [string match $expected $result]
        }
      } else {
        set ok [expr {[string compare $result $expected]==0}]
      }
@ -793,9 +806,28 @@ proc finalize_testing {} {
  set nTest [incr_ntest]
  set nErr [set_test_counter errors]
-  puts "$nErr errors out of $nTest tests"
+  set nKnown 0
-  if {$nErr>0} {
+  if {[file readable known-problems.txt]} {
-    puts "Failures on these tests: [set_test_counter fail_list]"
+    set fd [open known-problems.txt]
    set content [read $fd]
    close $fd
    foreach x $content {set known_error($x) 1}
    foreach x [set_test_counter fail_list] {
      if {[info exists known_error($x)]} {incr nKnown}
    }
  }
  if {$nKnown>0} {
    puts "[expr {$nErr-$nKnown}] new errors and $nKnown known errors\
         out of $nTest tests"
  } else {
    puts "$nErr errors out of $nTest tests"
  }
  if {$nErr>$nKnown} {
    puts -nonewline "Failures on these tests:"
    foreach x [set_test_counter fail_list] {
      if {![info exists known_error($x)]} {puts -nonewline " $x"}
    }
    puts ""
  }
  foreach warning [set_test_counter warn_list] {
    puts "Warning: $warning"
--- a/test/tkt-2a5629202f.test
+++ b/test/tkt-2a5629202f.test
@ -46,6 +46,12 @@ do_execsql_test 1.3 {
  SELECT coalesce(b, 'null') || '/' || c FROM t8 x ORDER BY x.b, x.c
 } {null/four null/three a/one b/two}
 do_execsql_test 1.4 {
  DROP INDEX i1;
  CREATE UNIQUE INDEX i1 ON t8(b, c);
  SELECT coalesce(b, 'null') || '/' || c FROM t8 x ORDER BY x.b, x.c
 } {null/four null/three a/one b/two}
 #-------------------------------------------------------------------------
 #
@ -68,4 +74,3 @@ do_test 2.4 {
 } {sort}
 finish_test
--- a/test/tkt-385a5b56b9.test
+++ b/test/tkt-385a5b56b9.test
@ -35,19 +35,19 @@ do_execsql_test 2.0 {
 }
 do_eqp_test 2.1 { SELECT DISTINCT x FROM t2 } {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2x (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2x}
 }
 do_eqp_test 2.2 { SELECT DISTINCT y FROM t2 } {
-  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2y (~1000000 rows)}
+  0 0 0 {SCAN TABLE t2 USING COVERING INDEX t2y}
 }
 do_eqp_test 2.3 { SELECT DISTINCT x, y FROM t2 WHERE y=10 } {
-  0 0 0 {SEARCH TABLE t2 USING INDEX t2y (y=?) (~1 rows)}
+  0 0 0 {SEARCH TABLE t2 USING INDEX t2y (y=?)}
 }
 do_eqp_test 2.4 { SELECT DISTINCT x, y FROM t2 WHERE x=10 } {
-  0 0 0 {SEARCH TABLE t2 USING INDEX t2x (x=?) (~1 rows)}
+  0 0 0 {SEARCH TABLE t2 USING INDEX t2x (x=?)}
 }
 finish_test
--- a/test/tkt-3a77c9714e.test
+++ b/test/tkt-3a77c9714e.test
@ -70,4 +70,3 @@ do_execsql_test 2.2 {
 finish_test
--- a/test/tkt-3fe897352e.test
+++ b/test/tkt-3fe897352e.test
@ -16,9 +16,9 @@
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
-
+
-# The following tests use hex_to_utf16be() and hex_to_utf16le() which 
+# The following tests use hex_to_utf16be() and hex_to_utf16le() which 
-# which are only available if SQLite is built with UTF16 support.
+# which are only available if SQLite is built with UTF16 support.
 ifcapable {!utf16} {
  finish_test
  return
--- a/test/tkt-78e04e52ea.test
+++ b/test/tkt-78e04e52ea.test
@ -44,7 +44,7 @@ do_test tkt-78e04-1.4 {
  execsql {
    EXPLAIN QUERY PLAN SELECT * FROM "" WHERE "" LIKE 'abc%';
  }
-} {0 0 0 {SCAN TABLE  USING COVERING INDEX i1 (~500000 rows)}}
+} {0 0 0 {SCAN TABLE  USING COVERING INDEX i1}}
 do_test tkt-78e04-1.5 {
  execsql {
    DROP TABLE "";
@ -57,12 +57,12 @@ do_test tkt-78e04-2.1 {
    CREATE INDEX "" ON t2(x);
    EXPLAIN QUERY PLAN SELECT * FROM t2 WHERE x=5;
  }
-} {0 0 0 {SEARCH TABLE t2 USING COVERING INDEX  (x=?) (~10 rows)}}
+} {0 0 0 {SEARCH TABLE t2 USING COVERING INDEX  (x=?)}}
 do_test tkt-78e04-2.2 {
  execsql {
    DROP INDEX "";
    EXPLAIN QUERY PLAN SELECT * FROM t2 WHERE x=2;
  }
-} {0 0 0 {SCAN TABLE t2 (~100000 rows)}}
+} {0 0 0 {SCAN TABLE t2}}
 finish_test
--- a/test/tkt-7a31705a7e6.test
+++ b/test/tkt-7a31705a7e6.test
@ -23,4 +23,3 @@ do_execsql_test tkt-7a31705a7e6-1.1 {
  CREATE TABLE t2x (b INTEGER PRIMARY KEY);
  SELECT t1.a FROM ((t1 JOIN t2 ON t1.a=t2.a) AS x JOIN t2x ON x.b=t2x.b) as y;
 } {}
--- a/test/tkt-7bbfb7d442.test
+++ b/test/tkt-7bbfb7d442.test
@ -152,5 +152,3 @@ do_execsql_test 2.3 {
 finish_test
--- a/test/tkt-c48d99d690.test
+++ b/test/tkt-c48d99d690.test
@ -23,4 +23,3 @@ do_test 1.1 {
 do_test 1.2 { execsql VACUUM } {}
 finish_test
--- a/test/tkt-d11f09d36e.test
+++ b/test/tkt-d11f09d36e.test
@ -59,4 +59,3 @@ do_test tkt-d11f09d36e.5 {
 } {ok}
 finish_test
--- a/test/tkt-f3e5abed55.test
+++ b/test/tkt-f3e5abed55.test
@ -114,4 +114,3 @@ if {[permutation]!="inmemory_journal"} {
 finish_test
--- a/test/tkt-f973c7ac31.test
+++ b/test/tkt-f973c7ac31.test
@ -84,4 +84,3 @@ foreach {tn sql} {
 finish_test
--- a/test/tkt3442.test
+++ b/test/tkt3442.test
@ -49,10 +49,10 @@ proc EQP {sql} {
 ifcapable explain {
  do_test tkt3442-1.2 {
    EQP { SELECT node FROM listhash WHERE id='5000' LIMIT 1; }
-  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?) (~1 rows)}}
+  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?)}}
  do_test tkt3442-1.3 {
    EQP { SELECT node FROM listhash WHERE id="5000" LIMIT 1; }
-  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?) (~1 rows)}}
+  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?)}}
 }
@ -61,7 +61,7 @@ ifcapable explain {
 ifcapable explain {
  do_test tkt3442-1.4 {
    EQP { SELECT node FROM listhash WHERE id=5000 LIMIT 1; }
-  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?) (~1 rows)}}
+  } {0 0 0 {SEARCH TABLE listhash USING INDEX ididx (id=?)}}
 }
 do_test tkt3442-1.5 {
  catchsql {
--- a/Show More
+++ b/Show More
`@ -168,4 +168,3 @@ do_test rtree8-5.3 {`


	`finish_test`	`finish_test`
		`@ -1 +1 @@`
			`096ae1d8f9a08f92daedece6b0615f4d22b05023`				`0fe31f60cadc5fe5a9d87e110bfaed5fd026cba1`
`@ -48,5 +48,3 @@ if {$::tcl_platform(platform)=="unix"} {`
	`}`	`}`

	`finish_test`	`finish_test`
`@ -101,4 +101,3 @@ do_test 3.3 {`
	`do_test 3.4 { file size test.db2 } 0`	`do_test 3.4 { file size test.db2 } 0`

	`finish_test`	`finish_test`
`@ -55,4 +55,3 @@ do_faultsim_test 1 -prep {`
	`}`	`}`

	`finish_test`	`finish_test`
`@ -76,4 +76,3 @@ do_test 1.4.4 {`
	`} {SQLITE_OK}`	`} {SQLITE_OK}`

	`finish_test`	`finish_test`
`@ -147,4 +147,3 @@ for {set i 127} {$i >= 0} {incr i -1} {`
	`}`	`}`

	`finish_test`	`finish_test`
`@ -506,4 +506,3 @@ do_execsql_test exclusive-6.5 {`
	`} {exclusive}`	`} {exclusive}`

	`finish_test`	`finish_test`
`@ -143,4 +143,3 @@ if {!$skipwaltests} {`


	`finish_test`	`finish_test`
`@ -248,4 +248,3 @@ do_test filefmt-4.4 {`
	`db2 close`	`db2 close`

	`finish_test`	`finish_test`