From: drh Date: Thu, 24 Jul 2014 16:54:28 +0000 (+0000) Subject: Merge all recent trunk changes into the threads branch. X-Git-Tag: version-3.8.7~132^2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2bd2c29a955a2d459b2b300125eda1d79b070e64;p=thirdparty%2Fsqlite.git Merge all recent trunk changes into the threads branch. FossilOrigin-Name: 770685892c8f09b9cddb2fbb2877cfb291e19425 --- 2bd2c29a955a2d459b2b300125eda1d79b070e64 diff --cc manifest index aebf99f5b0,c9c66de972..ab912afdb5 --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Merge\sthe\slatest\strunk\schanges\sinto\sthe\sthreads\sbranch. - D 2014-06-30T20:25:03.546 -C Add\sthe\sreadfile(FILENAME)\sand\swritefile(FILENAME,CONTENT)\sSQL\sfunctions\sto\nthe\scommand-line\sshell. -D 2014-07-24T12:39:59.049 ++C Merge\sall\srecent\strunk\schanges\sinto\sthe\sthreads\sbranch. ++D 2014-07-24T16:54:28.599 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 6d74383a20b94af19190af16c73fad69e8127f70 -F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308 ++F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc 936a6cb0ed87b2ad69fc2abf654795f25bc2ccb7 -F Makefile.msc 5b04e657cf08a9ac7fc47d876c5c8be962c47d6b ++F Makefile.msc e31dee24038965fb6269d6d61073fd6b7e331dec F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0 F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8 F VERSION 1c877615a9db323e3cd301e3d57d853f9d5c4a07 @@@ -146,7 -146,7 +146,7 @@@ F ext/rtree/viewrtree.tcl eea6224b35535 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk bb54c720b96fec4f98c7befae9c29cd23227819b -F main.mk 036a65c9042b2f5013baf85c82629d700fe031c4 ++F main.mk 9b5ccf1097050b1f16681f7d4beeea4f7f7ac2c3 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -167,10 -167,10 +167,10 @@@ F src/auth.c 523da7fb4979469955d822ff92 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7 -F src/btree.c 70c60a3807b2072982f184d9614e020d2953f89c +F src/btree.c 32b552d5388fa27adf99b9d7e09f4746a08da4e7 F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3 - F src/build.c ac8dc0b8b6d49001eac19a46dce94357bddc15b5 -F src/build.c 48f400fa14fd6add244b954ce7e223ce7ccacf0b ++F src/build.c af833cdcba64a465eeba5f2d0c9fc012a9f6c31d F src/callback.c 174e3c8656bc29f91d710ab61550d16eea34be98 F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a @@@ -189,7 -189,7 +189,7 @@@ F src/journal.c b4124532212b6952f42eb2c F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303 - F src/main.c f761e7548a1feaccde82d04c9e008ba9c85ede5a -F src/main.c cfdb2aa5d248ff1af60227cc3f6d485ba86f92dc ++F src/main.c 0eda2715c59120ac1e940640ddd496ed16caa2f3 F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b @@@ -222,12 -222,12 +222,12 @@@ F src/printf.c af06f66927919730f03479fe F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be -F src/select.c 6762c62e11b504aa014edceab8886495165e3a77 -F src/shell.c 191129c3f7a9cf241aea90ff6a6be3e74d3767f0 -F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9 +F src/select.c 2657f35be771d14f56402e4aa8a7e26562415ae6 - F src/shell.c 2aa1fd880d91bbb70d06e70e3097c3b29f946890 - F src/sqlite.h.in faf9dadad407b0d5dd9e5bea26c021e1e31813b1 ++F src/shell.c 05e9e7f667a6340643b647c4be0db15dd7627d92 ++F src/sqlite.h.in a30af69fcbc8fab8b4a00032f9f1d24ba2f01c2c F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc - F src/sqliteInt.h 54cf6813e9bce8f249f16fd1edcb899a5d19fe37 -F src/sqliteInt.h 152134c6223369e2e1acb7b9cc2c0db052dae28a ++F src/sqliteInt.h 7d3b81b03c714486968a04a2583bc14e5cf14fcf F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e @@@ -245,7 -245,7 +245,7 @@@ F src/test_async.c 21e11293a2f72080eda7 F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12 F src/test_backup.c 3875e899222b651e18b662f86e0e50daa946344e F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f - F src/test_config.c 0530445f9d89a72f2a06915eef20c7bec8923acf -F src/test_config.c 42fb068a038c8684741522f551325228b1389e63 ++F src/test_config.c d5f00627c4f47515a57f905806558153cccd7253 F src/test_demovfs.c 69b2085076654ebc18014cbc6386f04409c959a9 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -277,21 -277,20 +277,21 @@@ F src/test_thread.c 1e133a40b50e9c035b0 F src/test_vfs.c f84075a388527892ff184988f43b69ce69b8083c F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 +F src/threads.c 3c63f60ce0aae4c40ed4b8dc745490ff42a05308 - F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7 + F src/tokenize.c ae45399d6252b4d736af43bee1576ce7bff86aec F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5 F src/utf.c a0314e637768a030e6e84a957d0c4f6ba910cc05 - F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f + F src/util.c 3076bdd51cdbf60a6e2e57fada745be37133c73e F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 - F src/vdbe.c 1dff86d8a861b24a7636a2f586953ceb483b445f -F src/vdbe.c fa74c6563486022920db4d73897bd9b837c7441d ++F src/vdbe.c 7ba7cc297e30d46901038d3d304fbf9914811c86 F src/vdbe.h c63fad052c9e7388d551e556e119c0bcf6bebdf8 - F src/vdbeInt.h 027a5757abfed6492b017b45cb2daade9642e467 - F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4 - F src/vdbeaux.c 49c799bd26f9443eb08ed1bf558cf6ec5d166801 -F src/vdbeInt.h f41a7cf5a40e7abd994d5fe3a04589ae3e1154e7 ++F src/vdbeInt.h 5e925f50d1a52c392304b73f13c23bf3715fc138 + F src/vdbeapi.c 24e40422382beb774daab11fe9fe9d37e8a04949 -F src/vdbeaux.c 1ffe0bbc3a2c8aedd95622de9be6b6d07b3d3c6b ++F src/vdbeaux.c 68ef480fa75b27d5860fb96ca4f5a9af98ba102f F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac F src/vdbemem.c d90a1e8acf8b63dc9d14cbbea12bfec6cec31394 -F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27 +F src/vdbesort.c e2784e2e1f1819a55ce6f22c6ab22eca576ae6d8 F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/wal.c 264df50a1b33124130b23180ded2e2c5663c652a @@@ -1187,7 -1184,7 +1189,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 0e1b73496f861bd497f92f1ead936b2d94aa52d5 f925e9baafea625f63105f8013abb3807b418379 - R e2fe9819eb548cf2ae1e2b1637c3598f -P f8f79f28785db716b10c3bc9d6652b98253fd125 -R 3cb7c1591be4171f813333f040f9142c ++P ae23a65eb1547fbe8b86ab71477071990a22d31d fb1048cb2b613a0dbfe625a5df05e9dcd736a433 ++R 5b949bc8daa338f7894b4848fcc3e5ce U drh - Z 09ae0863e1f9ef792685936307cd2a9a -Z d6bf09c8f21a2381ecdf6b5a91f85057 ++Z 1a0a2770bde58d6f05cf30741962cf0a diff --cc manifest.uuid index cb2d6be888,c704a64b44..d06af4d0d3 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - ae23a65eb1547fbe8b86ab71477071990a22d31d -fb1048cb2b613a0dbfe625a5df05e9dcd736a433 ++770685892c8f09b9cddb2fbb2877cfb291e19425