From: drh <drh@noemail.net>
Date: Wed, 11 Dec 2013 14:17:06 +0000 (+0000)
Subject: Merge in the latest trunk changes.
X-Git-Tag: version-3.8.3~101^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fzipvfs-multifile-commit;p=thirdparty%2Fsqlite.git

Merge in the latest trunk changes.

FossilOrigin-Name: 9ff4dfe1e36b40e386858b03f36cfab8f6806fdd
---

07c5d0a901c3c2ed1dd6a8d6c480653b205896cd
diff --cc manifest
index 8b592a7952,058f299285..4df669542d
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Have\sthe\scrash-test\sinfrastructure\scode\sin\stest6.c\sread\sand\swrite\sthe\s512-byte\sblock\scontaining\sthe\spending-byte\slock\sas\snormal.\sEarlier\sversions\sdid\snot\saccess\sthis\spart\sof\sthe\sfile\sin\sorder\sto\savoid\striggering\san\sassert\sin\sos_unix.c.\sBut\sthe\sassert()\shas\ssince\sbeen\sremoved.\sAnd\snot\sreading/writing\sthis\spart\sof\sthe\sfile\scauses\sproblems\sfor\smultiplexor\stests.
- D 2013-12-11T11:03:19.250
 -C Fix\sa\sbug\sin\sthe\sshell\s".import"\scommand:\s\sDo\snot\send\sthe\sfield\nwhen\san\sescaped\sdouble-quote\soccurs\sat\sthe\send\sof\sa\sCRNL\sline.
 -D 2013-12-11T14:00:04.667
++C Merge\sin\sthe\slatest\strunk\schanges.
++D 2013-12-11T14:17:06.145
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
+ F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc bb1f271c8ee9773489c89be00f3f8ad7ed7ae8e0
+ F Makefile.msc 4d4ead6b71d1bf03028fbd61da0ba0ec5e1556e1
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
  F VERSION 8ed548d87d0a27fd7d7620476f9e25f9fa742d73
@@@ -207,8 -207,8 +207,8 @@@ F src/os.h 4a46270a64e9193af4a0aaa3bc2c
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c 60a7b3b23e6fcf83a50d1e320b280b551724e11f
  F src/os_win.c 16eac0961603182ffc10c02b39fe830126538e07
- F src/pager.c 994b3ee3716c89707952051115d72e0bd877e7b9
 -F src/pager.c 9bca84722e29d141089881937743daf8b5f74a2b
 -F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
++F src/pager.c 95a568497d789d5729927fca93fec653c485df45
 +F src/pager.h 6a790b64a9ea79bc2c849bdefdd39e2344bca94a
  F src/parse.y acee1a9958539e21263362b194594c5255ad2fca
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
@@@ -220,8 -220,8 +220,8 @@@ F src/random.c 0b2dbc37fdfbfa6bd455b091
  F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a
- F src/shell.c 936a72ff784efff3832cce274a96ed0b036e6758
+ F src/shell.c 18924f6ccfa70da98bf9e388bab512c0fd1e792e
 -F src/sqlite.h.in 125dc0b76f0116f1cd6f13536db52ba981e1c5bd
 +F src/sqlite.h.in 592057b6b3881573c2d516bad30fb20171f16b05
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
  F src/sqliteInt.h c59b756b3aebefdce24ff44c4a7b3c155a3c26ee
@@@ -1146,7 -1146,7 +1146,7 @@@ F tool/vdbe-compress.tcl 0cf56e9263a152
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 46231af985a1a872d1dc3418591cbaacb0b7c249
- R cf82896d56fef77694a1be0de6074b9d
- U dan
- Z ff5d29c735004d7eb85a84bef2a95faa
 -P 3e1d55f0bd84810a035bd6c54583eb373784a9a3
 -R 7d1fbc3502ae32ded8a54ca8c1f54c36
++P fdc3f3fa3de1481860e1e2a819db2d6c4eb05658 5e239ecda0f7835ce037b38b04627a574b5854cd
++R 67e94d0b56b00fc27eeae35854bf8ba9
+ U drh
 -Z 2736aa335da363db578416e90c12bc54
++Z 7c7b3737dbf629b19ab7333ee0081c4f
diff --cc manifest.uuid
index fe1cfc392c,c859518640..856d09cdcf
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fdc3f3fa3de1481860e1e2a819db2d6c4eb05658
 -5e239ecda0f7835ce037b38b04627a574b5854cd
++9ff4dfe1e36b40e386858b03f36cfab8f6806fdd