Fix to check-in [f221f31eff]: Make sure local variable rc is declared even

when compiled without SQLITE_DEBUG.

FossilOrigin-Name: 7a9a35327c55452e858335933ce11669fc888aeb

diff --git a/manifest b/manifest
index 939f00c6ae70c62d775f50727020eb146a963403..cf262eefdf158dce38bbc260a187f3666d56313d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,8 @@
-C Add\stest\scase\sfor\sthe\sobscure\scorruption\sdetection\sadded\sby\sthe\sprevious\scommit.
-D 2009-12-05T18:16:11
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+C Fix\sto\scheck-in\s[f221f31eff]:\s\sMake\ssure\slocal\svariable\src\sis\sdeclared\seven\nwhen\scompiled\swithout\sSQLITE_DEBUG.
+D 2009-12-05T18:34:09
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -108,7 +111,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 744e98359dfc79fed43e8dec911e33e108b06aae
 F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
 F src/btmutex.c 96a12f50f7a17475155971a241d85ec5171573ff
-F src/btree.c bc0393e5b9e3d182706315a308f84a6a4fa388dd
+F src/btree.c 92de746507c4721f669f07299a1a59767928fbc7
 F src/btree.h 7944a9dac59eb3e541aad45fd2747f1051e7c63d
 F src/btreeInt.h 54f4245decd0409ea52cf9aee422d3d761d7ac10
 F src/build.c a48e74d24897100017d39ceba5de255e53ec9488
@@ -776,7 +779,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 0f9b17a6da42b4da667bbbc00f713effe92a66b5
-R fb94845ed98c394aab22f4eeec2551a7
-U dan
-Z a0458738b3e670f2ae299b61dcf4c17d
+P f221f31efff83651b9af295b98cfe98bcba3ad54
+R b549c27ca72ac44e6657d205834c76f6
+U drh
+Z 95584794328928263ec6a21642e1a324
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFLGqekoxKgR168RlERAu1uAJ904gXhoqKU7OrxFAbR2obwNiS6ggCeNNu1
+HULei/GriWsYUf7WTMJ/HfA=
+=g6iZ
+-----END PGP SIGNATURE-----

diff --git a/manifest.uuid b/manifest.uuid
index b04652e1dd3b5d768dfe142afd41c4f849cab276..15eb721fb34696bed7dfed0b4e84aedbe2e4876a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f221f31efff83651b9af295b98cfe98bcba3ad54
\ No newline at end of file
+7a9a35327c55452e858335933ce11669fc888aeb
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 17188cda0fa8ccbe119be219b714210f3c893055..3952f9c32dd98964df9a9f4d256d13855c44ad20 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -5579,7 +5579,7 @@ static void copyNodeContent(MemPage *pFrom, MemPage *pTo, int *pRC){
     u8 * const aTo = pTo->aData;
     int const iFromHdr = pFrom->hdrOffset;
     int const iToHdr = ((pTo->pgno==1) ? 100 : 0);
-    TESTONLY(int rc;)
+    int rc;
     int iData;