From: drh <drh@noemail.net>
Date: Wed, 2 Nov 2016 19:49:22 +0000 (+0000)
Subject: Adjust the MSVC makefile to use Tcl8.6 by default.
X-Git-Tag: version-3.16.0~157
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=506a1400a30f7ec3da86bec00057225a695eb989;p=thirdparty%2Fsqlite.git

Adjust the MSVC makefile to use Tcl8.6 by default.

FossilOrigin-Name: def8f598b8e33b5bab3a024cc57f4c5e300cd8cd
---

diff --git a/Makefile.msc b/Makefile.msc
index 1a78452970..0d42d41aa8 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -794,11 +794,11 @@ TCLLIBDIR = c:\tcl\lib
 !ENDIF
 
 !IFNDEF LIBTCL
-LIBTCL = tcl85.lib
+LIBTCL = tcl86.lib
 !ENDIF
 
 !IFNDEF LIBTCLSTUB
-LIBTCLSTUB = tclstub85.lib
+LIBTCLSTUB = tclstub86.lib
 !ENDIF
 
 !IFNDEF LIBTCLPATH
@@ -828,7 +828,7 @@ LIBICU = icuuc.lib icuin.lib
 # specific Tcl shell to use.
 #
 !IFNDEF TCLSH_CMD
-TCLSH_CMD = tclsh85
+TCLSH_CMD = tclsh
 !ENDIF
 # <</mark>>
 
diff --git a/manifest b/manifest
index 3c2785451b..6a910305aa 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Fix\san\sissue\sthat\swas\scausing\sthe\snew\sdatabase\simage\sto\sbe\sassembled\sentirely\nin\sheap\smemory\swhen\sVACUUMing\sa\sdatabase,\seven\sif\sit\sshould\suse\sa\stemp\sfile.\nThis\scould\scause\sSQLITE_NOMEM\serrors\swhen\svacuuming\svery\slarge\sdatabases\son\n32-bit\ssystems.
-D 2016-11-02T14:50:19.363
+C Adjust\sthe\sMSVC\smakefile\sto\suse\sTcl8.6\sby\sdefault.
+D 2016-11-02T19:49:22.697
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
+F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 661b3e6a778cfbfd7bdce8bbb1545b22f4b6f09e
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1375,7 +1375,7 @@ F test/wal2.test 56b0bc95b8693a0be294f8d210c49025dd094bd7
 F test/wal3.test 2a93004bc0fb2b5c29888964024695bade278ab2
 F test/wal4.test 4744e155cd6299c6bd99d3eab1c82f77db9cdb3c
 F test/wal5.test 9c11da7aeccd83a46d79a556ad11a18d3cb15aa9
-F test/wal6.test 504b24ddb3a75d4b7a6e7c09dc7563622e652fd2
+F test/wal6.test b602704e4b066199bc89d91ca9000f335dcf4572
 F test/wal64k.test 163655ecd2cb8afef4737cac2a40fdd2eeaf20b8
 F test/wal7.test 2ae8f427d240099cc4b2dfef63cff44e2a68a1bd
 F test/wal8.test d9df3fba4caad5854ed69ed673c68482514203c8
@@ -1529,7 +1529,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 d18f61b78c8fafef742efbc890382537e8584180
-R 341f21774d345780c95f7c12f21ba1af
-U dan
-Z c3255af0dbcff292701e9438f3a3c514
+P 3028845329c9b7acdec2ec8b01d00d782347454c
+R dfd07fa2751ad1cca77c9ad8863824f5
+U drh
+Z e699b75769ea46dd9ab5a62241677b6a
diff --git a/manifest.uuid b/manifest.uuid
index c9f54e8b8c..49cc0c8e9c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3028845329c9b7acdec2ec8b01d00d782347454c
\ No newline at end of file
+def8f598b8e33b5bab3a024cc57f4c5e300cd8cd
\ No newline at end of file
diff --git a/test/wal6.test b/test/wal6.test
index 92831f1fb0..9bbc58409d 100644
--- a/test/wal6.test
+++ b/test/wal6.test
@@ -238,6 +238,8 @@ do_test 4.4.2 {
 # Confirm that it is possible to get an SQLITE_BUSY_SNAPSHOT error from
 # "BEGIN EXCLUSIVE" if the connection already has an open read-transaction.
 #
+db close
+db2 close
 reset_db
 sqlite3 db2 test.db
 do_execsql_test 5.1 {