From: mistachkin Date: Fri, 2 May 2014 21:38:02 +0000 (+0000) Subject: Merge updates from trunk. X-Git-Tag: version-3.8.5~56^2~1^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a11505be95302abc30c0cc15d83d04da19221c3;p=thirdparty%2Fsqlite.git Merge updates from trunk. FossilOrigin-Name: c4d1d8a0db48f523d1624f2468261c171152c0f7 --- 4a11505be95302abc30c0cc15d83d04da19221c3 diff --cc manifest index 6afa83b6cf,c958eec031..0a0e83ebbd --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ -C Fix\sa\sbroken\stest\scase\sin\sfuzz.test. -D 2014-05-02T14:54:56.266 +C Merge\supdates\sfrom\strunk. - D 2014-02-21T10:48:03.225 ++D 2014-05-02T21:38:02.443 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 +F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc f8666729abb2f21e0fbecf1902281b161644fe96 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19 -F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 ++F Makefile.msc d1d9474b660e87a0134acd33693281883cb328b1 +F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0 - F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 w README - F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7 + F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 + F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 @@@ -142,7 -144,7 +144,7 @@@ F ext/rtree/viewrtree.tcl eea6224b35535 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff - F main.mk 0dc14f8278caacce50844d83159a0e0e0f905424 -F main.mk 9546867b42992c554e7af8672549ba13afaadade ++F main.mk 601f43d91e6c7043127ec192bf85c9a1ae940621 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -197,18 -199,16 +199,18 @@@ F src/mutex.c d3b66a569368015e0fcb1ac15 F src/mutex.h 5bc526e19dccc412b7ff04642f6fdad3fdfdabea F src/mutex_noop.c 7682796b7d8d39bf1c138248858efcd10c9e1553 F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc -F src/mutex_w32.c 6108c88e1cb38d8fbb3534b170793815cbedbf97 +F src/mutex_w32.c ab08c0fc54b71979370ca7c8f42fc64a9f211ebb F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 F src/os.c 1b147e4cf7cc39e618115c14a086aed44bc91ace -F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f +F src/os.h 60d419395e32a8029fa380a80a3da2e9030f635e F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 +F src/os_setup.h 3f9e87d981eef070c8a11e76b4704842a0e5870f - F src/os_unix.c 18f7f95dc6bcb9cf4d4a238d8e2de96611bc2ae5 - F src/os_win.c 8099d606b47e542f4d99f5893aa4c6704eb37197 + F src/os_unix.c ae4b5240af4619d711301d7992396e182585269f -F src/os_win.c e71678ac927d0a0fb11d993db20a9748eabf808e ++F src/os_win.c 089fcb45dabe90a4c87369cc69846838198dd221 +F src/os_win.h ac253253d080dc3dd261efe5e98626c4b95e5a26 - F src/pager.c 0ffa313a30ed6d061d9c6601b7b175cc50a1cab7 + F src/pager.c ab62a24218d87dda1be641f6c5ad291bff78fd94 F src/pager.h ffd5607f7b3e4590b415b007a4382f693334d428 - F src/parse.y 2613ca5d609c2f3d71dd297351f010bcec16e1e0 + F src/parse.y 22d6a074e5f5a7258947a1dc55a9bf946b765dd0 F src/pcache.c d8eafac28290d4bb80332005435db44991d07fc2 F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222 F src/pcache1.c 102e6f5a2fbc646154463eb856d1fd716867b64c @@@ -240,8 -240,8 +242,8 @@@ F src/test9.c bea1e8cf52aa93695487baded F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8 F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12 F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e - F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16 + F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f -F src/test_config.c 0336e0bdbe541b4af89d7e3dd0656e8e6b51e585 +F src/test_config.c dabaa32868974e1ae39770cc17d7e066a9c38e6d F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -257,11 -257,11 +259,11 @@@ F src/test_multiplex.c 9f304bf04170c91c F src/test_multiplex.h 110a8c4d356e0aa464ca8730375608a9a0b61ae1 F src/test_mutex.c 293042d623ebba969160f471a82aa1551626454f F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25 -F src/test_osinst.c 90a845c8183013d80eccb1f29e8805608516edba +F src/test_osinst.c 3d0340bc31a9f3d8a3547e0272373e80f78dde25 F src/test_pcache.c a5cd24730cb43c5b18629043314548c9169abb00 -F src/test_quota.c 30c64f0ef84734f2231a686df41ed882b0c59bc0 -F src/test_quota.h 8761e463b25e75ebc078bd67d70e39b9c817a0cb +F src/test_quota.c 65f6348fec0f2b3020c907247fb47556b214abb9 +F src/test_quota.h 2a8ad1952d1d2ca9af0ce0465e56e6c023b5e15d - F src/test_rtree.c f3d1d12538dccb75fd916e3fa58f250edbdd3b47 + F src/test_rtree.c fdd8d29ca5165c7857987a2ba263fac5c69e231f F src/test_schema.c cd12a2223c3a394f4d07bb93bdf6d344c5c121b6 F src/test_server.c a2615049954cbb9cfb4a62e18e2f0616e4dc38fe F src/test_sqllog.c c1c1bbedbcaf82b93d83e4f9dd990e62476a680e @@@ -1121,10 -1134,10 +1136,10 @@@ F tool/mkkeywordhash.c c9e05e4a7bcab8fa F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkpragmatab.tcl 78a77b2c554d534c6f2dc903130186ed15715460 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 -F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02 -F tool/mksqlite3c.tcl ed5b4e9ca8bf209ff401059a16362f37710fd8b8 +F tool/mksqlite3c-noext.tcl 1712d3d71256ca1f297046619c89e77a4d7c8f6d - F tool/mksqlite3c.tcl db30eeba8bb34561985938438abca200689e8bc0 ++F tool/mksqlite3c.tcl 1be89affd8ad71a31b6e5d49cc7bf790db7686ff F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 -F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795 +F tool/mksqlite3internalh.tcl b6514145a7d5321b47e64e19b8116cc44f973eb1 F tool/mkvsix.tcl 6477fb9dab838b7eea1eed50658ff1cda04850b5 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 F tool/omittest.tcl 34d7ac01fe4fd18e3637f64abe12c40eca0f6b97 @@@ -1153,7 -1166,7 +1168,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff - P 8364af392da2946acd84633b45684e6fba5c39ed b46d4e8923e6e367412bba7aeac07039bbcbabd1 - R 1439033255b7868a0a47182ddcacb18d -P 3bc43594aaeee9225c0590677fcce480bedcb37b -R cb5319eb84ea1cdb4a55d1e33cf3d763 -U dan -Z 412ddec016208716851032f358e0939e ++P 09cf240a7fb4022aeb1d7ae2a2455b5f97b53d68 faa469355eabb2c407f24638b090725448aac37f ++R 332509ae33dff41f389350276535e395 +U mistachkin - Z e6967ecc5cd4d919e80c9df05bb76a17 ++Z 6c2182b94bf292df6ecab4543f02e83a diff --cc manifest.uuid index 5a30d28748,52fb89ae57..b20cd682c5 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 09cf240a7fb4022aeb1d7ae2a2455b5f97b53d68 -faa469355eabb2c407f24638b090725448aac37f ++c4d1d8a0db48f523d1624f2468261c171152c0f7