From: drh Date: Tue, 24 Dec 2013 12:09:42 +0000 (+0000) Subject: Merge the latest trunk changes into the sessions branch. X-Git-Tag: version-3.13.0~148^2~164 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e3c267b469a4cefa99fc2ec2273eed9810c86e;p=thirdparty%2Fsqlite.git Merge the latest trunk changes into the sessions branch. FossilOrigin-Name: cfd110bf5db2c1993a5e2ca718648bd9c17ee22c --- d9e3c267b469a4cefa99fc2ec2273eed9810c86e diff --cc manifest index 464679b544,56fb6db832..b54d8eeabe --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Merge\sin\sall\srecent\spreformance\senhancements\sfrom\strunk. - D 2013-12-14T18:24:46.659 -C Add\s-I.\sto\sthe\smain.mk\smakefile\sfor\sbuilding\ssqlite3.o\sand\sspeedtest1. -D 2013-12-24T12:04:24.811 ++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch. ++D 2013-12-24T12:09:42.648 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 @@@ -156,7 -142,7 +156,7 @@@ F ext/session/test_session.c d38968307c F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt f439556c5ce01ced70987e5ee86549a45165d9ff - F main.mk 3cbbebc94dfb328e26647e13be242ded25b7e17f -F main.mk 3ae543fa446525c1dec55f58de67f41b78651812 ++F main.mk a3028a846754a96c8841d1a7227890c471c65ec2 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f F mkextw.sh d2a981497b404d6498f5ff3e3b1f3816bdfcb338 @@@ -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 65c34400e401c482501dac5cd14a12621260f6d0 - F src/expr.c 31a2b65339f6c3795d4cfa5e99798cd72f9fdfdf -F src/delete.c 821da82527c24496bef0677ed4f61a53b44c27ee ++F src/delete.c e9806af75b7f4015f6410ad87a2a12c353339499 + F src/expr.c ffe4bc79c66f711f450a6113fbd1943b9b2380f7 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c 2ab0f5384b70594468ef3ac5c7ed8ca24bfd17d5 - F src/func.c fed87f35cf4da4a798b726d84abefc209b48d831 + F src/func.c 6325ac2ec10833ccf4d5c36d323709221d37ea19 F src/global.c 1d7bb7ea8254ae6a68ed9bfaf65fcb3d1690b486 F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 - F src/insert.c db64e62555482dcdc3903b0f01d910094ac0dcb2 -F src/insert.c f165ba414eda735b327c8126def0a2428f9138de ++F src/insert.c de6cd4bb09a38560d2dd8ae96ec8b4a7ac6d6d70 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303 - F src/main.c 292a67f4f803068ce5d160cfe76c052d8713e045 -F src/main.c 5307601c58b6e08153a15846098399a59c166d8d ++F src/main.c 2c674289707ebd814b33b8594c930d60861013b9 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 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68 F src/resolve.c 7eda9097b29fcf3d2b42fdc17d1de672134e09b6 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 - F src/select.c d41381d80a22d3a83352aeca274cccf264ac277a - F src/shell.c 18924f6ccfa70da98bf9e388bab512c0fd1e792e + F src/select.c 819bb090c9a348d17f69f136cad2bfa9ee9cbb41 + F src/shell.c a3541193d5fce37e91dad8ef46a9505aa7c9b344 -F src/sqlite.h.in 4ef56464aeaa3785a2c5ca37fb3a0fb229d68b2e +F src/sqlite.h.in 9ccaa04411778b0b3a95df6a9fc9c396b779f0cb F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc - F src/sqliteInt.h 8c7d6a7f3474c3b487311baeb03ba72120e35716 -F src/sqliteInt.h fdb8c1e4bc5424ad82a9394a845781abf0d7d849 ++F src/sqliteInt.h edf19afa8c416413008d9b402f2991e2fb0b3e51 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e - F src/tclsqlite.c 758fa6b6cfd39330db8b71b1f94e46f03ef375b8 -F src/tclsqlite.c c43379f77f90399802b0e215faa71c0adc3a4d2e ++F src/tclsqlite.c fa8d54ebdb7d91e0f6e7472ee5d8b7b543e65adb F src/test1.c 633e5e6a116acf4473b9289240bcceb5320a9d93 F src/test2.c 7355101c085304b90024f2261e056cdff13c6c35 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c @@@ -290,19 -276,19 +290,19 @@@ F src/test_vfstrace.c 3a0ab304682fecbce F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/tokenize.c ec4c1a62b890bf1dbcdb966399e140b904c700a4 F src/trigger.c d84e1f3669e9a217731a14a9d472b1c7b87c87ba - F src/update.c 4ada523da2d315996296456a8e384f11983a9aa0 -F src/update.c c2706a6eb232a96345c35b7e1e75a188e26812bb ++F src/update.c 3143bbdfc8c2d78b74dba15133df04843221ce0d F src/utf.c 6fc6c88d50448c469c5c196acf21617a24f90269 F src/util.c e71f19b272f05c8695cf747b4bac1732685f9e5c F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179 - F src/vdbe.c d8df062f9b24a5cb83348ca2c14ff211a321a092 - F src/vdbe.h b7bfa7b468fcad2cf1890969fe7459325da00385 - F src/vdbeInt.h 062d6e86551ffad25056f3e154fbe5a02e4d8cce -F src/vdbe.c b110887e415b5d2af58c2374c4dfdcf774c5d46c -F src/vdbe.h c3278ab2b410f17acf61faf91be7bce3fd466e8b -F src/vdbeInt.h 42db251e9f863401ff847b90d5fe1614c89a6a56 -F src/vdbeapi.c ce4e68ea4842cc6081046f533d088dcf01d247ad -F src/vdbeaux.c bc6799db8795cd1480f2cab6cb22acf47e3e640f -F src/vdbeblob.c bc40f98f256f0b34116d6a44b114da4a81a15d33 ++F src/vdbe.c ad89fac32d84b5b40778a20a707206630e9cf655 ++F src/vdbe.h 4c15d2c90b52fce24e1bd5eaa783f7451849e95b ++F src/vdbeInt.h 08d79db15519f98d6d2c2dedaebfbb7f3d69a6d8 +F src/vdbeapi.c 647d65813a5595c7f667b9f43d119ecd8d70be08 - F src/vdbeaux.c 0ee1dc808fe245bc85988c12478582d666351330 - F src/vdbeblob.c a2809461743e0b9dd9be871149ac65e8d2c80c08 ++F src/vdbeaux.c 4dc5258ac337fd6600d1efb144b34316d2bbe05a ++F src/vdbeblob.c 6e791541114d482074e031ef8dbc3d5e5c180e23 F src/vdbemem.c 0e69351b2c6ff7d8b638688c0ae336a26befa6b2 F src/vdbesort.c 9d83601f9d6243fe70dd0169a2820c5ddfd48147 - F src/vdbetrace.c f7eb148eb3b4fa3401b20024630dcb43d322e73c + F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767 F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd F src/wal.c 7dc3966ef98b74422267e7e6e46e07ff6c6eb1b4 F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 @@@ -1161,7 -1147,7 +1162,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 e579661a7950fe9f8eb10012946100c874ba54b0 5716fc2341ddd8cf64139e7168597f864da4e10b - R 44ea540ed51c079699ffafd30e405197 -P c289a253c0c053ac8fc344efe138262c327d8096 -R 2bb3d3295c5bbe58e528a8069b6e67b9 ++P 32477642d79615fb85680bdac812ad9655cf6902 cc72c5aec7fe93d4a1368517aab949dc98d33003 ++R 78ce3efefe8e1d1aa8c19dbbb86af6d1 U drh - Z a4d623448ba4efed34874461e572fbbf -Z 2be15cf525011fea6a70c12bcaf2ac37 ++Z 99f0c83c836f43da179f2c44da61e31f diff --cc manifest.uuid index 75bdc105ef,5e0ef5b21c..b9fadc710a --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 32477642d79615fb85680bdac812ad9655cf6902 -cc72c5aec7fe93d4a1368517aab949dc98d33003 ++cfd110bf5db2c1993a5e2ca718648bd9c17ee22c diff --cc src/sqliteInt.h index 98dc451a4a,e7dc69cc73..876911a468 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@@ -742,7 -742,7 +742,8 @@@ typedef struct LookasideSlot LookasideS typedef struct Module Module; typedef struct NameContext NameContext; typedef struct Parse Parse; +typedef struct PreUpdate PreUpdate; + typedef struct PrintfArguments PrintfArguments; typedef struct RowSet RowSet; typedef struct Savepoint Savepoint; typedef struct Select Select;