From: drh <drh@noemail.net>
Date: Tue, 3 Oct 2017 18:35:57 +0000 (+0000)
Subject: Do not enable SELECT tracing with -DSQLITE_DEBUG.  Require the
X-Git-Tag: version-3.21.0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=997a4deb4edd780d2e491fcab120ac9bba5441b6;p=thirdparty%2Fsqlite.git

Do not enable SELECT tracing with -DSQLITE_DEBUG.  Require the
-DSQLITE_ENABLE_SELECTTRACE compile-time option to enable SELECT tracing.

FossilOrigin-Name: f5c395834c2a776beba6fe172cc4a5e428ce30b9cb4259ef8e440f10455a41e9
---

diff --git a/manifest b/manifest
index a1be774e26..425c460246 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssome\sOK_IF_ALWAYS_TRUE()\smarks\son\soptimization\sbranches\sin\sselect.c.
-D 2017-10-03T17:29:40.582
+C Do\snot\senable\sSELECT\stracing\swith\s-DSQLITE_DEBUG.\s\sRequire\sthe\n-DSQLITE_ENABLE_SELECTTRACE\scompile-time\soption\sto\senable\sSELECT\stracing.
+D 2017-10-03T18:35:57.160
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -464,7 +464,7 @@ F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220e
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a1fd3aa82f967da436164e0728a7d6841651fd0c6e27b9044e0eb9f6c8462e47
-F src/sqliteInt.h 50a509839bae7d27d1a09fe4e74432baa1d63f6e1b39383546cf461721c3572a
+F src/sqliteInt.h c07bc88eca1f59ce73e1f486187d0df4effe67c4579e112dfdd91c159e5c0569
 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
 F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35
 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@ -1655,7 +1655,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 7be760e907274131bcd4acfaff9e72c9c59a05e7d411db3d9afe690fe0d64b4b
-R ce19fff627af42bc467b7af644b3b595
+P 1dd828088d6981dfebf9f4d650dad8431bece4405650c61f90eb8d8f43289b52
+R ff9a44814ead03fb339e5473f4e89eb3
 U drh
-Z ecfbf86cbb40553da9b0819689d116ec
+Z 7ee7c6afb266c430d526e6cc80b0cc29
diff --git a/manifest.uuid b/manifest.uuid
index d144e21c94..bbdc43be85 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1dd828088d6981dfebf9f4d650dad8431bece4405650c61f90eb8d8f43289b52
\ No newline at end of file
+f5c395834c2a776beba6fe172cc4a5e428ce30b9cb4259ef8e440f10455a41e9
\ No newline at end of file
diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 7c39c7b919..a8f1bed512 100644
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -944,7 +944,7 @@ typedef INT16_TYPE LogEst;
 ** SELECTTRACE_ENABLED will be either 1 or 0 depending on whether or not
 ** the Select query generator tracing logic is turned on.
 */
-#if defined(SQLITE_DEBUG) || defined(SQLITE_ENABLE_SELECTTRACE)
+#if defined(SQLITE_ENABLE_SELECTTRACE)
 # define SELECTTRACE_ENABLED 1
 #else
 # define SELECTTRACE_ENABLED 0