A better fix for the sqlite3_trace() problem.

Ticket [11d5aa455e0d98f3c1e6a]

FossilOrigin-Name: 44d5bd4cc3f76e9a151ba0abae1092bd184af264

diff --git a/manifest b/manifest
index c307f54e8f250ebb2d2e3e6b942b053a4b31134f..d226fa4f962612f6fc9c30c29b889341875cd452 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\sthe\ssqlite3_trace()\scallback\sis\sinvoked,\seven\sif\sthe\sprepared\nstatement\swas\smarked\s"expired"\sbefore\sit\sever\sentered\ssqlite3_step().\nTicket\s[11d5aa455e0d98f3c1e6a08].
-D 2014-08-19T20:27:40.455
+C A\sbetter\sfix\sfor\sthe\ssqlite3_trace()\sproblem.\nTicket\s[11d5aa455e0d98f3c1e6a]
+D 2014-08-19T20:41:36.374
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -286,7 +286,7 @@ F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
 F src/vdbe.c f7f4066e4d6e3858878d76ce9288ea603e12ddf6
 F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8
 F src/vdbeInt.h f5513f2b5ac1e2c5128996c7ea23add256a301df
-F src/vdbeapi.c ce75e452dfd9c6ba4f8c6c76be6399c88bce3142
+F src/vdbeapi.c 7858d7e7cd23267d3fbca18e3a28cce8e0d162a8
 F src/vdbeaux.c 25d62ef82cf1be2a1255eacac636fa0d943d8b3d
 F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
 F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394
@@ -1186,7 +1186,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P d09d63c07748839e9b778a769b183bdd614c6c13
-R dc4a84c1e3dbc4c500aead2f870904cc
+P 0d4d3df4bc5e75ce1543b5539a1e9e279d2a062f
+R 3e9fe87a97e756aac5d53e0b321cfb1c
 U drh
-Z 8ee9013dcfb943fe42c807d90f81accd
+Z dae8e8935ea979fe699fbe5ad58485b9

diff --git a/manifest.uuid b/manifest.uuid
index b804f56674379b429ebc75a014f4ba71c9a38d47..270766200fd7750e984c1a1948e20bf489b6b88e 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0d4d3df4bc5e75ce1543b5539a1e9e279d2a062f
\ No newline at end of file
+44d5bd4cc3f76e9a151ba0abae1092bd184af264
\ No newline at end of file

diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 568f67296c633be9345dfd2499800eafacc5b60a..f6cc2d8c0518d484db877584af561e921d796ea2 100644 (file)
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -518,7 +518,7 @@ int sqlite3_step(sqlite3_stmt *pStmt){
     rc2 = rc = sqlite3Reprepare(v);
     if( rc!=SQLITE_OK) break;
     sqlite3_reset(pStmt);
-    v->doingRerun = savedPc>=0;
+    if( savedPc>=0 ) v->doingRerun = 1;
     assert( v->expired==0 );
   }
   if( rc2!=SQLITE_OK ){