From: drh Date: Mon, 22 Apr 2013 23:59:06 +0000 (+0000) Subject: Merge the latest trunk changes into the sessions branch. X-Git-Tag: version-3.13.0~148^2~202 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16fb176814bd2b8fe46f7ed0e50a0b3d33db89a0;p=thirdparty%2Fsqlite.git Merge the latest trunk changes into the sessions branch. FossilOrigin-Name: 6994826c0784280f2e9728dfa4185848846d03df --- 16fb176814bd2b8fe46f7ed0e50a0b3d33db89a0 diff --cc manifest index cad0902a3d,f702eb82f2..2dc92ae73d --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ - C Fix\sthe\sxCheckReservedLock()\smethod\son\sthe\swindows\sVFS\sso\sthat\sit\scannot\sreturn\sa\sfalse\spositive\swhen\stwo\sor\smore\sprocesses\suse\sit\sat\sthe\ssame\stime\son\sthe\ssame\sfile.\sTicket\s[7ff3120e4fa54abb55].\s\sUpdate\sto\sversion\s3.7.16.2. - D 2013-04-12T13:53:50.045 -C Fix\sharmless\scompiler\swarnings. -D 2013-04-22T23:38:50.007 ++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch. ++D 2013-04-22T23:59:06.075 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 174bfca74e57f38699e3412a984f6b38106750fa -F Makefile.in 87591ea5bf7d6ed521ad42d5bc69c124debe11a5 ++F Makefile.in 4db477715e5d66fdcbb4f7a0870d10b0adbe007e F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc 0ad7d4278a3b7e0c56d3ca7cc607b34acc1df516 - F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f -F Makefile.msc 67d9db478186d7d4a498c794fff049f7231a9626 ++F Makefile.msc 95b9e9992abcb32dda9ad7460bb1c4a3e0985909 + F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6 -F VERSION 05c7bd63b96f31cfdef5c766ed91307ac121f5aa +F VERSION 0dee4d2e0c64791ff0085277424fb5c07d79fc9a F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 @@@ -101,21 -102,9 +102,21 @@@ F ext/rtree/rtree_util.tcl 06aab2ed5b82 F ext/rtree/sqlite3rtree.h c34c1e41d1ab80bb8ad09aae402c9c956871a765 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024 +F ext/session/session1.test 502086908e4144dfaccb1baa77bc29d75a9daace +F ext/session/session2.test 99ca0da7ddb617d42bafd83adccf99f18ae0384b +F ext/session/session3.test a7a9ce59b8d1e49e2cc23d81421ac485be0eea01 +F ext/session/session4.test a6ed685da7a5293c5d6f99855bcf41dbc352ca84 +F ext/session/session5.test 8fdfaf9dba28a2f1c6b89b06168bdab1fef2d478 +F ext/session/session6.test 443789bc2fca12e4f7075cf692c60b8a2bea1a26 +F ext/session/session8.test 7d35947ad329b8966f095d34f9617a9eff52dc65 +F ext/session/session_common.tcl 1539d8973b2aea0025c133eb0cc4c89fcef541a5 +F ext/session/sessionfault.test 496291b287ba3c0b14ca2e074425e29cc92a64a6 +F ext/session/sqlite3session.c 7d7ca693bd581243835ee47b41b491bd909a26f4 +F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673 +F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 - F main.mk 01f02b625cc1b8609690aaddb00e2fbb1edbeec5 -F main.mk e97fbfe4c69060560574e1b59c43f4f88a38a0ec ++F main.mk 88fb64131032933d96fd65039a6dd9140beb2566 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac @@@ -139,9 -134,9 +146,9 @@@ F src/btreeInt.h eecc84f02375b2bb7a44ab F src/build.c 083da8466fd7e481cb8bd5264398f537507f6176 F src/callback.c d7e46f40c3cf53c43550b7da7a1d0479910b62cc F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac - F src/ctime.c 2a5f251fcd7393808df77ccfc817e7058df08c4c + F src/ctime.c 4262c227bc91cecc61ae37ed3a40f08069cfa267 F src/date.c 067a81c9942c497aafd2c260e13add8a7d0c7dd4 -F src/delete.c aeabdabeeeaa0584127f291baa9617153d334778 +F src/delete.c 39a770e9729b1acd2de347f8f614584841d0083e F src/expr.c 48048fca951eedbc74aa32262154410d56c83812 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fkey.c e16942bd5c8a868ac53287886464a5ed0e72b179 @@@ -150,12 -145,12 +157,12 @@@ F src/global.c 5caf4deab621abb45b4c607a F src/hash.c ac3470bbf1ca4ae4e306a8ecb0fdf1731810ffe4 F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 -F src/insert.c f7cb141e8ce257cb6b15c497f09e4e23d6055599 +F src/insert.c 02f8a1867088cb654eb756f98389f10441a65216 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d - F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f + F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12 F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b - F src/loadext.c 1422eba4aa2b1fb5f7b3aef574752272477d21e2 - F src/main.c 557e456f41646c67ccfe3dae3fa945b5bfb788c5 + F src/loadext.c c48f7f3f170e502fe0cc20748e03c6e0b5a016c2 -F src/main.c de47c3e6b68f512b9e64ba2533ee4eecc9d501c1 ++F src/main.c f93769cf9fc75c4a5bfa642149c7c9128bc68811 F src/malloc.c fe085aa851b666b7c375c1ff957643dc20a04bf6 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 437c7c4af964895d4650f29881df63535caaa1fa @@@ -169,47 -164,47 +176,47 @@@ F src/mutex_noop.c 7682796b7d8d39bf1c13 F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc F src/mutex_w32.c 32a9b3841e2d757355f0012b860b1bc5e01eafa0 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30 - F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c - F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57 + F src/os.c b4ad71336fd96f97776f75587cd9e8218288f5be + F src/os.h 4a46270a64e9193af4a0aaa3bc2c66dc07c29b3f F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 - F src/os_unix.c 21a36fa0b3753609b6606b30d9338d4bb6b24696 - F src/os_win.c c96990935e7fd799b43a7f0ee74798f45f06e21a - F src/pager.c 3e9a15939684b0af441325f05335331b15979c9d - F src/pager.h 1109a06578ec5574dc2c74cf8d9f69daf36fe3e0 + F src/os_unix.c 5a9ac4a566fb566a2ff9b9e3a9d723075d9d26a7 + F src/os_win.c 673b3e3d1fa3040d8d95a7f1f5e0e553aed56cfb + F src/pager.c 6c3a8a5d665498b0344395a2c9f82d5abc4cc771 + F src/pager.h 5cb78b8e1adfd5451e600be7719f5a99d87ac3b1 F src/parse.y 5d5e12772845805fdfeb889163516b84fbb9ae95 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346 - F src/pcache.h 1b5dcc3dc8103d03e625b177023ee67764fa6b7c + F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222 F src/pcache1.c 9fd22671c270b35131ef480bbc00392b8b5f8ab9 - F src/pragma.c 9f0ee3d74a7f33eeeff40a4b014fc3abf8182ce2 - F src/prepare.c 310eaff1ee5f3c700b3545afb095cfe9346efc3a + F src/pragma.c 3eacf001cbf4becbd494f8d82d08fdf1648cf8cb + F src/prepare.c 743e484233c51109666d402f470523553b41797c F src/printf.c 4a9f882f1c1787a8b494a2987765acf9d97ac21f F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50 - F src/resolve.c 9079da7d59aed2bb14ec8315bc7f720dd85b5b65 + F src/resolve.c 10a1b332e3eb36e5d561085e18c58a8578cd7d73 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0 F src/select.c 01540bcd3df3c8f1187158e77986028b1c667258 - F src/shell.c 7c41bfcd9e5bf9d96b9215f79b03a5b2b44a3bca - F src/sqlite.h.in ba60664eedbe33fb5f68f17b4cbbcd59af8fc6ad + F src/shell.c aca9d94653decd4496846dee0c7ba83eaf96a46d -F src/sqlite.h.in ec279b782bea05db63b8b29481f9642b406004af ++F src/sqlite.h.in eddda5f1967e84336e11f3a5c6fd3be3337d66c1 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0 - F src/sqlite3ext.h 7183ab832e23db0f934494f16928da127a571d75 - F src/sqliteInt.h a0a6b155f5e9748dfb5876d892e03a07eb056d7b + F src/sqlite3ext.h d936f797812c28b81b26ed18345baf8db28a21a5 -F src/sqliteInt.h 2a83cfec9963372b636b0cabd4b200c1f1074a99 ++F src/sqliteInt.h a9f727c0d568f64f06ae430e55a074d8dd1ccde4 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d F src/status.c bedc37ec1a6bb9399944024d63f4c769971955a9 F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e -F src/tclsqlite.c 9a716c737590d2f129d71c8fc7065e5aba0e7222 +F src/tclsqlite.c a15550a334ca07ac2bc5d32c5f97e3d61be886e8 - F src/test1.c ff3e68eedfbd858c9b89cf03e3db233cd29be1d0 - F src/test2.c 4178056dd1e7d70f954ad8a1e3edb71a2a784daf - F src/test3.c 3c3c2407fa6ec7a19e24ae23f7cb439d0275a60d - F src/test4.c bf9fa9bece01de08e6f5e02314e4af5c13590dfa + F src/test1.c 6784fdacb35c33ba564ef749b62c4718fe515484 + F src/test2.c 29e7154112f7448d64204e8d31179cf497ecf425 + F src/test3.c 96aed72a8e1d542fed127e3e8350ae357712fa82 + F src/test4.c cea2c55110241e4674e66d476d29c914627999f5 F src/test5.c a6d1ac55ac054d0b2b8f37b5e655b6c92645a013 F src/test6.c a437f76f9874d2563352a7e6cd0d43217663c220 - F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843 + F src/test7.c f4b894b7931f8cf9f5cbf37cfa0727703f526a40 F src/test8.c 58ea1d9698f3947e4662107ef98f429e84ae20e0 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60 F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad - F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e + F src/test_autoext.c 5c95b5d435eaa09d6c0e7d90371c5ca8cd567701 F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de F src/test_btree.c 5b89601dcb42a33ba8b820a6b763cc9cb48bac16 - F src/test_config.c 8437cba146aa12c2fddfa5d1a73eb4f5fe0ee8e6 -F src/test_config.c 95bb33e9dcaa340a296c0bf0e0ba3d1a1c8004c0 ++F src/test_config.c 6b614c603cb4db1c996f1b192ca0a46ef0d152cd F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c 8f786bfd0ad48030cf2a06fb1f050e9c60a150d7 @@@ -251,20 -246,20 +258,20 @@@ F src/update.c beef58f5fd66153ac9cdf6e9 F src/utf.c 8d819e2e5104a430fc2005f018db14347c95a38f F src/util.c f566b5138099a2df8533b190d0dcc74b7dfbe0c9 F src/vacuum.c 2727bdd08847fcb6b2d2da6d14f018910e8645d3 - F src/vdbe.c fee31825a8e287bb6ed2dacc33fb276c5e2ab7a5 -F src/vdbe.c 5f0047130f80c7fd0bc41bc51a653b5542c4fbd5 -F src/vdbe.h b52887278cb173e66188da84dfab216bea61119d -F src/vdbeInt.h c1e830268b75f04a2901dd895b51a637a26c7045 -F src/vdbeapi.c 085cf9bf169b859a6c8fa43791702bac805cb7aa -F src/vdbeaux.c ecb43014bcd3019e5aa2b5561e5c3a447f007a08 -F src/vdbeblob.c 5dc79627775bd9a9b494dd956e26297946417d69 ++F src/vdbe.c 349798f630ce49c2e21a6c30863f195c484cfec5 +F src/vdbe.h 1223e2548e0970cf96f573ff6b99f804a36ad683 - F src/vdbeInt.h bd76014fa5051b9f33223e4cc6a76d00ce031944 - F src/vdbeapi.c 8245e8c2cdcf105871a4ccae365d3bd29bfca6d1 ++F src/vdbeInt.h a6b7a1fbb2b335fd8c3b4b8a696b1ba28eae2191 ++F src/vdbeapi.c 5899f359cb51c6949aeff50a806275c94fe73fce +F src/vdbeaux.c 426263e901f19d8fe6bc7124ee5dafc78a2feac3 - F src/vdbeblob.c 11248c6362389569764682eb0f59ce910f3cc381 ++F src/vdbeblob.c 1268e0bcb8e21fa32520b0fc376e1bcdfaa0c642 F src/vdbemem.c 833005f1cbbf447289f1973dba2a0c2228c7b8ab F src/vdbesort.c 4fad64071ae120c25f39dcac572d716b9cadeb7f - F src/vdbetrace.c 8bd5da325fc90f28464335e4cc4ad1407fe30835 + F src/vdbetrace.c 3ad1b4e92b60c082a02ac563da4a2735cc7d297c F src/vtab.c b05e5f1f4902461ba9f5fc49bb7eb7c3a0741a83 - F src/wal.c f5c7b5027d0ed0e9bc9afeb4a3a8dfea762ec7d2 - F src/wal.h 29c197540b19044e6cd73487017e5e47a1d3dac6 + F src/wal.c 436bfceb141b9423c45119e68e444358ee0ed35d + F src/wal.h a4d3da523d55a226a0b28e9058ef88d0a8051887 F src/walker.c 3d75ba73de15e0f8cd0737643badbeb0e002f07b - F src/where.c 4ad2329c439a30ddb915a780f6f80bdffafe3a64 + F src/where.c d54e63087b52c309550aa2defdb20ef27add9f9a F test/8_3_names.test 631ea964a3edb091cf73c3b540f6bcfdb36ce823 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test 45c0201e28045ad38a530b5a144b73cd4aa2cfd6 @@@ -670,7 -670,7 +682,7 @@@ F test/pageropt.test 6b8f6a123a5572c195 F test/pagesize.test 1dd51367e752e742f58e861e65ed7390603827a0 F test/pcache.test 065aa286e722ab24f2e51792c1f093bf60656b16 F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 - F test/permutations.test 379cfbb9a5eea2499d05008c04d18ddb4f2c01a9 -F test/permutations.test d2918e9ee6d0008292e5a70e90eed23b0440ca88 ++F test/permutations.test a19a70a80836b5e183e46f4043fb7626446ab5e0 F test/pragma.test 60d29cd3d8098a2c20bf4c072810f99e3bf2757a F test/pragma2.test 3a55f82b954242c642f8342b17dffc8b47472947 F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552 @@@ -760,15 -760,15 +773,15 @@@ F test/subselect.test d24fd8757daf97daf F test/substr.test 18f57c4ca8a598805c4d64e304c418734d843c1a F test/superlock.test 1cde669f68d2dd37d6c9bd35eee1d95491ae3fc2 F test/sync.test a34cd43e98b7fb84eabbf38f7ed8f7349b3f3d85 - F test/syscall.test bea9bf329bff733c791310244617c2a76974e64a - F test/sysfault.test c79441d88d23696fbec7b147dba98d42a04f523f + F test/syscall.test a653783d985108c4912cc64d341ffbbb55ad2806 + F test/sysfault.test fa776e60bf46bdd3ae69f0b73e46ee3977a58ae6 F test/table.test a59d985ca366e39b17b175f387f9d5db5a18d4e2 F test/tableapi.test 2674633fa95d80da917571ebdd759a14d9819126 -F test/tclsqlite.test 37a61c2da7e3bfe3b8c1a2867199f6b860df5d43 +F test/tclsqlite.test a7308276aad2e6c0bfb5b0414424dd0d9cc0cad7 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d - F test/tester.tcl 4201c6efa80693e5414d4f241bb0f325a124478f -F test/tester.tcl 3b08771e6d601612fe62d13787db0e50aac4cf7b ++F test/tester.tcl c6dc3ea5b906b3665ab52c82c72237268adf506d F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7 @@@ -1025,8 -1025,8 +1038,8 @@@ F tool/mkkeywordhash.c bb52064aa614e142 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02 - F tool/mksqlite3c.tcl 521b39c2d2987c4257919b97a3cfb3bd4a394bf1 -F tool/mksqlite3c.tcl a61fe62a2895ca6458c463fccf1211ca1c000fcf -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 ++F tool/mksqlite3c.tcl 3e55715d165688d969392d792c81f79552049add +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795 F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 @@@ -1054,7 -1054,7 +1067,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac - P f1eed92b7b0ef4ee22a11d8bb4f9a572b56ce019 cbea02d93865ce0e06789db95fd9168ebac970c7 - R 0efc127a79bcb850db00f0f48c643639 -P 49cfa14fceeef2d55b449eb927c283ce6f650c07 -R 83c630a254d9cc209b10e1a83d85002b ++P 67b3c0efa7d5e0cb7cc0fc7606ab3f26ea5419fd 1a1cf5aa86734c832d845e07780262a178188d56 ++R 732bd62d8f3cf92b7ff68a9a14e06f6a U drh - Z a385c575da3bc80f399700b4e6cb7b5b -Z a7a8588b07b6fce1e57eced049fe41f1 ++Z d4e35c064e319291a70a72e245362c9b diff --cc manifest.uuid index 4581bba7a0,fa38fa5b2c..48e7eca177 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 67b3c0efa7d5e0cb7cc0fc7606ab3f26ea5419fd -1a1cf5aa86734c832d845e07780262a178188d56 ++6994826c0784280f2e9728dfa4185848846d03df