From: drh Date: Fri, 29 May 2015 19:04:58 +0000 (+0000) Subject: Import recent enhancements from trunk. X-Git-Tag: version-3.13.0~148^2~54 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad2c1dd7824ea4fe8e03f656644e9697e24c318e;p=thirdparty%2Fsqlite.git Import recent enhancements from trunk. FossilOrigin-Name: 54bec164ebeaf62d783352b3c4d0de8845394091 --- ad2c1dd7824ea4fe8e03f656644e9697e24c318e diff --cc manifest index 365d439600,81903c791d..25dfe229ee --- a/manifest +++ b/manifest @@@ -1,9 -1,9 +1,9 @@@ - C Merge\sbug\sfixes\sfrom\strunk. - D 2015-05-22T23:51:30.691 -C Ensure\sthat\sallocateBtreePage()\salways\sclears\sthe\sMemPage\spointer\swhen\nit\sfails\sdue\sto\san\sI/O\sor\smemory\sallocation\serror. -D 2015-05-29T18:42:11.874 ++C Import\srecent\senhancements\sfrom\strunk. ++D 2015-05-29T19:04:58.908 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 66db4ec2c6cd63d0f3e29d366aaaab769aba175b -F Makefile.in 994bab32a3a69e0c35bd148b65cde49879772964 ++F Makefile.in 58c16cc8cd876ed112902e70cf33d33f3270b5aa F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc ea72907f6c4b92181dd6dfca665253025705d85f -F Makefile.msc d37d2c2323df3acae6e24c71a478889421c17264 ++F Makefile.msc f4c7677780d417c7574b61904ad9195124675b26 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 F README.md 0bfccb18927349653c09137a458b961fa8ab4cb9 F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db @@@ -189,7 -171,7 +189,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 4a6b557c390edd263cf975a9d2837d5efb6a1217 -F main.mk 8d418497da6a152a59b00d64ae3d66f3c665974c ++F main.mk 3ba6bc8133b4b2f020a9c6043aa1fe7e35d16cb2 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk d5e22023b5238985bb54a72d33e0ac71fe4f8a32 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -233,7 -215,7 +233,7 @@@ F src/journal.c b4124532212b6952f42eb2c F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770 F src/loadext.c 29255bbe1cfb2ce9bbff2526a5ecfddcb49b9271 - F src/main.c 3fd7ec2399ce67b7dda1b155925d95b8afe2b9ea -F src/main.c 3a610587018485d9a12e38899dd8b8129b04d836 ++F src/main.c 1659e2e8deee8b4ce7c0be8cd37739b13bbfa2bd F src/malloc.c 908c780fdddd472163c2d1b1820ae4081f01ad20 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987 @@@ -266,14 -248,14 +266,14 @@@ F src/pragma.h b8632d7cdda7b25323fa580e F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1 F src/printf.c 13ce37e5574f9b0682fa86dbcf9faf76b9d82a15 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 - F src/resolve.c 99eabf7eff0bfa65b75939b46caa82e2b2133f28 + F src/resolve.c 84c571794e3ee5806274d95158a4c0177c6c4708 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e - F src/select.c 6adad8d698a382f83009eed7b73080273fa993ca + F src/select.c 5978cc521cb8fc1aa6a0089e35edaf531accb52a -F src/shell.c 07dda7cd692911d2f22269953418d049f2e2c0ee -F src/sqlite.h.in 4d0ecd8e1e0272d9a2742b39602f5e4fad8d3246 +F src/shell.c f26cca96f7dadab5efb5e655edf548f4b91695c5 - F src/sqlite.h.in 5808551a21911fb58584316ccf878c4cd74d3258 ++F src/sqlite.h.in 9d68f87febe52dbba2f3fb30d68aeba38ab957e2 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 2ebeb634e751a61a6f0eebfa0f4669f46a42f6cd - F src/sqliteInt.h 88f58e88856dcfed5b03ae020335e3a562c91f29 -F src/sqliteInt.h bc8496de6a514ac66a5a938ee0e4f0d17d150c77 ++F src/sqliteInt.h 7f3d18ce72c0a3c81961941f9f288975bd134378 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179 F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e @@@ -324,19 -306,19 +324,19 @@@ F src/test_vfs.c 3b65d42e18b262805716bd F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698 F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9 F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481 - F src/tokenize.c af8cbbca6db6b664ffecafa236b06629ef6d35c4 + F src/tokenize.c baa0e550dfa76a8d781732a7bfb1f0aa094942f2 F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f -F src/update.c 487747b328b7216bb7f6af0695d6937d5c9e605f +F src/update.c 24dd6a45b8b3470e62702128ebf11be1f2693145 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c a6431c92803b975b7322724a7b433e538d243539 F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701 -F src/vdbe.c 6aee8a041742413ab3113e6682bc7ad1628a2bbe -F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d -F src/vdbeInt.h f0ccddac48583d5f762dc554a9f79e85ea8807e0 -F src/vdbeapi.c 6a0d7757987018ff6b1b81bc5293219cd26bb299 -F src/vdbeaux.c 46f9bc4b32866082eb87a36b461e487a0bbdbe8e -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 -F src/vdbemem.c 21f9169289a804308f6cdde55e9417fb8336997f +F src/vdbe.c e4b07daec26aaeb3700308f82770485f0a28a988 +F src/vdbe.h 01d8c35cb877faca74331bb690f0327493c2cb50 +F src/vdbeInt.h 50e298245b66b320c8930219c8aeab492c9a4cce +F src/vdbeapi.c a5d2e8afd53b4f81934f5ca59c04465cd1a6d50d - F src/vdbeaux.c 38233cc7faa4ad1dfbc1a9bc5a54ecf996d6840b ++F src/vdbeaux.c 9b50d9248b54a9961fdd4d5a9ec5c05f93045a7b +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846 +F src/vdbemem.c c704f0f2515a658d8d1566a5f2f3dc9870622427 F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0 F src/vtab.c c535e80259ebe616467181a83a4263555b97c694 @@@ -836,7 -820,7 +838,7 @@@ F test/pagesize.test 5769fc62d8c890a83a F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff - F test/permutations.test 7019d6cb0452372b4b5475ebd145a65f746f1f1b -F test/permutations.test 32e2b82e0dfbe5c6b6b38a5c1f4cac194298ad4e ++F test/permutations.test 47e3d26e7412ae56b990c93e25ee2c49caa7f28e F test/pragma.test be7195f0aa72bdb8a512133e9640ac40f15b57a2 F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c @@@ -1259,11 -1243,11 +1262,11 @@@ F tool/logest.c eef612f8adf4d0993dafed0 F tool/mkautoconfamal.sh d1a2da0e15b2ed33d60af35c7e9d483f13a8eb9f F tool/mkkeywordhash.c dfff09dbbfaf950e89af294f48f902181b144670 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e - F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d + F tool/mkpragmatab.tcl 40c287d3f929ece67da6e9e7c49885789960accf F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 69bae8ce4aa52d2ff82d4a8a856bf283ec035b2e -F tool/mksqlite3c.tcl fdeab4c1eed90b7ab741ec12a7bc5c2fb60188bd -F tool/mksqlite3h.tcl 44730d586c9031638cdd2eb443b801c0d2dbd9f8 +F tool/mksqlite3c.tcl 508aac36881e12c4f6e5eb72d9920d1fbc1a1216 +F tool/mksqlite3h.tcl 96d92fcac21c6037d9db20c7cb2e06b534b550ac F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mkvsix.tcl 3b58b9398f91c7dbf18d49eb87cefeee9efdbce1 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 @@@ -1297,7 -1281,7 +1300,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f - P cdc0ca6fb36e787b981fb544a27c6df838f85704 c404fcace83613a50015f15097b7f28123c221c3 - R 957ffe62dcf25805db0612a32b474c17 -P db4e9728fae5f7b0fad6aa0a5be317a7c9e7c417 -R 203c94cd3aa280d28c1c7c31381f4eb0 ++P 519054bb72e8f8977b11161c81b0e96ba7bca589 09a38bf665902834936d39341627ded88142e6ae ++R 8892830f1d56f04b6b2e14d9642ea36b U drh - Z cbbadb818c188a30c0fd9c403a8bf4fd -Z e97ffe3d4cc6b6234faac86c9e55619e ++Z 5694d275e23a4dea203ff0f897ed1e57 diff --cc manifest.uuid index ef15aee619,c7a37738d8..70a7baacb5 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 519054bb72e8f8977b11161c81b0e96ba7bca589 -09a38bf665902834936d39341627ded88142e6ae ++54bec164ebeaf62d783352b3c4d0de8845394091