Fix an incorrect ALWAYS() macro in vdbeapi.c. Fix the output of a few

test cases that changed due to better error propagation out of reprepare.

FossilOrigin-Name: a8c984c1d6cb6e2fc95a07eb32befeea122e8ed3

diff --git a/manifest b/manifest
index 998fcd42dc492c7e0659353bae846900bb126f4a..21dc9f5c35c6e7fe3fe7c3b3c3eb21684b20a6d8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Remove\san\sunused\svariable\sfrom\srtree.
-D 2010-02-24T18:25:59
+C Fix\san\sincorrect\sALWAYS()\smacro\sin\svdbeapi.c.\s\sFix\sthe\soutput\sof\sa\sfew\ntest\scases\sthat\schanged\sdue\sto\sbetter\serror\spropagation\sout\sof\sreprepare.
+D 2010-02-24T18:40:39
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -217,7 +217,7 @@ F src/vacuum.c 28ee5a4963d16cf2477075d85966c0f461cd79de
 F src/vdbe.c eb8b083191412e89292b864687f86afa28f4dc3f
 F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2
 F src/vdbeInt.h e276691b6835da5c0008cc5beaaecedcd7bdba8e
-F src/vdbeapi.c a8e8b6292864e71998df527f69cc5dde778a96c0
+F src/vdbeapi.c e0398d74af46911033b92088f740582f3c400515
 F src/vdbeaux.c 417ee0c5677188b3b72a0ccdda5668183e28bb51
 F src/vdbeblob.c 5327132a42a91e8b7acfb60b9d2c3b1c5c863e0e
 F src/vdbemem.c aeba77b59f3553d3cc5b72c18a8267c6fba546b9
@@ -277,7 +277,7 @@ F test/cache.test 3ff445c445742a7b6b9ba6e1d62a25263f9424b9
 F test/capi2.test 172c717ed101e78e0798dd21b9896a22366f35b4
 F test/capi3.test 168e2cd66c58c510955b0f299750e4de73b8d952
 F test/capi3b.test 664eb55318132f292f2c436f90906f578cad6b97
-F test/capi3c.test d9d293ce8fd4dc2944ce2dae5718fc7a6184a567
+F test/capi3c.test 493385107dcedfaf4f2b1c3738c8c1fa00362006
 F test/capi3d.test 57d83b690d7364bde02cddbf8339a4b50d80ce23
 F test/cast.test 166951664a0b0a2e0f8fb5997a152490c6363932
 F test/check.test db2b29d557544347d28e25b8406f5d5ecc3d1bc3
@@ -550,7 +550,7 @@ F test/savepoint3.test e328085853b14898d78ceea00dfe7db18bb6a9ec
 F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
 F test/savepoint5.test 0735db177e0ebbaedc39812c8d065075d563c4fd
 F test/savepoint6.test 2df1d093e59e78d688c64eb20e0457aaea7d08f9
-F test/schema.test 23a2909d2b1f8494d28d355c1254f075b0af8ffc
+F test/schema.test 8f7999be894260f151adf15c2c7540f1c6d6a481
 F test/schema2.test 906408621ea881fdb496d878b1822572a34e32c5
 F test/securedel.test 328d2921c0ca49bdd3352e516b0377fc07143254
 F test/select1.test f67ca2dfc05df41c7b86eb32ca409b427a5f43b0
@@ -794,14 +794,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 1a6d4bb130382564093b6370818ae4a7633f4074
-R d7cbaa8b7d7b278e9482fb7d1f098fcd
+P 8e60d3995a1ea940de9751dd3bbd7ef41b0bb00a
+R 6982e34d63d3f7c4c63beeb945356ebf
 U drh
-Z 688d557fd57a83deb71613699a5870da
+Z c4ecc3e66bf0fd4aae2b5b5dd8f1451e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFLhW86oxKgR168RlERAkDjAJ9QKX0HcqzLExmawk0KoyogwLBMlQCcCLE5
-kf1ZeFqoFZCHiKNtKjnTtrc=
-=hvc6
+iD8DBQFLhXKqoxKgR168RlERAv3oAJ4/CLWQPurMHkYouSQ4hYLZQvLwUACfbzJS
+CpVug0wu1S3JGMsgNXNc/uA=
+=PJke
 -----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index 1eb6b3d6e447beefa46cf90ceb377e3472fbda53..0cd4c7fda67af382f171bffabd30a27051e9aef2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8e60d3995a1ea940de9751dd3bbd7ef41b0bb00a
\ No newline at end of file
+a8c984c1d6cb6e2fc95a07eb32befeea122e8ed3
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 26695db018748b0953a3b3e6f211add98316ef50..aac898a82ae49852d6f53b21f021ecc521e4c422 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -334,7 +334,7 @@ static int sqlite3Step(Vdbe *p){
   }
 
   if( p->pc<=0 && p->expired ){
-    if( ALWAYS(p->rc==SQLITE_OK || p->rc==SQLITE_SCHEMA) ){
+    if( p->rc==SQLITE_OK ){
       p->rc = SQLITE_SCHEMA;
     }
     rc = SQLITE_ERROR;

diff --git a/test/capi3c.test b/test/capi3c.test
index 1bcc4373c2a578043de5337758afb54af76c8262..55f4667e15dfbc6d712fcdae01a39c7aa5dcc589 100644 (file)
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -1176,7 +1176,7 @@ do_test capi3c-19.4 {
   sqlite3_reset $STMT
   db eval {DROP TABLE t3}
   sqlite3_step $STMT
-} SQLITE_SCHEMA
+} SQLITE_ERROR
 do_test capi3c-19.4.1 {
   sqlite3_errmsg $DB
 } {no such table: t3}

diff --git a/test/schema.test b/test/schema.test
index 5e9f17573f43c99369c414e59ff2801eab01e3e0..afca39ed60a484b3b3c2ff72e4351c3c26b9eeb0 100644 (file)
--- a/test/schema.test
+++ b/test/schema.test
@@ -376,15 +376,15 @@ do_test schema-13.1 {
     return SQLITE_OK
   }
   sqlite3_step $S
-} {SQLITE_SCHEMA}
+} {SQLITE_AUTH}
 
 do_test schema-13.2 {
   sqlite3_step $S
-} {SQLITE_SCHEMA}
+} {SQLITE_AUTH}
 
 do_test schema-13.3 {
   sqlite3_finalize $S
-} {SQLITE_SCHEMA}
+} {SQLITE_AUTH}
 
 }