From: dan <dan@noemail.net>
Date: Tue, 11 Feb 2014 05:26:22 +0000 (+0000)
Subject: Merge latest trunk changes.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3612639a6f99356d7ec4b209f7190082bb375db4;p=thirdparty%2Fsqlite.git

Merge latest trunk changes.

FossilOrigin-Name: 1f2e1b0c64934ec80f09d596d512f7c320e36f81
---

3612639a6f99356d7ec4b209f7190082bb375db4
diff --cc manifest
index 6dc2b8a4cc,02a30132dc..0c51f8c0d0
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sa\sbug\scausing\sthe\sPOWERSAFE_OVERWRITE\sdevice-characteristic\sflag\sto\sbe\sset\sincorrectly\sif\sfile\sopening\sis\sdeferred.
- D 2014-02-10T21:09:39.090
 -C Fix\sa\spointless\sconditional.\s\sAdd\sa\stest\scase.
 -D 2014-02-10T21:07:51.589
++C Merge\slatest\strunk\schanges.
++D 2014-02-11T05:26:22.664
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -205,11 -205,11 +205,11 @@@ F src/notify.c 976dd0f6171d4588e89e874f
  F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace
  F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f
  F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 -F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5
 +F src/os_unix.c a45a0d2fc8e0e78d018c4b25a705217212e990fa
  F src/os_win.c d4284f003445054a26689f1264b1b9bf7261bd1b
- F src/pager.c efa923693e958696eee69b205a20bfbc402c8480
+ F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7
  F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428
- F src/parse.y bd51bc17cbfe7549adb4ca3747b1c3d384645065
+ F src/parse.y cce844ccb80b5f969b04c25100c8d94338488efb
  F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c
@@@ -230,10 -230,10 +230,10 @@@ F src/status.c 7ac05a5c7017d0b9f0b4bcd7
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
  F src/tclsqlite.c 649d373f2a3cfbefe8e935a8dec83686616f9a85
  F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299
 -F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35
 +F src/test2.c 0f8bd858c127fd5236dd965d534622422fbe0b2f
  F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
  F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
- F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013
+ F src/test5.c 41e6e732f14a54c7b47f753e364700760f6521b0
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
  F src/test7.c 72b732baa5642f795655ba1126ea032af46ecfd2
  F src/test8.c 54ccd7b1df5062f0ecbf50a8f7b618f8b1f13b20
@@@ -1152,7 -1152,7 +1152,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 538f7b25e436682adba10a158f082de24782cf00
- R fc51d757e99a991be98333c8143d7ae1
 -P 572d4be4db03ce4afe9ae70f148703c74e0d8de0
 -R b7d0a27ba761fd3ba9cef17cacd1ce16
 -U drh
 -Z 5a7d977408b7fd9f1bc56f50ea9feaff
++P 95d0c58d2791d81b432e7d263f3fc2f26858d395 9367632dd7e4fec9197227e35b0627c2e81ebffc
++R 0c738095590e8f126bb6f4bdc18129b2
 +U dan
- Z 7f6e10654a9f0b8d3fc129f44354c867
++Z ac41b2fb5d4eee0ab8c3239008c3f099
diff --cc manifest.uuid
index cb6dbc6c90,7c2363e7ef..ab7a3b2749
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 95d0c58d2791d81b432e7d263f3fc2f26858d395
 -9367632dd7e4fec9197227e35b0627c2e81ebffc
++1f2e1b0c64934ec80f09d596d512f7c320e36f81