From: drh <drh@noemail.net>
Date: Fri, 15 Jul 2016 02:55:51 +0000 (+0000)
Subject: Merge fixes from trunk.  Fix the tclsqlite.test script.
X-Git-Tag: version-3.14.0~57^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0e15d921d9daf3f4ea0fd4d74c2a8734b944a852;p=thirdparty%2Fsqlite.git

Merge fixes from trunk.  Fix the tclsqlite.test script.

FossilOrigin-Name: d2b1fa55e8809ffc25a25f256349b8d08beadab5
---

0e15d921d9daf3f4ea0fd4d74c2a8734b944a852
diff --cc manifest
index 42028828b3,3e9a346ef3..373a08e7de
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Modify\sthe\sTcl\stest\scommand\s'sqlite3_bind_blob'\sto\smake\suse\sof\sthe\sTcl_GetByteArrayFromObj()\sAPI.
- D 2016-07-15T01:49:25.642
 -C Disable\sthe\sCSV\sextension\swhen\svirtual\stables\sare\sdisabled.
 -D 2016-07-15T02:50:18.913
++C Merge\sfixes\sfrom\strunk.\s\sFix\sthe\stclsqlite.test\sscript.
++D 2016-07-15T02:55:51.860
  F Makefile.in 6c20d44f72d4564f11652b26291a214c8367e5db
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@@@ -1120,7 -1120,7 +1120,7 @@@ F test/tabfunc01.test 50a9fb379f9747fd0
  F test/table.test b708f3e5fa2542fa51dfab21fc07b36ea445cb2f
  F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126
  F test/tableopts.test dba698ba97251017b7c80d738c198d39ab747930
--F test/tclsqlite.test cf0d0a3fd03d64892cec2d48aae9fb2f148680a5
++F test/tclsqlite.test 1d73b9203b1ca8798d7d7310742b8d3febc0d56e
  F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6
  F test/tempdb2.test 4fc92055f2a3f7626c0f2eabbb637dc021b311d5
  F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900
@@@ -1506,7 -1505,7 +1506,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 97ccf15fb7e5103c8317d06a1985ba9c88544a60
- R 23f12c56d57425cd5e6978d10e653771
- U mistachkin
- Z ce44a3acd6ed0a8254df88a4b23a0c52
 -P a7db6e45ad45be9b3003f61d4163f543498a7c9d
 -R ec00a189cb07c46ebd136f03f1e34d37
++P e03c81895e52096ab055d8231841e9070602ca84 ec7180892ac737f0731cf61f2d095a5c1d18ad93
++R 8bd18a5122e19b3b0675d3bc2674a51e
+ U drh
 -Z 4982072efce5132597470baa33eb57d2
++Z 68d53222f802b7ae8fc8a7f808e2ed8d
diff --cc manifest.uuid
index 4fc1c619aa,3747973d87..af07c18f62
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e03c81895e52096ab055d8231841e9070602ca84
 -ec7180892ac737f0731cf61f2d095a5c1d18ad93
++d2b1fa55e8809ffc25a25f256349b8d08beadab5
diff --cc test/tclsqlite.test
index 767dd01be2,767dd01be2..bdb0fc56d1
--- a/test/tclsqlite.test
+++ b/test/tclsqlite.test
@@@ -34,7 -34,7 +34,7 @@@ do_test tcl-1.1 
  do_test tcl-1.2 {
    set v [catch {db bogus} msg]
    lappend v $msg
--} {1 {bad option "bogus": must be authorizer, backup, busy, cache, changes, close, collate, collation_needed, commit_hook, complete, copy, enable_load_extension, errorcode, eval, exists, function, incrblob, interrupt, last_insert_rowid, nullvalue, onecolumn, preupdate, profile, progress, rekey, restore, rollback_hook, status, timeout, total_changes, trace, transaction, unlock_notify, update_hook, version, or wal_hook}}
++} {1 {bad option "bogus": must be authorizer, backup, busy, cache, changes, close, collate, collation_needed, commit_hook, complete, copy, enable_load_extension, errorcode, eval, exists, function, incrblob, interrupt, last_insert_rowid, nullvalue, onecolumn, preupdate, profile, progress, rekey, restore, rollback_hook, status, timeout, total_changes, trace, trace_v2, transaction, unlock_notify, update_hook, version, or wal_hook}}
  do_test tcl-1.2.1 {
    set v [catch {db cache bogus} msg]
    lappend v $msg