Update misc7.test to account for EQP changes.

FossilOrigin-Name: 917af565ac0c71c14fcba56632e687ed938a856c

diff --git a/configure b/configure
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/install-sh b/install-sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/manifest b/manifest
index 60ec83d9b10cd34ccc33da0aa464aad6edd2fcfb..64c5f7fa6047f466f8d83cbc6496c59515e24e66 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Changed\smultiplex\sshim's\sxFilesize\sto\sreturn\san\serror\son\smismatched\schunk\ssize.\nAdded\stest\sof\ssame.
-D 2010-12-01T23:42:43
+C Update\smisc7.test\sto\saccount\sfor\sEQP\schanges.
+D 2010-12-02T06:08:53
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4547616ad2286053af6ccccefa242dc925e49bf0
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -22,7 +22,7 @@ F art/src_logo.gif 9341ef09f0e53cd44c0c9b6fc3c16f7f3d6c2ad9
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure daed6cfdb4c1449a4335b3eeddc0d836e33fb54e
+F configure daed6cfdb4c1449a4335b3eeddc0d836e33fb54e x
 F configure.ac 699040cc9abb7465dca5a2972bc89d227fd8f734
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@ -97,7 +97,7 @@ F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea
 F ext/rtree/sqlite3rtree.h 1af0899c63a688e272d69d8e746f24e76f10a3f0
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
-F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
+F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F main.mk 05d0f3475dd331896bd607cfb45c5e21b94589ad
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
@@ -563,7 +563,7 @@ F test/misc3.test 72c5dc87a78e7865c5ec7a969fc572913dbe96b6
 F test/misc4.test 9c078510fbfff05a9869a0b6d8b86a623ad2c4f6
 F test/misc5.test 45b2e3ed5f79af2b4f38ae362eaf4c49674575bd
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test c5f4e6a82e04e71820c0f9f64f6733f04c8ae0ae
+F test/misc7.test 29032efcd3d826fbd409e2a7af873e7939f4a4e3
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/multiplex.test 6ceff2b3a5d43f849c267f66bb81adbaec1d5eca
 F test/mutex1.test 5b71777fc127509cd257910c8db799de557a02de
@@ -893,7 +893,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 80de240a329d8df4aa1e437711bf6ed889d92c5f
-R 9d689007bef74be6a6722ba1d7a17c9d
-U shaneh
-Z adfe35934b96a87c5f43ce195a5410c9
+P 6818c6e42faf233afa6b30799c5b425aa42d0783
+R d27973dacf176c8c2e30469ec9d78ab2
+U dan
+Z 428e203c830e9dddb4981febf0a28597

diff --git a/manifest.uuid b/manifest.uuid
index aa6a0a45319b288c12dbda314e7ccf9e48730fe0..57b7e900c661bfb37de89638cb7ceacc71402ba2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6818c6e42faf233afa6b30799c5b425aa42d0783
\ No newline at end of file
+917af565ac0c71c14fcba56632e687ed938a856c
\ No newline at end of file

diff --git a/test/misc7.test b/test/misc7.test
index c08ceefad9c3acf8ea1a7d0454b9f363edf80659..7d2ba6e8527958e48e4b73614234e0905d0a964e 100644 (file)
--- a/test/misc7.test
+++ b/test/misc7.test
@@ -259,24 +259,22 @@ file delete -force test.db-journal
 sqlite3 db test.db
 
 ifcapable explain {
-  do_test misc7-14.1 {
-    execsql {
-      CREATE TABLE abc(a PRIMARY KEY, b, c);
-    }
-    execsql {
-      EXPLAIN QUERY PLAN SELECT * FROM abc AS t2 WHERE rowid = 1;
-    }
-  } {0 0 {TABLE abc AS t2 USING PRIMARY KEY}}
-  do_test misc7-14.2 {
-    execsql {
-      EXPLAIN QUERY PLAN SELECT * FROM abc AS t2 WHERE a = 1;
-    }
-  } {0 0 {TABLE abc AS t2 WITH INDEX sqlite_autoindex_abc_1}}
-  do_test misc7-14.3 {
-    execsql {
-      EXPLAIN QUERY PLAN SELECT * FROM abc AS t2 ORDER BY a;
-    }
-  } {0 0 {TABLE abc AS t2 WITH INDEX sqlite_autoindex_abc_1 ORDER BY}}
+  do_execsql_test misc7-14.1 {
+    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)}
+  }
+  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)}
+  }
+  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)}
+  }
 }
 
 db close