Import SQLite 3.8.7.4.

third_party/sqlite/src/test/unordered.test

Index: third_party/sqlite/src/test/unordered.test
diff --git a/third_party/sqlite/src/test/unordered.test b/third_party/sqlite/src/test/unordered.test
index ca4beacac220d5cf08b4984bc589ebbd23836a83..147e91f0d97318e37d688fe03c7e566dbcf116a3 100644
--- a/third_party/sqlite/src/test/unordered.test
+++ b/third_party/sqlite/src/test/unordered.test
@@ -31,32 +31,37 @@ do_execsql_test 1.0 {
 } {}
 
 foreach idxmode {ordered unordered} {
+  catchsql { DELETE FROM sqlite_stat2 }
+  catchsql { DELETE FROM sqlite_stat3 }
   if {$idxmode == "unordered"} {
     execsql { UPDATE sqlite_stat1 SET stat = stat || ' unordered' }
-    db close
-    sqlite3 db test.db
   }
+  db close
+  sqlite3 db test.db
   foreach {tn sql r(ordered) r(unordered)} {
     1   "SELECT * FROM t1 ORDER BY a"
-        {0 0 0 {SCAN TABLE t1 USING INDEX i1 (~128 rows)}}
-        {0 0 0 {SCAN TABLE t1 (~128 rows)} 0 0 0 {USE TEMP B-TREE FOR ORDER BY}}
-    2   "SELECT * FROM t1 WHERE a >?"
-        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?) (~32 rows)}}
-        {0 0 0 {SCAN TABLE t1 (~42 rows)}}
+        {0 0 0 {SCAN TABLE t1 USING INDEX i1}}
+        {0 0 0 {SCAN TABLE t1} 0 0 0 {USE TEMP B-TREE FOR ORDER BY}}
+    2   "SELECT * FROM t1 WHERE a > 100"
+        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a>?)}}
+        {0 0 0 {SCAN TABLE t1}}
     3   "SELECT * FROM t1 WHERE a = ? ORDER BY rowid"
-        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~1 rows)}}
-        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~1 rows)} 
+        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}}
+        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)} 
          0 0 0 {USE TEMP B-TREE FOR ORDER BY}}
     4   "SELECT max(a) FROM t1"
-        {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1 (~1 rows)}}
-        {0 0 0 {SEARCH TABLE t1 (~1 rows)}}
+        {0 0 0 {SEARCH TABLE t1 USING COVERING INDEX i1}}
+        {0 0 0 {SEARCH TABLE t1}}
     5   "SELECT group_concat(b) FROM t1 GROUP BY a"
-        {0 0 0 {SCAN TABLE t1 USING INDEX i1 (~128 rows)}}
-        {0 0 0 {SCAN TABLE t1 (~128 rows)} 0 0 0 {USE TEMP B-TREE FOR GROUP BY}}
+        {0 0 0 {SCAN TABLE t1 USING INDEX i1}}
+        {0 0 0 {SCAN TABLE t1} 0 0 0 {USE TEMP B-TREE FOR GROUP BY}}
 
     6   "SELECT * FROM t1 WHERE a = ?"
-        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~1 rows)}}
-        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?) (~1 rows)}}
+        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}}
+        {0 0 0 {SEARCH TABLE t1 USING INDEX i1 (a=?)}}
+    7   "SELECT count(*) FROM t1"
+        {0 0 0 {SCAN TABLE t1 USING COVERING INDEX i1}}
+        {0 0 0 {SCAN TABLE t1}}
   } {
     do_eqp_test 1.$idxmode.$tn $sql $r($idxmode)
   }