Revise variable declaration moved in the previous check-in so sqlite3VdbeReset()...

FossilOrigin-Name: 63d1b425ee6a7d2ae782b738d81d98e39342ae7fe7c4fd217a28a0bdafe4f222

diff --git a/manifest b/manifest
index 98e6126f230f576d5cbc8a1634506acee41c107a..b750b7d76613960fcc787b98287d5416a89eecba 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sC99-style\svariable\sdeclaration\sissue\sseen\swith\solder\sversions\sof\sMSVC.
-D 2017-10-07T23:31:33.678
+C Revise\svariable\sdeclaration\smoved\sin\sthe\sprevious\scheck-in\sso\ssqlite3VdbeReset()\sis\sconsistent\swith\ssqlite3VdbeRewind().
+D 2017-10-07T23:35:40.530
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -530,7 +530,7 @@ F src/vdbe.c 176c0897af0aedecd3abc9afaf7fa80eaa7cf5eaf62583de256a9961df474373
 F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97
 F src/vdbeInt.h 1fe00770144c12c4913128f35262d11527ef3284561baaab59b947a41c08d0d9
 F src/vdbeapi.c 9c670ca0dcc1cd86373aa353b747b26fe531ca5cd4331690c611d1f03842e2a1
-F src/vdbeaux.c 15368cf8463c31ecf49de4ccf82b8d41848715edc02298a8f9f61a54c8352d03
+F src/vdbeaux.c c423065d50cee24bc8cba57764f5e9869a1bb920c50907f5dd363ebd7c5aef82
 F src/vdbeblob.c 635a79b60340a6a14a622ea8dcb081f0a66b1ac3836870c587f232eec08c0286
 F src/vdbemem.c 5c1533bf756918b4e46b2ed2bb82c29c7c651e1e37bbd0a0d8731a68787598ff
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
@@ -1656,7 +1656,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 702b137aa4f76543647e177beeb1ca2b3cd18c61021c78880e9aa8656f341d65
-R b0502fb9406ba19f89441a8efa35216f
+P 14b181e862bd742555c51b87fab59d6f8f6602fe2c18dde3ef3b020779912419
+R a3d97a8c85e28378254e6db374dde854
 U mistachkin
-Z 1e54f1aa1bf639c462d6cc376839202e
+Z ee383b61e8263625abf43191677f405e

diff --git a/manifest.uuid b/manifest.uuid
index 499518f3809e0d8c77759c3e9ec2290f682f2798..7d4e9a9ed247c19234d226e576207076c1129db5 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-14b181e862bd742555c51b87fab59d6f8f6602fe2c18dde3ef3b020779912419
\ No newline at end of file
+63d1b425ee6a7d2ae782b738d81d98e39342ae7fe7c4fd217a28a0bdafe4f222
\ No newline at end of file

diff --git a/src/vdbeaux.c b/src/vdbeaux.c
index 88b38f77bd34075eaf30d1063847d604d659d3bd..6ec8b30680ae874423b1e936d95ab62f42712b8a 100644 (file)
--- a/src/vdbeaux.c
+++ b/src/vdbeaux.c
@@ -2868,7 +2868,7 @@ static void vdbeInvokeSqllog(Vdbe *v){
 ** VDBE_MAGIC_INIT.
 */
 int sqlite3VdbeReset(Vdbe *p){
-#ifdef SQLITE_DEBUG
+#if defined(SQLITE_DEBUG) || defined(VDBE_PROFILE)
   int i;
 #endif
 
@@ -2918,7 +2918,6 @@ int sqlite3VdbeReset(Vdbe *p){
   {
     FILE *out = fopen("vdbe_profile.out", "a");
     if( out ){
-      int i;
       fprintf(out, "---- ");
       for(i=0; i<p->nOp; i++){
         fprintf(out, "%02x", p->aOp[i].opcode);