Reorder variable declarations in the previous check-in to avoid putting code

before declarations when not testing.

FossilOrigin-Name: d1fe8ab4a176180053d35300ad0540a27c6cd76d

diff --git a/manifest b/manifest
index 957ae13e82ede4ce51d45942d444e53fafdf45e2..237b9ae23083a6e3e1b8554e8c2eeee72ccaa757 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Ensure\sthe\scorrect\serror\scode\sis\sreturned\sif\san\sattempt\sto\sparse\sa\sdatabase\sschema\smade\sby\san\sATTACH\sstatement\sfails.
-D 2010-07-06T07:36:18
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Reorder\svariable\sdeclarations\sin\sthe\sprevious\scheck-in\sto\savoid\sputting\scode\nbefore\sdeclarations\swhen\snot\stesting.
+D 2010-07-06T09:29:01
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -163,7 +166,7 @@ F src/pcache.c 1e9aa2dbc0845b52e1b51cc39753b6d1e041cb07
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 3a7c28f46a61b43ff0b5c087a7983c154f4b264c
 F src/pragma.c 423865323a4074f1e0d4ab02af0be014653e8863
-F src/prepare.c 48105b1a6082ac4f47cd6ebebe3678284733e1ea
+F src/prepare.c f045aeff869d6409a2eae2fe08f7dc2df9528195
 F src/printf.c 5f5b65a83e63f2096a541a340722a509fa0240a7
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 1c0f32b64f8e3f555fe1f732f9d6f501a7f05706
@@ -830,7 +833,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P ec35f25403744f7441ac5ae1486b84d8ebc13e98
-R 6f882aa18788a523ea19d9f06c59ec5f
-U dan
-Z 4ac3c8c3cdfa6e85afde2c4c5d30b8ea
+P c272196115ab3926e56b6f4183ec127e3f98ef9c
+R 36e64364c33ae6390aff87796680a1ef
+U drh
+Z 359e841bb322bbf1a5d2b9a34fa1d68c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFMMvdgoxKgR168RlERAp97AJ9cZOsVDpKBxw2XQPV7Cn6BDfbBuQCbB6lc
+4+IvblymbnuQ9fk+WLoyA64=
+=QJu1
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index ffd60bbeca047517e0e593847b159a4c4c349338..566c2dca7eca039020adfca596193b71c6762a0b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c272196115ab3926e56b6f4183ec127e3f98ef9c
\ No newline at end of file
+d1fe8ab4a176180053d35300ad0540a27c6cd76d
\ No newline at end of file

diff --git a/src/prepare.c b/src/prepare.c
index 5a861a1bdbb40ffb2214a13b27067ccc072c4839..e51000120c24cb5569e6f85136b59c67d2fb41df 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -73,9 +73,9 @@ int sqlite3InitCallback(void *pInit, int argc, char **argv, char **NotUsed){
     ** or executed.  All the parser does is build the internal data
     ** structures that describe the table, index, or view.
     */
-    TESTONLY(int rcp);            /* Return code from sqlite3_prepare() */
     int rc;
     sqlite3_stmt *pStmt;
+    TESTONLY(int rcp);            /* Return code from sqlite3_prepare() */
 
     assert( db->init.busy );
     db->init.iDb = iDb;