From: drh Date: Wed, 28 Sep 2016 16:15:20 +0000 (+0000) Subject: Merge recent enhancements from trunk. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54f681e52fc51228074a8b2c5c0cd38a51b20f40;p=thirdparty%2Fsqlite.git Merge recent enhancements from trunk. FossilOrigin-Name: 06014163475051b7f3b3570e8af434362bbc5b87 --- 54f681e52fc51228074a8b2c5c0cd38a51b20f40 diff --cc manifest index 8c98a57c29,9899126ad2..021f4fa3d4 --- a/manifest +++ b/manifest @@@ -1,8 -1,8 +1,8 @@@ - C Merge\srecent\schanges\sfrom\strunk. - D 2016-09-16T17:50:57.342 -C Two\smore\stypo\sfixes\sin\scomments. -D 2016-09-28T16:05:53.347 -F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678 ++C Merge\srecent\senhancements\sfrom\strunk. ++D 2016-09-28T16:15:20.091 +F Makefile.in c9c70541089a9755069a9dad0b609cf14a382649 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 - F Makefile.msc c42e31c221bc01b22d4433bb43068ee79846207c -F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f ++F Makefile.msc 0793c4def0e01467219ba93abfaf92086c691c4b F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7 F VERSION 25e2e333adeff5965520bc8db999c658898c972d F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -302,11 -302,8 +302,11 @@@ F ext/session/session_common.tcl 9b696a F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7 F ext/session/sessionfault2.test 04aa0bc9aa70ea43d8de82c4f648db4de1e990b0 F ext/session/sqlite3session.c 37485891b4add26cf61495df193c419f36556a32 - F ext/session/sqlite3session.h 7b9037818ee61f7429ca83e9866885ca6de5f764 + F ext/session/sqlite3session.h 9345166bd8f80562145586cf817f707de5ecada2 F ext/session/test_session.c eb0bd6c1ea791c1d66ee4ef94c16500dad936386 +F ext/sqlrr/README.txt 4239030e73023e72a2e727808cd433577d5bf730 +F ext/sqlrr/sqlrr.c 8d1e6571cd6a6beabdb5bcdfe3a0e723b914db41 +F ext/sqlrr/sqlrr.h 09e4f8929ad9bc2638732c0cc0db5eef8c417824 F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04 F ext/userauth/userauth.c 5fa3bdb492f481bbc1709fc83c91ebd13460c69e @@@ -332,10 -329,10 +332,10 @@@ F src/auth.c 930b376a9c56998557367e6f7f F src/backup.c 92c2e3b5fcb47626413717138617f4d32f08aea4 F src/bitvec.c 3ee4c8b2c94ed3a7377256e18199e6ff5cf33f63 F src/btmutex.c bc87dd3b062cc26edfe79918de2200ccb8d41e73 - F src/btree.c 0a3308f223e400a4865ba611073888683fce4af6 -F src/btree.c 56e1732ecfb3731efcb216266ec26b1b96e5e8c9 ++F src/btree.c 39e9ee325135c6ecfdea044286050d5c6ca2751e F src/btree.h d05b2fcc290991a8a3d9ea1816ddd55a4359dcde F src/btreeInt.h c18b7d2a3494695133e4e60ee36061d37f45d9a5 - F src/build.c 7438b6dae3022818100a79ebbad707b5c65f9344 + F src/build.c 9a1f228cfa0aec70e2b4eba1fcf141ca4b499f6e F src/callback.c 2e76147783386374bf01b227f752c81ec872d730 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7 @@@ -352,9 -349,9 +352,9 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c 427e96ff168b6b187a52c3d06b9f9e41f6ffb212 -F src/legacy.c 75d3023be8f0d2b99d60f905090341a03358c58e +F src/legacy.c b419b813f192eef79d73f968511d2ee129525e21 F src/loadext.c 5d6642d141c07d366e43d359e94ec9de47add41d - F src/main.c 8525df779c1bbf6c0350d6971cd9b37a8c10ba3a -F src/main.c c9e49e376820bccca55fa9bf2ca321a51725db91 ++F src/main.c 406b69b61b3eaa5b0271542513e46b5a929afbb3 F src/malloc.c 1443d1ad95d67c21d77af7ae3f44678252f0efec F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b @@@ -373,29 -370,28 +373,29 @@@ F src/os.c c03b50496df5815e8f6d45bae440 F src/os.h 8e976e59eb4ca1c0fca6d35ee803e38951cb0343 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 F src/os_setup.h 0dbaea40a7d36bf311613d31342e0b99e2536586 -F src/os_unix.c be9ca0f901a2b6c1bc93dc338f4863675180c189 -F src/os_win.c 520f23475f1de530c435d30b67b7b15fe90874b0 +F src/os_unix.c 5f558f9433256f25d2f2dd852c7e93a84c05e1e4 +F src/os_win.c 8ba3403e276b0b01fd822bfcc162b83cacc80a1a F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a -F src/pager.c bf5b71bde3e9b6110e7d6990607db881f6a471a2 -F src/pager.h 966d2769e76ae347c8a32c4165faf6e6cb64546d +F src/pager.c 06b9b230273dbbd700a6f2bfe39d51be4bb0da03 +F src/pager.h 16644d79a66502f77389648ad5f2dca0ce0095de - F src/parse.y 0e0b6d46a990d01e4ca1e9d7e1d2d9b5a98f6bcb + F src/parse.y 6ad22b8f4a673de775d68c5c306dddd15839c45f F src/pcache.c 5583c8ade4b05075a60ba953ef471d1c1a9c05df F src/pcache.h 2cedcd8407eb23017d92790b112186886e179490 -F src/pcache1.c 4bb7a6a5300c67d0b033d25adb509c120c03e812 -F src/pragma.c d932ba278654617cdd281f88a790a3185fca7c44 +F src/pcache1.c 42fc9916238609e499c04e521138cecd42a20b90 +F src/pragma.c 7a32fcc81f3c765621dba31a248dfbeb0342b569 F src/pragma.h 64c78a648751b9f4f297276c4eb7507b14b4628c -F src/prepare.c 0fcf16eaacc90c1059055519a76b75b516a59a88 +F src/prepare.c 9d96dd74aabcae932604807f178ccb5c420e160e F src/printf.c a5f0ca08ddede803c241266abb46356ec748ded1 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c 3c3cf0dc719cd2a32ab5c1e10c26481dd565492e F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac - F src/select.c 244f9cc5e4662987cd2ef5c22d1b7027560f3425 - F src/shell.c ae7058efb5084b4b9576dc5485bb3d2870b1974a - F src/sqlite.h.in e0462107113cb8333d9ffda8c4c00b8870d91462 + F src/select.c 6dede310d202f7a0da7f4ac1921f153707fa3d4f + F src/shell.c b80396d2fadce4681397707e30078bf416e1dec2 -F src/sqlite.h.in 2683a291ed8db5228024267be6421f0de507b80e ++F src/sqlite.h.in b5a94ea112d93188c97469c28f5b7a6291274c52 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1 F src/sqlite3ext.h 8648034aa702469afb553231677306cc6492a1ae - F src/sqliteInt.h 8a856df8ece345509dcd94b5653bf114eabb5e57 -F src/sqliteInt.h 1137559f2e6f4e55d26ec83ce94ef57aa3748c8f ++F src/sqliteInt.h 0b39c63b51d0cb9a6ebce3d1af37a1c4b9005e42 F src/sqliteLimit.h c0373387c287c8d0932510b5547ecde31b5da247 F src/status.c a9e66593dfb28a9e746cba7153f84d49c1ddc4b1 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 @@@ -415,8 -411,8 +415,8 @@@ F src/test_backup.c bf5da90c9926df0a4b9 F src/test_bestindex.c d23f80d334c59662af69191854c76b8d3d0c8c96 F src/test_blob.c a0f7ad49a0c9d4b72f693fe2a71c58d7e507174d F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274 -F src/test_config.c 4d3d4a886416f369771d69a6dba926866deda788 +F src/test_config.c e91bd1471a56cf0267fd934f13e916b788e5f7af - F src/test_delete.c f4920c10d7208ac55ee03882de9709cf39a83fec + F src/test_delete.c 32690ea215abf29dda589a580cd1b790389759b6 F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e F src/test_devsym.c 4e58dec2602d8e139ca08659f62a62450587cb58 F src/test_fs.c e16cbe68d3b107e00a907c20a9a02629870eb69b @@@ -452,30 -448,30 +452,30 @@@ F src/test_wsd.c 41cadfd9d97fe8e3e4e44f F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c 78c8085bc7af1922aa687f0f4bbd716821330de5 F src/treeview.c f51b75a28b377adde9f79bc3deb6c7770bcf97c0 - F src/trigger.c cae81f6c65c4977bc2cbd27d43bfee478710853c + F src/trigger.c 3419bb9862983d84d70735fb4c94b21b934cd0c5 F src/update.c 8179e699dbd45b92934fd02d3d8e3732e8da8802 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c - F src/util.c 810ec3f22e2d1b62e66c30fe3621ebdedd23584d + F src/util.c 3e2da6101888d073e79ecc6af5e0a2f70fa1e498 F src/vacuum.c 913970b9d86dd6c2b8063ef1af421880f1464ec3 - F src/vdbe.c 108964db8a690d3a4635daba25fe2742cb808e96 - F src/vdbe.h 67bc551f7faf04c33493892e4b378aada823ed10 - F src/vdbeInt.h c59381049af5c7751a83456c39b80d1a6fde1f9d - F src/vdbeapi.c 17e7b6517d964149abc12dadcbea84a2b71a741b - F src/vdbeaux.c 12831f89de66a23d575d129dc1bda543a09a80c7 -F src/vdbe.c 6781329737f4bb140834cd32b15e93b83d60858e ++F src/vdbe.c 5860e52c8103bc42f5fcd97dbfa72cc4c1806edc + F src/vdbe.h c044be7050ac6bf596eecc6ab159f5dbc020a3b7 + F src/vdbeInt.h d21f14721dd87975dc9e3bcdbf504f9c098cf611 -F src/vdbeapi.c 794f80669e9e3b9b3edc78d80c15968985c7bf21 ++F src/vdbeapi.c 7c42a9682cafe2835197763ff5f26c3e546d053e + F src/vdbeaux.c b9772e4134a17f5b42d32761f5119467815c2458 F src/vdbeblob.c 3e82a797b60c3b9fed7b8de8c539ca7607874937 - F src/vdbemem.c 357caac1a404f37ee6087b17613f92107c13f733 + F src/vdbemem.c 07874c2ac7c05f7df1ededc6ec6650c1339b2cad F src/vdbesort.c 91fda3909326860382b0ca8aa251e609c6a9d62c F src/vdbetrace.c 41963d5376f0349842b5fc4aaaaacd7d9cdc0834 F src/vtab.c e02cacb5c7ae742631edeb9ae9f53d399f093fd8 F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c 02eeecc265f6ffd0597378f5d8ae9070b62a406a -F src/wal.h 6dd221ed384afdc204bc61e25c23ef7fd5a511f2 +F src/wal.c 25bc1cea2ab18a917548dd0a30c299c538878ef9 +F src/wal.h f38853cd771ff42f448de4f908238f2e2966ac8f - F src/walker.c 2d2cc7fb0f320f7f415215d7247f3c584141ac09 - F src/where.c d0ca1b5e1c56249e7725cea66ce4e172c5845dec + F src/walker.c 91a6df7435827e41cff6bb7df50ea00934ee78b0 + F src/where.c 5f91be9fe122e847c4e72d54d3989eb32a927981 F src/whereInt.h 14dd243e13b81cbb0a66063d38b70f93a7d6e613 F src/wherecode.c e412e09abad1eea213d85594cf46db9f877db56d - F src/whereexpr.c e3db778ed205e982f31960896db71c50612ae009 + F src/whereexpr.c 3d8813ef320f10bd27e6c0d784abe1669cfb514e -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7 @@@ -663,10 -659,10 +663,10 @@@ F test/e_select2.test aceb80ab927d46fba F test/e_totalchanges.test b12ee5809d3e63aeb83238dd501a7bca7fd72c10 F test/e_update.test f46c2554d915c9197548681e8d8c33a267e84528 F test/e_uri.test 25385396082b67fd02ae0038b95a3b3575fe0519 - F test/e_vacuum.test 9e5e47e4059a779c777f47e0f560fc82c99336df + F test/e_vacuum.test 1b8b4772d05374aa1b8958669138bbb4213ee26a -F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625 +F test/e_wal.test 95c21e45eefe4cc31e820f998b14f92d1cb3a1bf F test/e_walauto.test 248af31e73c98df23476a22bdb815524c9dc3ba8 -F test/e_walckpt.test 28c371a6bb5e5fe7f31679c1df1763a19d19e8a0 +F test/e_walckpt.test 9f20ab843538484c57069074b126699266ee5521 F test/e_walhook.test 4c0613a0c76e7a9d5c4c211e1b4cbcc1143914df F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea F test/enc2.test 83437a79ba1545a55fb549309175c683fb334473 @@@ -679,10 -675,10 +679,10 @@@ F test/exclusive.test ff85192dcf5000a1b F test/exclusive2.test 32798111aae78a5deec980eee383213f189df308 F test/exec.test e949714dc127eaa5ecc7d723efec1ec27118fdd7 F test/exists.test 79a75323c78f02bbe9c251ea502a092f9ef63dac - F test/expr.test 79c3e7502d9e571553b85f0ecc8ff2ac7d0e4931 + F test/expr.test 66a2c9ac34f74f036faa4092f5402c7d3162fc93 F test/extension01.test 00d13cec817f331a687a243e0e5a2d87b0e358c9 F test/extraquick.test cb254400bd42bfb777ff675356aabf3287978f79 -F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7 +F test/fallocate.test fe52076a43ff99da8411990dbb4f374e81e88c85 F test/filectrl.test 7c13f96457435238da99aff7343ad6a3a4885787 F test/filefmt.test e4edbdc637ca9576ccf4337a3cce627d9df7a56c F test/fkey1.test 13e3d48236a2b9f5c5ebd232eef9b3ab682a8a2c @@@ -996,11 -991,11 +996,11 @@@ F test/pagerfault3.test 1003fcda009bf48 F test/pageropt.test 84e4cc5cbca285357f7906e99b21be4f2bf5abc0 F test/pagesize.test 5769fc62d8c890a83a503f67d47508dfdc543305 F test/parser1.test 391b9bf9a229547a129c61ac345ed1a6f5eb1854 -F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b +F test/pcache.test 9a04fa260cb47dd4fdc5d13c5e97054e05931592 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff - F test/permutations.test 544a2f317fc5045bc512ae432f89eae303c0d640 + F test/permutations.test cd0b7bc04bf5e50d3a993d24c834d591f7d4f5fe -F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8 +F test/pragma.test d3b32e689ffd885b2e7bcaabab21ee4652a4f99f F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc @@@ -1092,9 -1087,9 +1092,9 @@@ F test/shell4.test 89ad573879a745974ff2 F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 -F test/shrink.test 1b4330b1fd9e818c04726d45cb28db73087535ce +F test/shrink.test 09bc6e2473321e7a4711ae7d753865daffc42f4a F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329 - F test/skipscan1.test f2d4482f195f018c3732374d3985fc34bcc3ae1a + F test/skipscan1.test 8ab5d2c7c5cd3fe7f172d366e6e74e887cb33cb4 F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a F test/skipscan3.test ec5bab3f81c7038b43450e7b3062e04a198bdbb5 F test/skipscan5.test 67817a4b6857c47e0e33ba3e506da6f23ef68de2 @@@ -1470,9 -1465,9 +1470,9 @@@ F tool/mkopcodeh.tcl a01d2c1d8a6205b03f F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e F tool/mkpragmatab.tcl f0d5bb266d1d388cf86fce5ba01a891e95d72d41 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 - F tool/mksqlite3c-noext.tcl aa58ea3be311c81821c2cd3209f55e46b07ab656 - F tool/mksqlite3c.tcl bfafc3e96885a2afa8b0d733826ee89e2db3d8b3 - F tool/mksqlite3h.tcl e7b106fc4f29fbc258e8ba9b88d9108332ea2ade + F tool/mksqlite3c-noext.tcl fef88397668ae83166735c41af99d79f56afaabb -F tool/mksqlite3c.tcl 06b2e6a0f21cc0a5d70fbbd136b3e0a96470645e ++F tool/mksqlite3c.tcl 8f15b936d872f576a71676b91e7dc6404b27bf66 + F tool/mksqlite3h.tcl c006c4e5da57c649b24b689511dcd270dd7b0249 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mkvsix.tcl 4abcaf3267171b2faadaf9b82a0dfbaa6e98f8b7 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 @@@ -1530,7 -1525,7 +1530,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 - P 00759af053e0ea9bd73dba2cf6cad83598ea393b a92aee5520cfaf85ae896365a7e42bdd981f828d - R aefb160798c8094f09768853fde42ea3 -P 5bbd071d57a8048e2ca17bf97761e4f27fc5a6bf -R bf0761c46088be2deeef7ae66a06e596 ++P e3d9efa2770cd789ece3f4db4941b901c8b805ad 40c0fb0af678797c39a99853f9f4102464c16f4b ++R 89bdba00312d25d8261efa344ac63fa8 U drh - Z 6cfd68a87e88d588fc1f4e0c7b3676e7 -Z f28f9e255c7712d05cf98e2e813edaa6 ++Z ace1466a283f1236a2a6574723ddf758 diff --cc manifest.uuid index a2f1a65988,dd204bcb38..4b2f547320 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - e3d9efa2770cd789ece3f4db4941b901c8b805ad -40c0fb0af678797c39a99853f9f4102464c16f4b ++06014163475051b7f3b3570e8af434362bbc5b87