From: drh <drh@noemail.net>
Date: Fri, 21 Oct 2016 17:45:06 +0000 (+0000)
Subject: Merge updates from trunk, and especially the ".mode quote" enhancement to
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c844fac64da0ff27bb5087a0ad6a118039dccdc1;p=thirdparty%2Fsqlite.git

Merge updates from trunk, and especially the ".mode quote" enhancement to
the shell.

FossilOrigin-Name: 0c8a5b8844df3389881aecd8e853eb3c78edd954
---

c844fac64da0ff27bb5087a0ad6a118039dccdc1
diff --cc manifest
index 539805fc1c,28f26abfa4..d5c0128e22
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sthe\sbtree_sample(INDEX,LOCATION,LIMIT)\spragma.
- D 2016-10-21T17:25:47.070
 -C Add\s".mode\squote"\sto\sthe\scommand-line\sshell.
 -D 2016-10-21T17:39:30.026
++C Merge\supdates\sfrom\strunk,\sand\sespecially\sthe\s".mode\squote"\senhancement\sto\s\nthe\sshell.
++D 2016-10-21T17:45:06.470
  F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@@ -329,13 -330,13 +330,13 @@@ F src/auth.c 930b376a9c56998557367e6f7f
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63
  F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73
- F src/btree.c 955375bb1537dc16d9b59ad6fcfe31c5a140d1e3
 -F src/btree.c 0fde2593dcf004ac2e5d5af93867a9099ed3cc9d
 -F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde
++F src/btree.c da29550955aba3930c31d550e32be689c7efb3ce
 +F src/btree.h 012576c1d0000e96ccc785c6fe22b4be8211f0d9
  F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5
 -F src/build.c 59dcfdc1ee55439d069af301ef7f2e84421b5102
 +F src/build.c e22e66fb34e1e50bb7869a510923bfe58db3071a
  F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
- F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
+ F src/ctime.c 72c9d01cf446069234e9b54db6fec3e1fc063f58
  F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
  F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
  F src/delete.c cb3f6300df24c26c609778b2731f82644b5532ec
@@@ -373,9 -374,9 +374,9 @@@ F src/os_setup.h 0dbaea40a7d36bf311613d
  F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189
  F src/os_win.c cf90abd4e50d9f56d2c20ce8e005aff55d7bd8e9
  F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
- F src/pager.c 49b6c163832498838c92d0c4c90721576ae707b7
- F src/pager.h 0a19b1e212d0f5d0507f186ae1cca4e523d09d1a
+ F src/pager.c 549ed86833b484fa3cd4799e3289c83b3ace8859
+ F src/pager.h 07d6938df0b74e4abe8f57807a8b0e1084321d8b
 -F src/parse.y 0338f906b61e311c2b7e11a3f89b0092c780b664
 +F src/parse.y 07f68096c97093793ed04d69db8bb75e55c3e00e
  F src/pcache.c 5ff2a08f76a9c1b22f43eb063b7068fb085465ac
  F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490
  F src/pcache1.c e3967219b2a92b9edcb9324a4ba75009090d3953
@@@ -1526,7 -1527,7 +1527,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 c39fd9b8f11b3f1df489df1df4197fe4a670732c
- R 6376d702c2a44655952c143d8109c737
 -P b54c15f11796a75683eec4b502a22ccb87d621c6
 -R cdb213453699e4a8a0bded009eb336d4
++P affc2ef5ee3d8885e74051fd508a3d6f8c313857 c4f5fa78cd8207ce1e46e32e632b8f6ee86047e1
++R 591580a5c8896f3fc0bc04d961931d49
  U drh
- Z a6dc86cd66f951dc83fd16ce4ecf3406
 -Z 3ba463b9129586b08f555ed8d54aa9f2
++Z a6ce5577f64ea1653d10487deaf2ff9d
diff --cc manifest.uuid
index 87232ebeea,7f3cd83980..e961309384
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- affc2ef5ee3d8885e74051fd508a3d6f8c313857
 -c4f5fa78cd8207ce1e46e32e632b8f6ee86047e1
++0c8a5b8844df3389881aecd8e853eb3c78edd954