Fix the sqlite3WhereTrace mechanism so that it compiles with

the --disable-amalgamation and the --enable-debug options to ./configure
using clang.

FossilOrigin-Name: 813224363d9ac22fcb37f657c4ac988f76fa39989301faec7206e9ba0b1f4476

diff --git a/manifest b/manifest
index b7b5f95043ba7cb38e6cd52fcaba70fccad2628b..76bcd1fd19d33964cbc7faf534df3b34ccd2c9e2 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\ssegfault\sin\s'eval.c'\sextension\swhen\sused\swith\s'empty_result_callbacks'.
-D 2018-04-04T12:21:33.105
+C Fix\sthe\ssqlite3WhereTrace\smechanism\sso\sthat\sit\scompiles\swith\nthe\s--disable-amalgamation\sand\sthe\s--enable-debug\soptions\sto\s./configure\nusing\sclang.
+D 2018-04-05T12:02:27.398
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -575,7 +575,7 @@ F src/wal.c aa9cffc7a2bad6b826a86c8562dd4978398720ed41cb8ee7aa9d054eb8b456a0
 F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a
 F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f
 F src/where.c 7cae47e813393d70c6d327fdf000fcb30f76b1b0b5a5b52ff6402e0c658de32c
-F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971
+F src/whereInt.h 2610cb87dd95509995b63decc674c60f2757697a206cfe0c085ee53d9c43cfff
 F src/wherecode.c 982b7450c53fb272f61a1d20c93e960260ea4dfe8e2e9bacc190e2a041a1f1a4
 F src/whereexpr.c 53532be687e12f3cd314f1e204cd4fbdac7ad250e918a182b048121e16e828ae
 F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2
@@ -1717,7 +1717,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 5a6fd9e0156a14e6509c4ea713c4b332b2d050432b49571c7a45a7ecc7cb5da4
-R 5a45265c7da1e842aabe17d258d46bde
-U mistachkin
-Z cc22acb491f17ca746974111b657ca77
+P e8b87bd4954437041139344d6d1ce3e4aace40ea6891b70f9c20cd95671270e7
+R 2c90224409722f28e0d0ba0e527db678
+U drh
+Z 8b73b8961c0bc17b6a1f6bdd86c64095

diff --git a/manifest.uuid b/manifest.uuid
index 4da4b92904c4436179a2b7ade60ee5835e899d95..fa13d76a7e89b7f948d3ef12f58b0fe2300b90b0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e8b87bd4954437041139344d6d1ce3e4aace40ea6891b70f9c20cd95671270e7
\ No newline at end of file
+813224363d9ac22fcb37f657c4ac988f76fa39989301faec7206e9ba0b1f4476
\ No newline at end of file

diff --git a/src/whereInt.h b/src/whereInt.h
index 0aa7bc1da0567fb012f553e04cfe36a36b7b10ac..90929576e00ccb4bd7267b6dc699546eb2023975 100644 (file)
--- a/src/whereInt.h
+++ b/src/whereInt.h
@@ -19,7 +19,7 @@
 ** Trace output macros
 */
 #if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
-/***/ int sqlite3WhereTrace;
+/***/ extern int sqlite3WhereTrace;
 #endif
 #if defined(SQLITE_DEBUG) \
     && (defined(SQLITE_TEST) || defined(SQLITE_ENABLE_WHERETRACE))