From: dan Date: Tue, 28 Nov 2017 08:08:40 +0000 (+0000) Subject: Merge latest trunk changes, including the SQLITE_ENABLE_MULTITHREADED_CHECKS X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f7b590a8fb305214a95892973af5cd2e91f6900;p=thirdparty%2Fsqlite.git Merge latest trunk changes, including the SQLITE_ENABLE_MULTITHREADED_CHECKS feature, into this branch. FossilOrigin-Name: 1fd1034935b932e9e0a29b26931f7ccf9fb0bda916c4fa8b741bf6f48f124dda --- 1f7b590a8fb305214a95892973af5cd2e91f6900 diff --cc manifest index 521b52fd6f,58ec6b9026..2e5d421d03 --- a/manifest +++ b/manifest @@@ -1,8 -1,8 +1,8 @@@ - C Add\smissing\sentry\sfor\sSQLITE_IOERR_VNODE\sto\sthe\sswitch\sstatement\sin\nsqlite3ErrName(). - D 2017-11-17T20:22:11.947 - F Makefile.in 28a879888205a67bd3b54c68afa1cd2e939e8ead2179b1177756a101dd1eb86e -C Add\sexperimental\sfeature\sto\sdetect\sthreading\sbugs\sin\sapps\sthat\suse\nSQLITE_CONFIG_MULTITHREADED.\sEnabled\sat\scompile\stime\susing\nSQLITE_ENABLE_MULTITHREADED_CHECKS. -D 2017-11-28T07:52:00.416 -F Makefile.in 6a879cbf01e37f9eac131414955f71774b566502d9a57ded1b8585b507503cb8 ++C Merge\slatest\strunk\schanges,\sincluding\sthe\sSQLITE_ENABLE_MULTITHREADED_CHECKS\nfeature,\sinto\sthis\sbranch. ++D 2017-11-28T08:08:40.954 ++F Makefile.in c097996f4eea365f81c5e29a892cb198205c156a7cdfb2c3c1e10709cd419929 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 - F Makefile.msc 9e7628ad7d33be39ac041e452e47e648ae3d14afbaaa254096e3a4d1d7c1c653 -F Makefile.msc e5d7606238f55816da99f719969598df5b091aa2e9a6935c9412fcae8f53fc44 ++F Makefile.msc 6b76a1b3e7aa7af73ce870120ed880a288e0c7f1ee047940f62b23b514286726 F README.md f5c87359573c4d255425e588a56554b50fdcc2afba4e017a2e02a43701456afd F VERSION 0c10cdfed866fdd2d80434f64f042c3330f1daaed12e54287beb104f04b3faaf F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -415,7 -413,7 +416,7 @@@ F src/auth.c 6277d63837357549fe14e72349 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33 F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca - F src/btree.c 0553adcffea48b7981f86fe6d4a33dc6cdd7296e830035642560fb6ef157e768 -F src/btree.c b83a6b03f160528020bb965f0c3a40af5286cd4923c3870fd218177f03a120a7 ++F src/btree.c d9fa7d5bac99cb61224b5688bd8423250a77ec4b321d78e0f2a63461393b55be F src/btree.h 32ef5d3f25dc70ef1ee9cecf84a023c21378f06a57cd701d2e866e141b150f09 F src/btreeInt.h 55b702efce17e5d1941865464227d3802cfc9c7c832fac81d4c94dced47a71fc F src/build.c 514db9d494ed29155e552f2ec2fa7c55c0241f847c683156b7c017f4b0bad9fa @@@ -436,9 -434,9 +437,9 @@@ F src/hash.h ab34c5c54a9e9de2e790b24349 F src/hwtime.h 747c1bbe9df21a92e9c50f3bbec1de841dc5e5da F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71 F src/insert.c cb67cc56ef2ddd13e6944b2c0dd08a920bcd9503230adef8b9928d338097c722 -F src/legacy.c 134ab3e3fae00a0f67a5187981d6935b24b337bcf0f4b3e5c9fa5763da95bf4e +F src/legacy.c 83f4499122392b1f1527a5180b1e89951bf640611ce98768bde1a9f28f0f7dde F src/loadext.c 20865b183bb8a3723d59cf1efffc3c50217eb452c1021d077b908c94da26b0b2 - F src/main.c ffc97a6b87aee9a2b36bbf959c86c9d7625908eb406d2d9af885fe7b05e4e152 -F src/main.c 6a0cc1c7b8ab92374effecdd7b92792b3273a255c70575b7d67bd9a4315e6d3a ++F src/main.c 86466230c131651aee68d0eccac7a3bfbf3047865f7076be94bb03b470f19b1f F src/malloc.c a02c9e69bc76bee0f639416b947a946412890b606301454727feadcb313536d6 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de @@@ -474,12 -472,11 +475,12 @@@ F src/random.c 80f5d666f23feb3e6665a6ce F src/resolve.c bbee7e31d369a18a2f4836644769882e9c5d40ef4a3af911db06410b65cb3730 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac F src/select.c 17e220191860a64a18c084141e1a8b7309e166a6f2d42c02021af27ea080d157 - F src/shell.c.in a87f3094c1d2a07ed3f731409b33dbf36faf99157bfedb17855a664c60e1a909 + F src/shell.c.in c441d7ddfbb8120cd8a7cde838ca5c9167311a7e400b1077c3ae6090aa420be8 -F src/sqlite.h.in 8fd97993d48b50b9bade38c52f12d175942c9497c960905610c7b03a3e4b5818 +F src/sqlite.h.in d91e91266f023109e46160119cfd31490a11fe7006204dbf004f774b535fe1b8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 +F src/sqlite3_private.h aee73ebaea1963e528b61408c01ba82f49fdf3dca9cbe940f3b0f3d9cec25942 F src/sqlite3ext.h c02d628cca67f3889c689d82d25c3eb45e2c155db08e4c6089b5840d64687d34 - F src/sqliteInt.h c4e36ef253e69d1f5d2f39e5904f706f3760f8806654427ffeb6c4f4e5d1809e -F src/sqliteInt.h 4c910d9c0d88a90e8639a4f83ef05f701ccfe731cf593e757444074f01df4964 ++F src/sqliteInt.h 0b11f808eaebe2af9306e05b2121cf0c568b681f3677b274fa799d1c522af99e F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 9737ed017279a9e0c5da748701c3c7bf1e8ae0dae459aad20dd64fcff97a7e35 F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@@ -499,7 -496,7 +500,7 @@@ F src/test_backup.c bf5da90c9926df0a4b9 F src/test_bestindex.c 78809f11026f18a93fcfd798d9479cba37e1201c830260bf1edc674b2fa9b857 F src/test_blob.c ae4a0620b478548afb67963095a7417cd06a4ec0a56adb453542203bfdcb31ce F src/test_btree.c 8b2dc8b8848cf3a4db93f11578f075e82252a274 - F src/test_config.c 83e6fac74d659d28beb6657c1f31eb021c3204fec16cddb6a1adc373fe592557 -F src/test_config.c 2dad654eb81e90160f764f485bf7248e87b6d251e484c959de1aa04935acae8e ++F src/test_config.c b96c9de05be20c2668348893f6a0bc1576d096b1e8235538d9bf038934ff56a5 F src/test_delete.c e2fe07646dff6300b48d49b2fee2fe192ed389e834dd635e3b3bac0ce0bf9f8f F src/test_demovfs.c a0c3bdd45ed044115c2c9f7779e56eafff18741e F src/test_devsym.c 1960abbb234b97e9b920f07e99503fc04b443f62bbc3c6ff2c2cea2133e3b8a2 @@@ -543,25 -540,25 +544,25 @@@ F src/update.c 961bd1265d4d1e5cd65c9a54 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5 F src/util.c d01fa6f45bfad3b65fb2490513aa2e0676412c61b4b094340b513cf72c3704a4 F src/vacuum.c 90839322fd5f00df9617eb21b68beda9b6e2a2937576b0d65985e4aeb1c53739 -F src/vdbe.c 3393b508d9ad084ffce232a7c53e375ef5ac99b50b685c5131fcdfce97a9d534 +F src/vdbe.c bdf4118f1194272241feb97fbeebf83aa228ef95287fe6dc2cccc533ef0fc90c F src/vdbe.h d50cadf12bcf9fb99117ef392ce1ea283aa429270481426b6e8b0280c101fd97 F src/vdbeInt.h 1fe00770144c12c4913128f35262d11527ef3284561baaab59b947a41c08d0d9 -F src/vdbeapi.c 9c670ca0dcc1cd86373aa353b747b26fe531ca5cd4331690c611d1f03842e2a1 +F src/vdbeapi.c 896c36955ffc31154c258c69330c65830d4b300b779b8f6177d31ddc6bc2a14b F src/vdbeaux.c b02a1f842c0e916285643b8475b7189f10b76f9e7edb5e2353a913c7980f90b5 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191 - F src/vdbemem.c 2ef9e66b301a1e575e32966c4c0fd4844e8eea37a2f02bae78c4f68f50a6ab30 + F src/vdbemem.c 6e6082377183b8fd8d6f2bce45250b4c2e89bfeb534a094cd8612dae8aaa2fda F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c F src/vtab.c 0e4885495172e1bdf54b12cce23b395ac74ef5729031f15e1bc1e3e6b360ed1a F src/vxworks.h d2988f4e5a61a4dfe82c6524dd3d6e4f2ce3cdb9 -F src/wal.c beeb71e4eab65dbf0d95f2717efc6ca3c0f5b3090ce67f3de63828f39a6ff053 -F src/wal.h 8de5d2d3de0956d6f6cb48c83a4012d5f227b8fe940f3a349a4b7e85ebcb492a +F src/wal.c f940fd2e63228dede53d56a29364831f5a3f9e24232fbb9a6db3baec01f95f36 +F src/wal.h bada9007800e82f2765ad9ecd9f96176b45c71db769502e24de49d68c0acef65 F src/walker.c da987a20d40145c0a03c07d8fefcb2ed363becc7680d0500d9c79915591f5b1f - F src/where.c 031a80bcafe93934fd7052f3031c9e7eb36b61754c6c84d6bf0833184abad3db + F src/where.c 9752b68e03e2044f0faa4708fabb0189769067b660bffa931e1fd65736269659 F src/whereInt.h 82c04c5075308abbac59180c8bad5ecb45b07453981f60a53f3c7dee21e1e971 - F src/wherecode.c 8605c0ca0c34d4692011cf68a5f4cfc85352c1df917dc6eada320cecc4f5ea73 + F src/wherecode.c 611fcabd05592ed2febd7d182f9621425b0466c5232d70e0981c842d429356d5 F src/whereexpr.c 427ea8e96ec24f2a7814c67b8024ad664a9c7656264c4566c34743cb23186e46 -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77 F test/affinity2.test a6d901b436328bd67a79b41bb0ac2663918fe3bd F test/affinity3.test 6a101af2fc945ce2912f6fe54dd646018551710d F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 @@@ -1682,7 -1678,8 +1683,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 97ab1efe4ef2c368949d07dd77af3982523685d6ae3837befb0dd442b30190a2 - R c3368b6df62679cc72a0e09de1342f7a -P e6b89304695be371978e65dddd710c8bd563c66b9c94d23165142b6c235c82e1 12a23c0a66fac5c9674120b390f6abaeaba3f7ff04693b281af1eefb93d6f47c -R dd8aff31239aebcaa5e5379a4673912d -T +closed 12a23c0a66fac5c9674120b390f6abaeaba3f7ff04693b281af1eefb93d6f47c ++P e2b3e33537384633a1c160f1fc9c78d515684c942c2446eb339f375d10a42000 40b598c8392f030f6ed8c63ce81cb0426bb3984397c19c756215f6a569a40164 ++R a4104d8f12dc56d2dc5dca4b58c03e0d U dan - Z d3ca24198b11d809ddb19a5218db717b -Z bdded6a608898929c58df7d45769809f ++Z 2b822330764d4aa852a5ab08e7a63437 diff --cc manifest.uuid index 89c4d4ea20,2cef934b2b..98e256df42 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - e2b3e33537384633a1c160f1fc9c78d515684c942c2446eb339f375d10a42000 -40b598c8392f030f6ed8c63ce81cb0426bb3984397c19c756215f6a569a40164 ++1fd1034935b932e9e0a29b26931f7ccf9fb0bda916c4fa8b741bf6f48f124dda