From: drh Date: Mon, 9 Mar 2015 13:24:46 +0000 (+0000) Subject: Merge recent trunk enhancements into the ota-update branch. X-Git-Tag: version-3.8.11~252^2~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9106ca83d7f66a76fb5143a812423148380c305;p=thirdparty%2Fsqlite.git Merge recent trunk enhancements into the ota-update branch. FossilOrigin-Name: 5489cb68921f62f10d832adbc4d19ea8c6c5da50 --- a9106ca83d7f66a76fb5143a812423148380c305 diff --cc manifest index 5e8cdc587f,a8566de963..954593cbd3 --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ - C Fix\ssome\sproblems\swith\sOTA\sand\sempty\starget\sdatabases,\sor\starget\sdatabases\swith\sthe\swrong\sset\sof\stables.\sAlso\sadd\sSQLITE_FCNTL_VFSNAME\ssupport\sto\sthe\sOTA\sVFS. - D 2015-03-05T16:21:20.067 -C Fix\sthe\sLIKE\soptimization\sso\sthat\sit\sworks\seven\sif\sthere\sare\sadditional\nrange\scontraints\son\sthe\scolumn\sthat\sis\ssubject\sto\sthe\sLIKE\sor\sGLOB. -D 2015-03-09T13:01:02.136 ++C Merge\srecent\strunk\senhancements\sinto\sthe\sota-update\sbranch. ++D 2015-03-09T13:24:46.462 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46 + F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520 + F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858 F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866 - F VERSION d846487aff892625eb8e75960234e7285f0462fe + F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50 F addopcodes.awk 9eb448a552d5c0185cf62c463f9c173cedae3811 F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2 @@@ -170,7 -152,7 +170,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 584d60a533f4301ec660d54a6057970a7ee913c3 -F main.mk 04c49c495795b18a7b70053eef285be1e4d43fa4 ++F main.mk cdf4a20c72d798188f63e2fd6d3eea638bddd431 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -248,16 -230,16 +248,16 @@@ F src/printf.c 8da9a2687a396daa19860f4d F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e - F src/select.c e46cef4c224549b439384c88fc7f57ba064dad54 - F src/shell.c 6276582ee4e9114e0bb0795772414caaf21c0f8e - F src/sqlite.h.in f7df4082533ae9c5acf19bd513e4ff4b638f51d1 + F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907 + F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92 -F src/sqlite.h.in 356e69db9500b3fd11705c21ca247e19b95884a3 ++F src/sqlite.h.in 95df7ba81981e1de0729ba14d1acbd8c4c6a9697 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d - F src/sqliteInt.h 57a405ae6d2ed10fff52de376d18f21e04d96609 - F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d + F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1 + F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c 81712116e826b0089bb221b018929536b2b5406f F src/table.c e7a09215315a978057fb42c640f890160dbcc45e - F src/tclsqlite.c c7897dcf036c0bb7bd814a0e615723b83bc7df86 -F src/tclsqlite.c b290774586f022e16e04ba8ed2f0b8edd86b5b77 ++F src/tclsqlite.c fb310fcbb6f8b6c9af0cb3efda805fd04a6faf45 F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585 F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622 @@@ -272,7 -254,7 +272,7 @@@ F src/test_autoext.c dea8a01a7153b9adc9 F src/test_backup.c 2e6e6a081870150f20c526a2e9d0d29cda47d803 F src/test_blob.c 1f2e3e25255b731c4fcf15ee7990d06347cb6c09 F src/test_btree.c 2e9978eca99a9a4bfa8cae949efb00886860a64f - F src/test_config.c a55a18bbbb117eab92e4343f7ee753b25e0aee49 -F src/test_config.c c2d3ff6c129d50183900c7eff14158ff7e9b3f03 ++F src/test_config.c 7d28ede476189eefd75252fa9acaadc6ba93a733 F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -805,9 -788,9 +807,9 @@@ F test/pagesize.test 1dd51367e752e742f5 F test/pcache.test b09104b03160aca0d968d99e8cd2c5b1921a993d F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff -F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1 +F test/permutations.test 0e2dc2aab7b1043bd2b4404f51651c31da007e52 - F test/pragma.test 66776f48f533c7248d04c1473deb3ebb792daacd - F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13 + F test/pragma.test ad99d05e411c7687302124be56f3b362204be041 + F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552 F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a @@@ -821,10 -804,10 +823,10 @@@ F test/quota2.test 7dc12e08b11cbc4c16c9 F test/quote.test 215897dbe8de1a6f701265836d6601cc6ed103e6 F test/randexpr1.tcl 40dec52119ed3a2b8b2a773bce24b63a3a746459 F test/randexpr1.test eda062a97e60f9c38ae8d806b03b0ddf23d796df - F test/rdonly.test dd30a4858d8e0fbad2304c2bd74a33d4df36412a + F test/rdonly.test 64e2696c322e3538df0b1ed624e21f9a23ed9ff8 F test/regexp1.test 497ea812f264d12b6198d6e50a76be4a1973a9d8 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254 -F test/releasetest.tcl 13f401c10dd4fe1a2fb811ae6ed27fd7d1300d3c +F test/releasetest.tcl b290782d0697b4e83d671da192cd9a7f71e2f6c1 F test/resolver01.test 33abf37ff8335e6bf98f2b45a0af3e06996ccd9a F test/rollback.test 458fe73eb3ffdfdf9f6ba3e9b7350a6220414dea F test/rollback2.test fc14cf6d1a2b250d2735ef16124b971bce152f14 @@@ -907,9 -890,9 +909,9 @@@ F test/speed3.test d32043614c08c53eafdc F test/speed4.test abc0ad3399dcf9703abed2fff8705e4f8e416715 F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b -F test/speedtest1.c 2b416dca3a155fcaa849540b2e7fc1df12896c23 +F test/speedtest1.c 9f1b745c24886cced3f70ffc666300152a39013c F test/spellfix.test 24f676831acddd2f4056a598fd731a72c6311f49 - F test/sqllimits1.test 9014524e7ab16e2a4976b13397db4c29cc29c6d9 + F test/sqllimits1.test e05786eaed7950ff6a2d00031d001d8a26131e68 F test/stat.test 76fd746b85459e812a0193410fb599f0531f22de F test/stmt.test 25d64e3dbf9a3ce89558667d7f39d966fe2a71b9 F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9 @@@ -1225,7 -1208,7 +1227,7 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37 F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97 F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5 - F tool/mksqlite3c.tcl 262e7e3d39df25af10c8aef2163f3a0cc133814c -F tool/mksqlite3c.tcl 95ab31eda659e7ffb091e04bd83178f260d8edfd ++F tool/mksqlite3c.tcl e885509e1a95e6468b734ca5c2b5886248758a3c F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105 @@@ -1258,7 -1241,8 +1260,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 158c1a48818a9abc001b9ea547167c2624a7bad3 - R 7821567dbf824c3a63e6bcb2750b28bb - U dan - Z 8ad790ee74643fcdb7735e278f227f09 -P e5da5e7d5dc5a3438ced23f1ee83e695abc29c45 0e02dc94fd1bb891d0edd1e34b57e923b17712a7 -R c1700660b0fab033a6359aa8c00c1b69 -T +closed 0e02dc94fd1bb891d0edd1e34b57e923b17712a7 ++P 46119e8d8e391d8dea844352521b58415f7365b1 984c3fd5261619fb542a5a95dab37707b5d79dbf ++R cedac19b028b57bfd6e4b6a8dc32f35d + U drh -Z 0d4bf9b628bd332a63a01f9a77a070c3 ++Z a1b922ecd928e4798569ef4c1738d815 diff --cc manifest.uuid index d8a0339114,5e807e391c..59bb7f2bd9 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 46119e8d8e391d8dea844352521b58415f7365b1 -984c3fd5261619fb542a5a95dab37707b5d79dbf ++5489cb68921f62f10d832adbc4d19ea8c6c5da50