From: mistachkin <mistachkin@noemail.net>
Date: Wed, 29 Mar 2017 23:22:18 +0000 (+0000)
Subject: When compiling with MSVC, disable extra SELECT/WHERE tracing for dynamically built... 
X-Git-Tag: version-3.19.0~113
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b3d3bea31d9d4d14b48982e550729255f2b379eb;p=thirdparty%2Fsqlite.git

When compiling with MSVC, disable extra SELECT/WHERE tracing for dynamically built shells.

FossilOrigin-Name: a68919425c528b887e66b588a73a619f0506cb06855350e0ec8f844acf64d8f7
---

diff --git a/Makefile.msc b/Makefile.msc
index 1dfc6bc49d..7e700afea2 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -745,8 +745,11 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
 
 !IF $(DEBUG)>2
 TCC = $(TCC) -DSQLITE_DEBUG=1
-TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
 RCC = $(RCC) -DSQLITE_DEBUG=1
+!IF $(DYNAMIC_SHELL)==0
+TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
+RCC = $(RCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
+!ENDIF
 !ENDIF
 
 !IF $(DEBUG)>4 || $(OSTRACE)!=0
diff --git a/autoconf/Makefile.msc b/autoconf/Makefile.msc
index 8c13778fc8..ad88504be8 100644
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@ -644,8 +644,11 @@ RCC = $(RCC) -DSQLITE_ENABLE_API_ARMOR=1
 
 !IF $(DEBUG)>2
 TCC = $(TCC) -DSQLITE_DEBUG=1
-TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
 RCC = $(RCC) -DSQLITE_DEBUG=1
+!IF $(DYNAMIC_SHELL)==0
+TCC = $(TCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
+RCC = $(RCC) -DSQLITE_ENABLE_WHERETRACE -DSQLITE_ENABLE_SELECTTRACE
+!ENDIF
 !ENDIF
 
 !IF $(DEBUG)>4 || $(OSTRACE)!=0
diff --git a/manifest b/manifest
index 64c572f805..8bf3b9e785 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Avoid\sunnecessary\sblob\shandle\sinvalidation\swhen\schanges\sare\smade\sto\san\nunrelated\stable.
-D 2017-03-29T18:03:50.123
+C When\scompiling\swith\sMSVC,\sdisable\sextra\sSELECT/WHERE\stracing\sfor\sdynamically\sbuilt\sshells.
+D 2017-03-29T23:22:18.563
 F Makefile.in 1cc758ce3374a32425e4d130c2fe7b026b20de5b8843243de75f087c0a2661fb
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 1faf9f06aadc9284c212dea7bbc7c0dea7e8337f0287c81001eff500912c790a
+F Makefile.msc a4c0613a18663bda56d8cf76079ab6590a7c3602e54befb4bbdef76bcaa38b6a
 F README.md 2b15fae33852f2f53996774c21fb41e1d94181c4401a0e43ac93e11f2cc901b9
 F VERSION 3605fa447e4623f5ff4a6adc97b1fde9a257b8f2
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -11,7 +11,7 @@ F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
 F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
 F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
 F autoconf/Makefile.am 1a47d071e3d5435f8f7ebff7eb6703848bbd65d4
-F autoconf/Makefile.msc 92e3d7fd64dc5c23a23d33824ee4709aaea00a6331c4bb41a1aadcf6600a49f7
+F autoconf/Makefile.msc 1fba0d762d115509d4fce7e333305cee172d521aaacec8bbf7aad5503605d3fb
 F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
 F autoconf/README.txt 4f04b0819303aabaa35fff5f7b257fb0c1ef95f1
 F autoconf/configure.ac 2893b823ecc86cea13739f6c8109a41392254d1db08235c5615e0af5722c8578
@@ -1569,7 +1569,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 06c2b685e15b3ee045a3e7ea018701392771c7664e59a51c9aba87cdefeb37af
-R 00d70d109b5d75b80d2e30f02fdc5c97
-U drh
-Z db6af2895adafefdbb1e0ee439bd7656
+P 4a01880b62706c12d6f16f7c2b5c8b0dc67a9a8a0a48c5b42451e1a133e85611
+R 3adffbd2ee409684adfb0dddf60b32b6
+U mistachkin
+Z 8f5b8ec1599d13d0314f838adb184b49
diff --git a/manifest.uuid b/manifest.uuid
index 29922069fb..f2f9b29f93 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4a01880b62706c12d6f16f7c2b5c8b0dc67a9a8a0a48c5b42451e1a133e85611
\ No newline at end of file
+a68919425c528b887e66b588a73a619f0506cb06855350e0ec8f844acf64d8f7
\ No newline at end of file