Update tests in whereD.test to account for the change in the previous commit.

FossilOrigin-Name: da49700ca148d91e1b8863c2eb6ee79144e83ac9

diff --git a/manifest b/manifest
index 55283a01c907056953dd3bb0519a4a0d15b2bab7..378036e42ae470467eadcca98cd672f20734cc94 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\sassume\san\sindex\scontains\sunique\sentries\sunless\sit\sis\sdeclared\sUNIQUE\sand\sNOT\sNULL\sis\sspecified\sfor\sall\scolumns.\sFix\sfor\s[7b4fee9f6c].
-D 2015-04-11T11:44:27.202
+C Update\stests\sin\swhereD.test\sto\saccount\sfor\sthe\schange\sin\sthe\sprevious\scommit.
+D 2015-04-11T11:53:39.984
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1171,7 +1171,7 @@ F test/where9.test 729c3ba9b47e8f9f1aab96bae7dad2a524f1d1a2
 F test/whereA.test 4d253178d135ec46d1671e440cd8f2b916aa6e6b
 F test/whereB.test 0def95db3bdec220a731c7e4bec5930327c1d8c5
 F test/whereC.test d6f4ecd4fa2d9429681a5b22a25d2bda8e86ab8a
-F test/whereD.test fd9120e262f9da3c45940f52aefeef4d15b904e5
+F test/whereD.test 9eba1f9b18e5b19a0b0bcaae5e8c037260195f2b
 F test/whereE.test b3a055eef928c992b0a33198a7b8dc10eea5ad2f
 F test/whereF.test 5b2ba0dbe8074aa13e416b37c753991f0a2492d7
 F test/whereG.test 69f5ec4b15760a8c860f80e2d55525669390aab3
@@ -1250,7 +1250,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 9e139afd92116ebc593114ed63b57c8f469653f6
-R cb22563425ec3fdd92f04af95791ab8d
+P e3b1f625518edc0e925116668dca5d25c3232b59
+R 7890e1f1fdfc32123135ecc1b57978ea
 U dan
-Z a8ae95b3c171e79da5c1dd8c91dd053d
+Z 68688658f813a09121106ccdd49ce975

diff --git a/manifest.uuid b/manifest.uuid
index 1f18603ac6772e565d22025ddca3422df82d0a65..f330c7ddcf2c83a0a23a9163af9398ae009a37c4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e3b1f625518edc0e925116668dca5d25c3232b59
\ No newline at end of file
+da49700ca148d91e1b8863c2eb6ee79144e83ac9
\ No newline at end of file

diff --git a/test/whereD.test b/test/whereD.test
index db993040b014cec18af943fd4b96f93f77edcca8..17fdac7017c5d592870d4040a65a2cbe3fe00c15 100644 (file)
--- a/test/whereD.test
+++ b/test/whereD.test
@@ -129,11 +129,11 @@ do_execsql_test 3.0 {
 
 do_searchcount_test 3.1 {
   SELECT a, b FROM t3 WHERE (a=1 AND b='one') OR (a=2 AND b='two')
-} {1 one 2 two search 2}
+} {1 one 2 two search 4}
 
 do_searchcount_test 3.2 {
   SELECT a, c FROM t3 WHERE (a=1 AND b='one') OR (a=2 AND b='two')
-} {1 i 2 ii search 4}
+} {1 i 2 ii search 6}
 
 do_searchcount_test 3.4.1 {
   SELECT y FROM t4 WHERE x='a'
@@ -142,24 +142,24 @@ do_searchcount_test 3.4.2 {
   SELECT a, b FROM t3 WHERE 
         (a=1 AND b=(SELECT y FROM t4 WHERE x='a')) 
      OR (a=2 AND b='two')
-} {1 one 2 two search 4}
+} {1 one 2 two search 6}
 do_searchcount_test 3.4.3 {
   SELECT a, b FROM t3 WHERE 
         (a=2 AND b='two')
      OR (a=1 AND b=(SELECT y FROM t4 WHERE x='a')) 
-} {2 two 1 one search 4}
+} {2 two 1 one search 6}
 do_searchcount_test 3.4.4 {
   SELECT a, b FROM t3 WHERE 
         (a=2 AND b=(SELECT y FROM t4 WHERE x='b')) 
      OR (a=1 AND b=(SELECT y FROM t4 WHERE x='a')) 
-} {2 two 1 one search 6}
+} {2 two 1 one search 8}
 
 do_searchcount_test 3.5.1 {
   SELECT a, b FROM t3 WHERE (a=1 AND b='one') OR rowid=4
-} {1 one 2 two search 2}
+} {1 one 2 two search 3}
 do_searchcount_test 3.5.2 {
   SELECT a, c FROM t3 WHERE (a=1 AND b='one') OR rowid=4
-} {1 i 2 ii search 2}
+} {1 i 2 ii search 3}
 
 # Ticket [d02e1406a58ea02d] (2012-10-04)
 # LEFT JOIN with an OR in the ON clause causes segfault