From: dan <dan@noemail.net>
Date: Tue, 10 Dec 2013 16:35:42 +0000 (+0000)
Subject: Merge changes from the trunk.
X-Git-Tag: version-3.8.3~101^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d22d7b4daa4b9d4c3b2c6f9c0e3cc136a2176232;p=thirdparty%2Fsqlite.git

Merge changes from the trunk.

FossilOrigin-Name: 3ee736a39d1fc175a297c5fdd0d2e1c5a9b5b18e
---

d22d7b4daa4b9d4c3b2c6f9c0e3cc136a2176232
diff --cc manifest
index 5aed39add3,6901566020..dd877e2a84
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\shandling\sof\serrors\sreturned\sby\sthe\sSQLITE_FCNTL_OMIT_SYNCED\sfile-control.
- D 2013-12-10T16:27:59.750
 -C Simplifications\sto\sthe\sOP_MakeRecord\sopcode\sand\sthe\ssqlite3VdbeSerialPut()\nhelper\sfunction.
 -D 2013-12-09T23:17:22.886
++C Merge\schanges\sfrom\sthe\strunk.
++D 2013-12-10T16:35:42.772
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -163,13 -163,13 +163,13 @@@ F src/alter.c 2af0330bb1b601af7a7789bf7
  F src/analyze.c 581d5c18ce89c6f45d4dca65914d0de5b4dad41f
  F src/attach.c 0a17c9364895316ca4f52d06a97a72c0af1ae8b3
  F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 -F src/backup.c 1809a7caa2504233bdddd12f5018422421789537
 +F src/backup.c 6cb4c4ee1d302621eb18ad93a4216fed387b2568
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 432c3e22ff76e8ee1caf57ff88ba9f8af1fcfc30
+ F src/btree.c 09285d6ffe7d819b9656ea9b7ecf1ab949a926fb
  F src/btree.h a61ddebc78c66795a2b93181321a116746302cc9
  F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
- F src/build.c 9b40580b62916612678bdb69ce0286e39c29a862
+ F src/build.c 47ef8209e56d840d2b35b8a243c6ee567ad52bda
  F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd
@@@ -206,9 -206,9 +206,9 @@@ F src/os.c b4ad71336fd96f97776f75587cd9
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
  F src/os_unix.c 60a7b3b23e6fcf83a50d1e320b280b551724e11f
- F src/os_win.c 4323dd0bac4f7a7037fc4cf87fb4692d17f0b108
- F src/pager.c 994fc67f465f4e9159263aa1489cbe608e17d236
+ F src/os_win.c 16eac0961603182ffc10c02b39fe830126538e07
 -F src/pager.c 19203eff37c099271189bf8b378a1143847b92e3
 -F src/pager.h f094af9f6ececfaa8a1e93876905a4f34233fb0c
++F src/pager.c 458c580b63f7f023e9863050f938dcd6eaae026f
 +F src/pager.h 6a790b64a9ea79bc2c849bdefdd39e2344bca94a
  F src/parse.y acee1a9958539e21263362b194594c5255ad2fca
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
@@@ -221,10 -221,10 +221,10 @@@ F src/resolve.c 7eda9097b29fcf3d2b42fdc
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a
  F src/shell.c 936a72ff784efff3832cce274a96ed0b036e6758
 -F src/sqlite.h.in 125dc0b76f0116f1cd6f13536db52ba981e1c5bd
 +F src/sqlite.h.in 767b7475655de093182ec3d7b1f66a0cf5f1c390
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h f3a5d663fe9c6c0b2ee7fc2e20a6204eaea5bc7c
+ F src/sqliteInt.h c59b756b3aebefdce24ff44c4a7b3c155a3c26ee
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -1146,7 -1146,7 +1146,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 32fb1784af4594161d954343e3787db702000a4d
- R 821341bcc4c1c23a6ba2875fa8192ed8
 -P c43b59dac1fbb67ec3a9d921005543046ad416ce
 -R c11616a6774c1e84bdec6602d7be1c45
 -U drh
 -Z 4d30567758bc854237be3d93d5ebeaed
++P d9a5f44f4a27336d41e60b6c3791bd018fbbff6f 7277a769694787e0332d1a4efc02041834661e2a
++R 7fad7524df4e460d9aeda5901ac3e435
 +U dan
- Z 4f103f173d76892892a97e68b335b863
++Z 4d74f8c53424c0d52f5bb5be0f7994e7
diff --cc manifest.uuid
index b73efe0768,fae0da29de..55d9c7de58
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- d9a5f44f4a27336d41e60b6c3791bd018fbbff6f
 -7277a769694787e0332d1a4efc02041834661e2a
++3ee736a39d1fc175a297c5fdd0d2e1c5a9b5b18e