From: dan <dan@noemail.net>
Date: Tue, 3 Jun 2014 11:32:38 +0000 (+0000)
Subject: Add a test to double-check that [1cbe7a0883] did not affect anything.
X-Git-Tag: version-3.8.5~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a0b8b124bdc75c6af5c170edb0f7045d246ff9c;p=thirdparty%2Fsqlite.git

Add a test to double-check that [1cbe7a0883] did not affect anything.

FossilOrigin-Name: c6b512a724aebcd084aad2a80d020b95773b3012
---

diff --git a/manifest b/manifest
index c9a894b1f1..0fb3575a64 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sWHERE_LIKELIHOOD\sbit,\sas\sit\sdoes\snot\sseem\sto\seffect\sany\sresult.
-D 2014-06-02T21:00:34.572
+C Add\sa\stest\sto\sdouble-check\sthat\s[1cbe7a0883]\sdid\snot\saffect\sanything.
+D 2014-06-03T11:32:38.148
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -409,7 +409,7 @@ F test/corruptF.test be9fde98e4c93648f1ba52b74e5318edc8f59fe4
 F test/corruptG.test 1ab3bf97ee7bdba70e0ff3ba2320657df55d1804
 F test/corruptH.test 88ed71a086e13591c917aac6de32750e7c7281cb
 F test/corruptI.test b3e4203d420490fc3d3062711597bc1dea06a789
-F test/cost.test 04842adec34311d70c3f3c5fd698b22be54138fd
+F test/cost.test 19d314526616ce4473eb4e4e450fcb94499ce318
 F test/count.test 42a251178e32f617eda33f76236a7f79825a50b5
 F test/coveridxscan.test cdb47d01acc4a634a34fd25abe85189e0d0f1e62
 F test/crash.test fb9dc4a02dcba30d4aa5c2c226f98b220b2b959f
@@ -1173,7 +1173,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 75ff459b06e1a5c180d316d227ce2f73c99a1f52
-R 48bae0e8ed57c3dbc05f2ecb6659ff4f
-U drh
-Z ba8e8519c6b4bbb2b73e8471af00ac41
+P 1cbe7a0883e081611a50524517d70e0b6c5199d2
+R 88f7e0a0a79929d11635773b81944233
+U dan
+Z 719afb30fb3906ea3990e2a028510bfb
diff --git a/manifest.uuid b/manifest.uuid
index 9feaf6cdcf..de0da9651b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1cbe7a0883e081611a50524517d70e0b6c5199d2
\ No newline at end of file
+c6b512a724aebcd084aad2a80d020b95773b3012
\ No newline at end of file
diff --git a/test/cost.test b/test/cost.test
index c413c3cdfa..92fff9c888 100644
--- a/test/cost.test
+++ b/test/cost.test
@@ -244,6 +244,47 @@ foreach {tn nTerm nRow} {
 }
 
 
+#-------------------------------------------------------------------------
+#
+
+ifcapable stat4 {
+  do_execsql_test 10.1 {
+    CREATE TABLE t6(a, b, c);
+    CREATE INDEX t6i1 ON t6(a, b);
+    CREATE INDEX t6i2 ON t6(c);
+  }
+  
+  do_test 10.2 {
+    for {set i 0} {$i < 16} {incr i} {
+      execsql { INSERT INTO t6 VALUES($i%4, 'xyz', $i%8) }
+    }
+    execsql ANALYZE
+  } {}
+
+  do_eqp_test 10.3 {
+    SELECT rowid FROM t6 WHERE a=0 AND c=0
+  } {
+    0 0 0 {SEARCH TABLE t6 USING INDEX t6i2 (c=?)}
+  }
+
+  do_eqp_test 10.4 {
+    SELECT rowid FROM t6 WHERE a=0 AND b='xyz' AND c=0
+  } {
+    0 0 0 {SEARCH TABLE t6 USING INDEX t6i2 (c=?)}
+  }
+
+  do_eqp_test 10.5 {
+    SELECT rowid FROM t6 WHERE likelihood(a=0, 0.1) AND c=0
+  } {
+    0 0 0 {SEARCH TABLE t6 USING INDEX t6i1 (a=?)}
+  }
+
+  do_eqp_test 10.6 {
+    SELECT rowid FROM t6 WHERE likelihood(a=0, 0.1) AND b='xyz' AND c=0
+  } {
+    0 0 0 {SEARCH TABLE t6 USING INDEX t6i1 (a=? AND b=?)}
+  }
+}
 
 finish_test