Fix the SELECTTRACE_ENABLE macro so that it doesn't cause problems for

testfixture.  Add new SELECTTRACE() calls.

FossilOrigin-Name: f1ba68f131d2f03e4a7bc50cde23a7609d384279

diff --git a/manifest b/manifest
index fd7616c7ee28110d0e0d0ac2b61cf4f105af2101..70f1c0adaf7c40fc85575d7aa43349b71e9bb848 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\sSELECT\squery\splanning\stracing\swhen\scompiled\swith\s\nSQLITE_ENABLE_SELECTTRACE\sand\seither\sSQLITE_DEBUG\sor\sSQLITE_TEST.
-D 2014-09-20T18:18:33.584
+C Fix\sthe\sSELECTTRACE_ENABLE\smacro\sso\sthat\sit\sdoesn't\scause\sproblems\sfor\ntestfixture.\s\sAdd\snew\sSELECTTRACE()\scalls.
+D 2014-09-20T20:24:49.725
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -180,7 +180,7 @@ F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
 F src/ctime.c 16cd19215d9fd849ee2b7509b092f2e0bbd6a958
 F src/date.c 57a7f9ba9f6b4d5268f5e411739066a611f99036
 F src/delete.c fae81cc2eb14b75267d4f47d3cfc9ae02aae726f
-F src/expr.c 19392d98e089640c3336e65b4254cc337efef7d1
+F src/expr.c 51dfaa60c0ec9db231535c98ae9ad5ab1409fd88
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c da985ae673efef2c712caef825a5d2edb087ead7
 F src/func.c 1629ccdd8ef3f19d7accc9d9287190489469ff81
@@ -226,12 +226,12 @@ F src/printf.c 3a47f526b173813d9a7f4e7044007771ba68cde1
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
-F src/select.c 4e00e042994ae38e60576921f78e45311eead49e
+F src/select.c a2aac0a26b122b057f02464d6bfeeae3063583e7
 F src/shell.c dad23987c34faddb061a339da3e92e05ccc6935e
 F src/sqlite.h.in 8b018219ce988913e5977d5de9ab4beb33be23b6
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
-F src/sqliteInt.h 59b0796cd2fa201510ae9850b3b407fa9f997512
+F src/sqliteInt.h 1020906859d2c369d214fd43f52c94385bbd38cc
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 2e99ef7ef16187e17033d9398dc962ce22dab5cb
@@ -1198,7 +1198,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 59e2c9df02d7e988c5ad44c560ead1e5288b12e7
-R e5319fc7a5c9cf5efe2dc73e6ab8c7e0
+P cbe0cf9ddf46f0a678c85d49bfa74e3b7712e1a1
+R 0e38789ee4b65d4c643d61f203d35efb
 U drh
-Z 7cccf9f838c01602cd52161c3ac81285
+Z 34fd21290591a3034ab211fbb42794da

diff --git a/manifest.uuid b/manifest.uuid
index d3fdcfe339d7b09aeaf1fa5a41157a13643504f4..5a4cc52a8157e2ed8217224c64e9ce6f5a77b2a3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cbe0cf9ddf46f0a678c85d49bfa74e3b7712e1a1
\ No newline at end of file
+f1ba68f131d2f03e4a7bc50cde23a7609d384279
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index c6d8b9e5f320231ee5b12bea47ef4f5a226e580e..a1759374c9028640431c704590c3157c63b3c53f 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -1069,6 +1069,9 @@ Select *sqlite3SelectDup(sqlite3 *db, Select *p, int flags){
   pNew->addrOpenEphm[1] = -1;
   pNew->nSelectRow = p->nSelectRow;
   pNew->pWith = withDup(db, p->pWith);
+#if SELECTTRACE_ENABLED
+  memcpy(pNew->zSelLabel, p->zSelLabel, sizeof(p->zSelLabel));
+#endif
   return pNew;
 }
 #else

diff --git a/src/select.c b/src/select.c
index a0f6f35a7f1687ff3bcb856be3e0fbde8ae30f8e..7b2dc4ab9ab91c76b615ada3805fb306f988be22 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -4612,6 +4612,7 @@ int sqlite3Select(
   }
   if( sqlite3AuthCheck(pParse, SQLITE_SELECT, 0, 0, 0) ) return 1;
   memset(&sAggInfo, 0, sizeof(sAggInfo));
+  SELECTTRACE(1, ("begin processing %s\n", p->zSelLabel));
 
   assert( p->pOrderBy==0 || pDest->eDest!=SRT_DistFifo );
   assert( p->pOrderBy==0 || pDest->eDest!=SRT_Fifo );
@@ -5367,6 +5368,7 @@ select_end:
 
   sqlite3DbFree(db, sAggInfo.aCol);
   sqlite3DbFree(db, sAggInfo.aFunc);
+  SELECTTRACE(1, ("end processing %s\n", p->zSelLabel));
   return rc;
 }
 

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 2d63228edd44982704a843dde4a63bfb6e37a91a..ac7f541246f5faf6f1671cec9282d8ac172b196b 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -710,8 +710,7 @@ extern const int sqlite3one;
 ** 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_TEST) || defined(SQLITE_ENABLE_SELECTTRACE))
+#if defined(SQLITE_DEBUG) || defined(SQLITE_ENABLE_SELECTTRACE)
 # define SELECTTRACE_ENABLED 1
 #else
 # define SELECTTRACE_ENABLED 0