From: drh <drh@noemail.net>
Date: Mon, 25 Jul 2016 02:42:22 +0000 (+0000)
Subject: Evidence marks and code reformatting for SQLITE_TRACE_STMT operation.
X-Git-Tag: version-3.14.0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fe63bfb93ebccf1f00b8a8e1c9d2ed82f0bd86f;p=thirdparty%2Fsqlite.git

Evidence marks and code reformatting for SQLITE_TRACE_STMT operation.

FossilOrigin-Name: e1e022383114525241454f63ea8b9768fb7ec657
---

diff --git a/manifest b/manifest
index 819e488286..9f9642d316 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Change\sSQLITE_TRACE_STMT\sto\sreturn\sunexpanded\sSQL\stext\sin\sthe\sX\sargument.\nAdd\sdocumentation\son\show\sand\swhen\sto\suse\ssqlite3_expanded_sql(P)\sto\scompute\nthe\sexpanded\stext\sfor\slegacy\ssqlite3_trace()\scompatibility.
-D 2016-07-25T02:31:48.358
+C Evidence\smarks\sand\scode\sreformatting\sfor\sSQLITE_TRACE_STMT\soperation.
+D 2016-07-25T02:42:22.338
 F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@ -449,7 +449,7 @@ F src/update.c 4f05ea8cddfa367d045e03589756c02199e8f9bd
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d
 F src/vacuum.c 544ec90a66a4b0460b7c1baeadbc21b45e6ca0b6
-F src/vdbe.c 7718d72427fd3abae6603a7a225e3eec12137d4a
+F src/vdbe.c ea260b61e73b11a71e70b28a8e25866e2899e5da
 F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10
 F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d
 F src/vdbeapi.c c3f6715a99995c11748ecad91d25e93fd9fc390b
@@ -1507,7 +1507,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 1c5baae3c545096a29a093f7d4387771f1db507c
-R 287171615483ae1144a14be35a6974e0
+P 163e15229d837a5471007cffb8d41faafd081737
+R 54f5b446e83fdc6cfb9e4fb83bcacd6b
 U drh
-Z fb84b0dd7373ed024b44202f95be044f
+Z cd50dce290ecc3f8f1fad92c2e3b32fc
diff --git a/manifest.uuid b/manifest.uuid
index 6cdf0fb62f..be4af97fc7 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-163e15229d837a5471007cffb8d41faafd081737
\ No newline at end of file
+e1e022383114525241454f63ea8b9768fb7ec657
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index d198d1ff8c..5d21ad064c 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -6782,12 +6782,19 @@ case OP_MaxPgcnt: {            /* out2 */
 */
 case OP_Init: {          /* jump */
   char *zTrace;
-  char *z;
 
-#ifndef SQLITE_OMIT_TRACE
   /* If the P4 argument is not NULL, then it must be an SQL comment string.
-  ** The "--" string is broken up to prevent false-positives with srcck1.c */
+  ** The "--" string is broken up to prevent false-positives with srcck1.c.
+  **
+  ** This assert() provides evidence for:
+  ** EVIDENCE-OF: R-50676-09860 The callback can compute the same text that
+  ** would have been returned by the legacy sqlite3_trace() interface by
+  ** using the X argument when X begins with "--" and invoking
+  ** sqlite3_expanded_sql(P) otherwise.
+  */
   assert( pOp->p4.z==0 || strncmp(pOp->p4.z, "-" "- ", 3)==0 );
+
+#ifndef SQLITE_OMIT_TRACE
   if( (db->mTrace & (SQLITE_TRACE_STMT|SQLITE_TRACE_LEGACY))!=0
    && !p->doingRerun
    && (zTrace = (pOp->p4.z ? pOp->p4.z : p->zSql))!=0
@@ -6795,7 +6802,7 @@ case OP_Init: {          /* jump */
 #ifndef SQLITE_OMIT_DEPRECATED
     if( db->mTrace & SQLITE_TRACE_LEGACY ){
       void (*x)(void*,const char*) = (void(*)(void*,const char*))db->xTrace;
-      z = sqlite3VdbeExpandSql(p, zTrace);
+      char *z = sqlite3VdbeExpandSql(p, zTrace);
       x(db->pTraceArg, z);
       sqlite3_free(z);
     }else