From: drh Date: Thu, 3 Sep 2015 14:31:00 +0000 (+0000) Subject: Merge enhancements from trunk. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7712ac43e8975cebf85fa2e84156f76591c0e360;p=thirdparty%2Fsqlite.git Merge enhancements from trunk. FossilOrigin-Name: d01658adf8680f3d128bb42ea8cc2f1acf46a569 --- 7712ac43e8975cebf85fa2e84156f76591c0e360 diff --cc manifest index a85c6134bc,5e842820c7..f5f295d0e1 --- a/manifest +++ b/manifest @@@ -1,7 -1,7 +1,7 @@@ - C Merge\sthe\slatest\strunk\senhancements. - D 2015-09-01T18:40:52.737 -C Add\sthe\ssqlite3VdbeLoadString()\sand\ssqlite3VdbeMultiLoad()\sroutines\sto\shelp\nwith\scode\sgeneration,\sespecially\son\sPRAGMAs.\s\sRename\ssqlite3VdbeAddGoto()\nto\sjust\ssqlite3VdbeGoto(). -D 2015-09-03T13:46:12.406 ++C Merge\senhancements\sfrom\strunk. ++D 2015-09-03T14:31:00.477 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f -F Makefile.in f85066ce844a28b671aaeeff320921cd0ce36239 +F Makefile.in 3d5c779460045b6fcc3179f46c27c4ab8716a189 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.msc b268d8be2e800b9d35f074b1ed6b2f698deebdd6 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 @@@ -282,10 -279,10 +282,10 @@@ F src/auth.c b56c78ebe40a2110fd361379f7 F src/backup.c 4d9134dc988a87838c06056c89c0e8c4700a0452 F src/bitvec.c d1f21d7d91690747881f03940584f4cc548c9d3d F src/btmutex.c 45a968cc85afed9b5e6cf55bf1f42f8d18107f79 - F src/btree.c d82a50a60222073786f21d1f93dd95d5718f0659 -F src/btree.c 4084d9eed2817331f6e6a82230ba30e448cad497 ++F src/btree.c 0ac85a1584ae17f0a13f4748a5c4f652fe0f4c66 F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1 F src/btreeInt.h 8177c9ab90d772d6d2c6c517e05bed774b7c92c0 - F src/build.c 511b02138eddc3cf68dab1016da4998260093e9f + F src/build.c 6c3a8a9b21402a6be98126f7d86b76527e68ca67 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0 F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b @@@ -300,13 -297,13 +300,13 @@@ F src/global.c 508e4087f7b41d688e4762dc F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5 F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 - F src/insert.c c31b9253f0d40425d012701ba6e7e4b28c1676ea + F src/insert.c bcff4a416177ed90faa8dba65f0266ddad2aeb76 F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59 F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712 F src/loadext.c dfcee8c7c032cd0fd55af3e0fc1fcfb01e426df2 -F src/main.c e17fcffae4306a9b8334faf3bac80d7396850b54 +F src/main.c d3fd6de724a28d6f3256a675c1234a685f5e4355 - F src/malloc.c 19461e159bccf0e2cf06a50e867963d0a7b124a8 + F src/malloc.c 021012e28a81ffdabf4c30ec3df6ce1f6cc93f1d F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3 @@@ -324,29 -321,28 +324,29 @@@ F src/os.c 5822c2b843a77219bba1e28887cd F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf F src/os_common.h abdb9a191a367793268fe553d25bab894e986a0e F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa - F src/os_unix.c ea4f5f4864101735f626e1e38faf74aa042979ee -F src/os_unix.c 76f493ed71c4154338049dee1bf6e47f69c74a55 -F src/os_win.c 40b3af7a47eb1107d0d69e592bec345a3b7b798a ++F src/os_unix.c 61841d3b4fee28918fb4206edafca7e0183f068b +F src/os_win.c 8a586f1f7e829e361a41a45fd6cf6a7cc44e7314 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca -F src/pager.c aa916ca28606ccf4b6877dfc2b643ccbca86589f -F src/pager.h 6d435f563b3f7fcae4b84433b76a6ac2730036e2 +F src/pager.c 4e202d93e77cfc8f316a99b5b8b0cd11bc65eb32 +F src/pager.h c2471a089cd23dc7e0a9aebb8800ccfd693928a1 F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7 F src/pcache.c cde06aa50962595e412d497e22fd2e07878ba1f0 F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9 - F src/pcache1.c a3fe31b17e841ec70beee72a2c960e9c787a8857 - F src/pragma.c 9eaa576bbe497290042ed0ddae0a0357fbb30021 + F src/pcache1.c b31af9dbc83b9c68e87d681b8453a9605f28e734 -F src/pragma.c d71b813e67bf03f3116b9dd5164fbfd81ec673a2 ++F src/pragma.c a6b01c318f5cc9723ee4df1b212bffbfc4697d3a F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a -F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1 +F src/prepare.c 176b060bcf36041193c2807f2b045dce1effa4bb - F src/printf.c 2bc439ff20a4aad0e0ad50a37a67b5eae7d20edc + F src/printf.c 0c4bcdd1c2e2521024f0a69cb5eb334f86b3652a F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f2ef256786a6435efddd64a632fea89c8be62215 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e - F src/select.c b52c80f2b1bdb62491f9ce40eea0c5f80c78d105 + F src/select.c c17613385bc6b095c421b1f30548814f5fd8a9b2 F src/shell.c bbe2bab590b7dd04dd8f9119d4473cb8c52906e3 -F src/sqlite.h.in 378bebc8fe6a88bade25e5f23b7e6123fdc64b00 +F src/sqlite.h.in 2dc1df9ca9e551aa54f3cd9ca65273e879cc832d F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1 F src/sqlite3ext.h f700e6a9dd1fdcccc9951ab022b366fb66b9e413 -F src/sqliteInt.h cac6c31a0c7e6aa5572cc97b68d2630034d6d212 +F src/sqliteInt.h 680a0371a53bf46a2ad795e4ef3ccf2df702a1b8 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e @@@ -400,29 -396,29 +400,29 @@@ F src/threads.c 6bbcc9fe50c917864d48287 F src/tokenize.c 57cb3720f53f84d811def2069c2b169b6be539a5 F src/treeview.c 46036cbbceada0836833531b2d963edbca3d9cfa F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f - F src/update.c adc8b4b2b6fd2cca2e0d2b803e0cf6956aa3a030 + F src/update.c 795fba8ebadeb194285b0a73a07f7ad5ae4d0410 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c - F src/util.c bc9dd64b5db544218b871b66243871c202b2781f + F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701 -F src/vdbe.c 6d85be995bd2308a5aa2a68c7b564c5d4cc1a6fb +F src/vdbe.c 30e368a0eea028063fd257220dd3ede860b67412 - F src/vdbe.h 7a75045d879118b9d3af7e8b3c108f2f27c51473 + F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad F src/vdbeInt.h 8b54e01ad0463590e7cffabce0bc36da9ee4f816 -F src/vdbeapi.c bda74ef4b5103d7b4a4be36f936d3cf2b56a7d6f -F src/vdbeaux.c fd00b489ab3f44f2dca1e4344faf289b7bfcf649 +F src/vdbeapi.c 0a32d5892d78b4d9b58d4756575eac15bd585579 - F src/vdbeaux.c feb3bec607e417059b839a55cf1b96792f8019bd ++F src/vdbeaux.c f1f5d5acac493d77c8b4240a5bc5c8b6aa7c1227 F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 F src/vdbemem.c ae38a0d35ae71cf604381a887c170466ba518090 F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0 - F src/vtab.c d31174e4c8f592febab3fa7f69e18320b4fd657a + F src/vtab.c 2ecfe020c10e0a0c7b078203fdba2fae844744bc F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb -F src/wal.c 8cd07f1f99e1a81346db1c9da879bef6c6f97cf6 -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 +F src/wal.c d973cff4571083ffb044c0bf4b69a27ca4b453b4 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68 F src/walker.c 2e14d17f592d176b6dc879c33fbdec4fbccaa2ba - F src/where.c 91e73ffc699c140a59baa03a6b7b060db02bed81 + F src/where.c f0e08e4f1f66ba1a0f5b70c5161cb031ce1fb858 F src/whereInt.h 901c17c1e3c82745ad9b85b4471543fa59c980e9 - F src/wherecode.c 3d9113cc307ffeed58db41fe9f2d807c94787ab5 + F src/wherecode.c c0d9b1c7c7c827998016809851d2ddc529de0fee F src/whereexpr.c 1a308d1ee5144890d21ea9cf70d49bc96a83432b -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 @@@ -1385,7 -1380,7 +1385,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P 650111f66721c33015f89cda4f5afcb6e0dc1643 1da60c3dda4254620052a83c853c2d2b6dd5009f - R 33b5f1d35d4a1d00c8978f4497176fb5 -P d7f4bdf594e93c848f46901637861c8eed4c34df -R 87d27a58ce6d4a6cd03f169f2370f2fe ++P 4af79477fd1c156bc31c397117a85ae72c286fe2 847387ec8e6fef283899578fb232b2c23b00ee5b ++R 2cdaeae584abbd4e78362222e21fe598 U drh - Z f2b555f2b9d4d5b5ce89faa6e40e5698 -Z bdbaccc5e83ea81c60c1b2c883af5b3e ++Z cb48b4a44973267b87943ae4a67d3f2b diff --cc manifest.uuid index b060605126,3428834616..0561ccf8af --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 4af79477fd1c156bc31c397117a85ae72c286fe2 -847387ec8e6fef283899578fb232b2c23b00ee5b ++d01658adf8680f3d128bb42ea8cc2f1acf46a569 diff --cc src/pragma.c index 7ef2d05a86,2dcad614f1..bfad34f45f --- a/src/pragma.c +++ b/src/pragma.c @@@ -956,8 -937,7 +951,8 @@@ void sqlite3Pragma */ case PragTyp_SYNCHRONOUS: { if( !zRight ){ - returnSingleInt(pParse, "synchronous", - returnSingleInt(v, "synchronous", pDb->safety_level-1); ++ returnSingleInt(v, "synchronous", + SQLITE_DbSafetyLevelValue(pDb->safety_level)-1); }else{ if( !db->autoCommit ){ sqlite3ErrorMsg(pParse,