From: dan Date: Tue, 15 May 2018 11:55:15 +0000 (+0000) Subject: Merge latest trunk changes into this branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ccceeb3bd9bac2f07ec0e6ecf2073d899a6055a;p=thirdparty%2Fsqlite.git Merge latest trunk changes into this branch. FossilOrigin-Name: 72f39efa9b1b97a54fe35d005b48f7e8b57d6285ba42f36487f796e09c710958 --- 6ccceeb3bd9bac2f07ec0e6ecf2073d899a6055a diff --cc manifest index c72ddc05cb,8daeacb9f3..be1c33dcf3 --- a/manifest +++ b/manifest @@@ -1,10 -1,10 +1,10 @@@ - C Instead\sof\sjust\sthe\sflags\sbyte,\sinclude\sthe\sfirst\s8\sbytes\sof\sthe\srelevant\spage\nin\san\son-commit\sconflict\slog\smessage. - D 2018-05-15T11:33:42.540 -C Merge\slatest\strunk\schanges\swith\sthis\sbranch. -D 2018-05-15T11:45:47.702 ++C Merge\slatest\strunk\schanges\sinto\sthis\sbranch. ++D 2018-05-15T11:55:15.243 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea - F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439 + F Makefile.in bfc40f350586923e0419d2ea4b559c37ec10ee4b6e210e08c14401f8e340f0da F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 - F Makefile.msc 59179295f6a9b433e3f59a6dc2fcf6db6fcac35d92015294beb5d27f2924ebb9 + F Makefile.msc 681fb88cccf1fd58c0b9648f6a09b75332206ef72ca76012ad11699c320cec5f F README.md 7764d56778d567913ef11c82da9ab94aefa0826f7c243351e4e2d7adaef6f373 F VERSION b7c9d1d11cb70ef8e90cfcf3c944aa58a9f801cc2ad487eebb0a110c16dfc2df F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 @@@ -437,10 -438,10 +438,10 @@@ F src/auth.c 6277d63837357549fe14e72349 F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6 - F src/btree.c 05cb666b7e30e8d9f1bda9abcf2cfe510193864fd2508c2dc98f5b99726d0eb8 - F src/btree.h 0cd745755efd1f3df4c70544c54253920ea32fe6b179b97e9daeb786ba0de4ba -F src/btree.c 9e839c8c1eae03db1c81e9d667b19af794bc6f505a455f55fede5cc2ac5ff8cb ++F src/btree.c 677a5e36f99f6f38302caae30d28cb2e4b9e059459e57bf8f631bf23ab12d62c + F src/btree.h 373828f7fe66755c43d1c16ba9fb019c485d327e05ad2a7a8aedd34a37f9cff1 F src/btreeInt.h 6c65e6c96f561596f6870c79a64d4706af81613881d7947e3f063e923f14115f - F src/build.c 1ef8945748702f0069521bafe33df41647bea777fd2353c73530d522a9fedaf8 + F src/build.c 8add8a528a570e60614ae0f95a4886762645d63a874fff965cf7e66aea5cf890 F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/ctime.c 849d4cebe008cfc6e4799b034a172b4eaf8856b100739632a852732ba66eee48 @@@ -489,19 -490,19 +490,19 @@@ F src/parse.y 87ff3ca6203dd59ba2866f2b3 F src/pcache.c 135ef0bc6fb2e3b7178d49ab5c9176254c8a691832c1bceb1156b2fbdd0869bd F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170 F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880 - F src/pragma.c bea56df3ae0637768c0da4fbbb8f2492f780980d95000034a105ff291bf7ca69 + F src/pragma.c c0d13c0e82a9197aef5533d63300c5b0c8a216ae1fd14ada64e1f12f398d7e82 -F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324 +F src/pragma.h ce41efb7d4cdafca499839f29014d9b1d9534c8f503eeceb88310920c62d6097 - F src/prepare.c d16cb8a553c09bc0c46c33f8e0add77c8f755cfb4681ca5101aaff3a04df9625 - F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660 + F src/prepare.c 95a9dba7a5d032039a77775188cb3b6fb17f2fa1a0b7cd915b30b4b823383ffa + F src/printf.c 74ca0348796b490cdc56c85a8fb1abaa423c15c869712f54bf49fca65aa1dda1 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac - F src/select.c daf07d8defce3311f9e69f1280a874d78bc1d16c305f6aa689640f7afa02842f - F src/shell.c.in d63f06c870ec1761ea98bd1cae651ff0ea6beadf8be892105dabd913f94cb3da - F src/sqlite.h.in 4ef0c79b0740f6335af2e355a28241b19c0ca2fe2d95dba379aae3cb77dcd789 + F src/select.c a35d462ee7a3c0856ad7a9d9c8921fbf3d91d911a8f39ad9d61302eb43b24a71 + F src/shell.c.in 53affa90711f280342f7238f9c9aa9dcaed321ec6218a18043cf92154ef8a704 + F src/sqlite.h.in 25df0b6ff958ea6cd19feaba60cd029f6bb97b101a87991ee5b72aa8504a6bc8 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8 - F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d - F src/sqliteInt.h 288351b650168c06cb83e4ffdf562ee8dbd34d7ba825858684a5b19c15b906f6 + F src/sqlite3ext.h 9887b27e69c01e79c2cbe74ef73bf01af5b5703d6a7f0a4371e386d7249cb1c7 -F src/sqliteInt.h b05e12d7c8758edf216c83de4589c71cffb09429561686cb1469d95e69496ee1 ++F src/sqliteInt.h 1fdcc239cbc8e7f21b71d7cb0f88af5a8c1df6c4b2afb3fd493f82222b9a6626 F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34 @@@ -559,9 -560,9 +560,9 @@@ F src/test_windirent.h 90dfbe95442c9762 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 4ae07fa022a3dc7c5beb373cf744a85d3c5c6c3c F src/tokenize.c bbde32eac9eb1280f5292bcdfef66f5a57e43176cbf9347e0efab9f75e133f97 - F src/treeview.c 6cea286ca9af8b126dae9714799265353387244eba0d451c3cc2cd60946cc4c7 + F src/treeview.c 2c5c4bc0a443401db5fd621542150452ddf5055d38edd4eef868bc2b6bfb0260 F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995 - F src/update.c d46f8fb3782dc736c8f2c8b482443b22db1e6a764c8f6a5148a280cd05696d14 -F src/update.c 5be2f501ddc704fc04183bdb28b25eab930bb8553d973429a089ec94fa85cf2b ++F src/update.c b25b06e7e2bfccdb200ce2c1f72301485312cf33b50bb5af3f460d58b527a58c F src/upsert.c ae4a4823b45c4daf87e8aea8c0f582a8844763271f5ed54ee5956c4c612734f4 F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5 F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157 @@@ -1738,7 -1739,7 +1741,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 de19abb950e4186c491c39112a52062871ac44fc2bdc5b611e9fdfa611352716 e7dc03e7439f224e4bec458f27fe364f2fb1ac637328657a578ada693ae22842 - R 56e72c0c1bd42f01c3a903f76a21fc3d -P e7dc03e7439f224e4bec458f27fe364f2fb1ac637328657a578ada693ae22842 3012df8b2c0b19d27260f389147a96c501aee9a4aee3813834cc9e438dbacede -R 1e64dc3b16d9c2edfd9ea16514b24f67 ++P 52e443eb5523963a6b09be66ab1c7281930d0155bf3df13eee0ec9066dbc7f0b ae86cf60b6648a7ec789e233c9b0cc826efbbb0f301140b4848dc84d691ccd4f ++R 45958e0055bbe3678e884fba4517536e U dan - Z fdbeeb03d112744717f4fcaae64d2c9c -Z 05691c6c8de9545c4017be53ed219cff ++Z 723c12a5222191befc67edc8026882cb diff --cc manifest.uuid index b1e5e821b3,809a5587df..a063cf60f4 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 52e443eb5523963a6b09be66ab1c7281930d0155bf3df13eee0ec9066dbc7f0b -ae86cf60b6648a7ec789e233c9b0cc826efbbb0f301140b4848dc84d691ccd4f ++72f39efa9b1b97a54fe35d005b48f7e8b57d6285ba42f36487f796e09c710958 diff --cc src/sqliteInt.h index a9fe5a506c,e4fb5deb04..bf14a08822 --- a/src/sqliteInt.h +++ b/src/sqliteInt.h @@@ -1507,8 -1507,8 +1507,9 @@@ struct sqlite3 #define SQLITE_Fts3Tokenizer 0x00400000 /* Enable fts3_tokenizer(2) */ #define SQLITE_EnableQPSG 0x00800000 /* Query Planner Stability Guarantee*/ #define SQLITE_TriggerEQP 0x01000000 /* Show trigger EXPLAIN QUERY PLAN */ + #define SQLITE_ResetDatabase 0x02000000 /* Reset the database */ +#define SQLITE_NoopUpdate 0x01000000 /* UPDATE operations are no-ops */ /* Flags used only if debugging */ #ifdef SQLITE_DEBUG #define SQLITE_SqlTrace 0x08000000 /* Debug print SQL as it executes */