From: drh Date: Tue, 28 Jan 2014 18:06:17 +0000 (+0000) Subject: Bring in the latest updates from trunk. X-Git-Tag: version-3.13.0~148^2~162 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19913f4419bc65dc0b9dcb6dd798973ef4f3b388;p=thirdparty%2Fsqlite.git Bring in the latest updates from trunk. FossilOrigin-Name: 7b5f3773867ed0e4ed17bd473ba972d500035318 --- 19913f4419bc65dc0b9dcb6dd798973ef4f3b388 diff --cc manifest index bd3002071d,55d11eedcb..c0f7eb06a7 --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Bring\sin\sall\sthe\slatest\strunk\schanges,\sincluding\sthe\sCommon\sTable\nExpressions\simplementation. - D 2014-01-24T14:05:18.988 -C Minor\sbugfix\sin\smain.c\sso\sthat\sthe\slibrary\sbuilds\swith\sSQLITE_OMIT_WSD\sdefined. -D 2014-01-28T17:49:13.545 ++C Bring\sin\sthe\slatest\supdates\sfrom\strunk. ++D 2014-01-28T18:06:17.362 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 -F Makefile.msc 4d4ead6b71d1bf03028fbd61da0ba0ec5e1556e1 +F Makefile.msc 043280f9ca15befa7236484a6c1448d9271abd73 F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 F VERSION 8ed548d87d0a27fd7d7620476f9e25f9fa742d73 @@@ -188,21 -174,21 +188,21 @@@ F src/callback.c 174e3c8656bc29f91d710a F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c 77779efbe78dd678d84bfb4fc2e87b6b6ad8dccd F src/date.c 593c744b2623971e45affd0bde347631bdfa4625 - F src/delete.c 80a3947fc234baba91842b90558db67bcd8706ea - F src/expr.c 61f9105820d6702d7153dfb6ca3d58e751a5e95a -F src/delete.c 22e54756c08b194a29d51cd6552922028b3e21a9 ++F src/delete.c 85592961a0bef547562468c9496a56f3997b3c30 + F src/expr.c 96f00a262308f3f97d2afd8519c7a284e25829f3 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c 2ab0f5384b70594468ef3ac5c7ed8ca24bfd17d5 - F src/func.c 6325ac2ec10833ccf4d5c36d323709221d37ea19 + F src/func.c f4499b39d66b71825514334ce67b32ff14bd19f5 F src/global.c 1d7bb7ea8254ae6a68ed9bfaf65fcb3d1690b486 - F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4 + F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 -F src/insert.c a4450f0c46a9f221622e6551ab0953b03c4f8ee8 +F src/insert.c a8a987ba42e7172b144052db79e7246da6ae2ccf F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303 - F src/main.c deaeda63657d005ad9833f2191b7ff65c83e0ded -F src/main.c 07225af6a00be0b7f34ac52e60f99cf5cbb2a475 ++F src/main.c e9c6feb98d8bf8fa15b87167f6ab87fcce13602c F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b @@@ -233,16 -219,16 +233,16 @@@ F src/printf.c 85d07756e45d7496d19439dc F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 - F src/select.c 93764e0d81946c070e2c7f1127f35e21efabbcc3 + F src/select.c a421f3fb7f52a3c0b37f5caeabd27799e8a9ae58 F src/shell.c 24722d24d4ea8ca93db35e44db7308de786767ca -F src/sqlite.h.in eed7f7d66a60daaa7b4a597dcd9bad87aad9611b +F src/sqlite.h.in a92d7fcdcb1a8003a62e916ec49025f27ccb56b8 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc - F src/sqliteInt.h e4d4b5db50e69f2ce130d40d324db5b5c5638aa8 -F src/sqliteInt.h 22c8f7112f2fa8e778bbd9d331cbebff8c645574 ++F src/sqliteInt.h 5bec5e943c184f137e5f0895886346c82618728d F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e - F src/tclsqlite.c a870d43e3c19663fce878aa4c7cac9c624aab564 -F src/tclsqlite.c 21ca0043d7c48cde5dabed5c1116eee1be692f62 ++F src/tclsqlite.c 97a7cb53646107433f463592ed785f6e177b93b5 F src/test1.c 2401eee14a4309a7cfe2aeb2f30ad517a1d9c299 F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c @@@ -290,17 -276,17 +290,17 @@@ F src/test_vfstrace.c 3a0ab304682fecbce F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7 F src/trigger.c 5c1c0b899ac0ce284763dcb8fdbaa38ecf15ef98 - F src/update.c 3143bbdfc8c2d78b74dba15133df04843221ce0d -F src/update.c a7df6fffce6bfedc578fda6136dd33e34a63f8ee ++F src/update.c 437c130e7d16230e182782baffa8290a349cdf7d F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269 - F src/util.c e71f19b272f05c8695cf747b4bac1732685f9e5c + F src/util.c 15ac2627f548f5481d0d7e6c4eb67be673027695 F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 - F src/vdbe.c c41493ca68c23f421b21bdb0ff1f0e8df7aaa876 -F src/vdbe.c 5fe94e13fa56c50edb75263706b6fbcc860a3980 -F src/vdbe.h e6c4c610fcabad4fa80ebb1efc6822a9367e2b26 -F src/vdbeInt.h 42db251e9f863401ff847b90d5fe1614c89a6a56 -F src/vdbeapi.c ce4e68ea4842cc6081046f533d088dcf01d247ad -F src/vdbeaux.c a3327afa8cfcc5bb3d38f2b2a599bac5fb63c6be -F src/vdbeblob.c bc40f98f256f0b34116d6a44b114da4a81a15d33 ++F src/vdbe.c 7b5d45ba9be3cb2e27ff52e0ce452a58fd3bc282 +F src/vdbe.h 06016671144c70373331e348fd7edf2b2535ac97 +F src/vdbeInt.h 08d79db15519f98d6d2c2dedaebfbb7f3d69a6d8 +F src/vdbeapi.c 647d65813a5595c7f667b9f43d119ecd8d70be08 - F src/vdbeaux.c a980f7817ab73afb5efc5fac97097421f0ee8f66 ++F src/vdbeaux.c 25e8ee3c8fdb3951ee46616f09c62cce217df855 +F src/vdbeblob.c 6e791541114d482074e031ef8dbc3d5e5c180e23 - F src/vdbemem.c 0e69351b2c6ff7d8b638688c0ae336a26befa6b2 + F src/vdbemem.c 23cdc14ed43e0aafa57bd72b9bf3d5b1641afa91 F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd @@@ -859,7 -844,7 +859,7 @@@ F test/tclsqlite.test a7308276aad2e6c0b F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1 - F test/tester.tcl 1b1ba4c0f5e7f76c7c74dbb8a20ad9f72a3f46f0 -F test/tester.tcl 9bd04481b8b0ef1f2049ad01f28e175ee9a14f7b ++F test/tester.tcl 1c7b3cef48840ad67ca82cfed4ec3a4afbc322a3 F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 @@@ -1167,7 -1152,7 +1167,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 cfd110bf5db2c1993a5e2ca718648bd9c17ee22c 83b0b2916589db0184435dbd4c304387f393ed60 - R 5819e16ba708c7c74e3c7382ce1686de -P 48d736c0ee1ac0879bd12d2f1901f208e87e538a -R 2cc45274993cd572752bb3138d773ec9 -U dan -Z efd313d0ce443bf7542f8c0ae313a99a ++P 9b43e559195680e558264c4c00d34dc9cf9d9146 5e3b9ecc7b2b2e50952de819b99bafdb7b9ff59e ++R 51002a148d222844524dcb7bb9208985 +U drh - Z ab25b0717f386dd1619d1172c5947b1e ++Z 1a524338f4286caad02c997553ac895a diff --cc manifest.uuid index 7e8ba52694,5b9b68c635..2dcd6ffc1d --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 9b43e559195680e558264c4c00d34dc9cf9d9146 -5e3b9ecc7b2b2e50952de819b99bafdb7b9ff59e ++7b5f3773867ed0e4ed17bd473ba972d500035318