From: drh Date: Mon, 9 Mar 2015 13:18:22 +0000 (+0000) Subject: Merge recent trunk enhancements into the apple-osx branch. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5817b2a18e29e43b115cafaf456284099a914bc0;p=thirdparty%2Fsqlite.git Merge recent trunk enhancements into the apple-osx branch. FossilOrigin-Name: 5e04eec88e4f5cb9d57577ee2d9e3569de930fbb --- 5817b2a18e29e43b115cafaf456284099a914bc0 diff --cc manifest index 4ee3dd5fce,a8566de963..d202cfd721 --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ - C Merge\sthe\slatest\strunk\sfixes\sand\senhancements\sinto\sthe\sapple-osx\sbranch. - D 2015-02-25T14:09:23.835 -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\sapple-osx\sbranch. ++D 2015-03-09T13:18:22.512 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in e1f1fce0d47e29ffae67c92834d0e6e1c699743e -F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928 ++F Makefile.in 34f555a2492a7dd64f44eeb9aa6277b6d65e2364 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc edbe2e2a9d27a4a56bd2891808a7c013bc322f6e + 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 @@@ -155,7 -152,7 +155,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 70be701bce2dccfcda7f91a315f435a5203e3d65 -F main.mk 04c49c495795b18a7b70053eef285be1e4d43fa4 ++F main.mk 3a1f3f34519d0a71d25e946171d4df91bf20bec8 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -195,10 -192,10 +195,10 @@@ F src/hash.h c8f3c31722cf3277d037139097 F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08 F src/insert.c 5b9243a33726008cc4132897d2be371db12a13be F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d -F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e +F src/legacy.c 9c17d86e06522c261307f0eb6bcb1254c8b04a59 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660 - F src/main.c 53fe67185c6326a519393a24dddc514a82d80c04 -F src/main.c fa997fa27d95febc16d57095299384b667a7f762 ++F src/main.c 370cee136ae6c509a2954da7da75b1ae83c59946 F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987 @@@ -211,40 -208,39 +211,40 @@@ F src/mutex.c 19bf9acba69ca2f367c376108 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85 F src/mutex_noop.c 529bab0743c3321c940f32c3464de494fd38cfa9 F src/mutex_unix.c 5cf676464bd19e0a866297515d146e8bf1669dfb - F src/mutex_w32.c a6f0b84068db2cbd96a94f23c622aeb875c57dff + F src/mutex_w32.c 61660ada28d8308ad190f444c2170c4f2a590c2f F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7 -F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8 +F src/os.c 5822c2b843a77219bba1e28887cdc816b27ca29d F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa - F src/os_unix.c 2a05bfbc7661abf9e9d0104869d60dfa9656842a -F src/os_unix.c 49d06acee4053920e4a6429844f440b5f975cea4 -F src/os_win.c 8223e7db5b7c4a81d8b161098ac3959400434cdb ++F src/os_unix.c e34ae6ec878f69ea6d3394f8b105a22cd75f7043 +F src/os_win.c 1d1ef630b3e3859b7399952909e10d3a4d43fc77 F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca -F src/pager.c 4120a49ecd37697e28f5ed807f470b9c0b88410c -F src/pager.h c3476e7c89cdf1c6914e50a11f3714e30b4e0a77 +F src/pager.c 694caffb16891a96608193968d7c9a8fa9a71240 +F src/pager.h 5ead19acf64a16b7b663476bd36c60d26f03a696 F src/parse.y 0f8e7d60f0ab3cb53d270adef69259ac307d83a8 - F src/pcache.c d210cf90d04365a74f85d21374dded65af67b0cb + F src/pcache.c 10539fb959849ad6efff80050541cab3d25089d4 F src/pcache.h b44658c9c932d203510279439d891a2a83e12ba8 F src/pcache1.c 1e77432b40b7d3288327d9cdf399dcdfd2b6d3bf - F src/pragma.c f5c1ba06527a2d72955637e46075a85765f4ad6e -F src/pragma.c ac4f3f856b4234e85f55b0f069698a4766011100 ++F src/pragma.c 21af63d913216da9ee45774bc381b9bd781d3a63 F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f -F src/prepare.c 173a5a499138451b2561614ecb87d78f9f4644b9 +F src/prepare.c 01740b0d6b8f5c6da421a86c300464ff5b53e167 F src/printf.c 8da9a2687a396daa19860f4dc90975d319304744 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696 F src/resolve.c f4d79e31ffa5820c2e3d1740baa5e9b190425f2b F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e - F src/select.c 66c2fce5d5a413915c2c3d989e2bc00e5e905f00 - F src/shell.c f06cca68a3f07e03d35d2f879375967169db6a61 - F src/sqlite.h.in 69334ebae24f5a241890a99d819ec13c9d0a0d3c -F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907 ++F src/select.c b85b02f47a5cda5e59d0ee320fd1d953bfc3599e + F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92 -F src/sqlite.h.in 356e69db9500b3fd11705c21ca247e19b95884a3 ++F src/sqlite.h.in 96d3cf409aeb646d7ba8bdd2dc09ab30db79ef68 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad +F src/sqlite3_private.h a81a9c5f97c095cc3e86914a05f8fabe0011f4a1 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d - F src/sqliteInt.h 399d21875c6ae7b03b09b8e97ff639719fccc095 - F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d -F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1 ++F src/sqliteInt.h f54cc2f5c91b939d3183e9b30d4e0f89f69eb16d + F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c 81712116e826b0089bb221b018929536b2b5406f F src/table.c e7a09215315a978057fb42c640f890160dbcc45e - F src/tclsqlite.c b8014393a96a9781bb635c8b1f52fc9b77a2bfcf + F src/tclsqlite.c b290774586f022e16e04ba8ed2f0b8edd86b5b77 -F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585 +F src/test1.c 1fe65ec71cf2eae982c70cf80127d502d46bb341 F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622 F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e @@@ -258,7 -254,7 +258,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 90441a025b77cf7831dab8ed94b3692115ed965a -F src/test_config.c c2d3ff6c129d50183900c7eff14158ff7e9b3f03 ++F src/test_config.c 8164cfbd9c659ba68490b4b69cb360ffdb4780a1 F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -297,22 -293,23 +297,23 @@@ F src/update.c 3c4ecc282accf12d39edb8d5 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec - F src/vdbe.c 0fa93ce5135f2083abcb28e854be3b4b49477eac -F src/vdbe.c 94cbc2115075b1a562a2a702c29ba48e74f85d34 ++F src/vdbe.c b817ad546e2d187ac20536d4cb2f35d9c020d893 F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3 F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a - F src/vdbeapi.c 855e0c2f6635b185d59e4f1ee5f66e2ae98d61fb -F src/vdbeapi.c dac0d0d8009a8aa549cd77d9c29da44c0344f0c4 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5 ++F src/vdbeapi.c 6ef15e2dc26f28bf59b6a00819d432d304ee8005 +F src/vdbeaux.c 7069b951a45fb7eafed15bd358ae2f35356f33ad F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010 F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01 + F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb -F src/wal.c 39303f2c9db02a4e422cd8eb2c8760420c6a51fe -F src/wal.h df01efe09c5cb8c8e391ff1715cca294f89668a4 +F src/wal.c 61a28dad1a098848a09702a938d515edde5c5a09 +F src/wal.h 6b3a67ecd7172dcc9f18fc9cd4d76dc4c2166e68 F src/walker.c c253b95b4ee44b21c406e2a1052636c31ea27804 - F src/where.c a50d5082b0fecd2bcf1725cdd012732d9d1e9d5c - F src/whereInt.h d3633e9b592103241b74b0ec76185f3e5b8b62e0 + F src/where.c eb141b075776e9864d38f279333e2472a8653202 + F src/whereInt.h cbe4aa57326998d89e7698ca65bb7c28541d483c -F test/8_3_names.test ebbb5cd36741350040fd28b432ceadf495be25b2 +F test/8_3_names.test 05034aadccd2253ffe6cbefb06662b8aa4600f77 F test/aggerror.test a867e273ef9e3d7919f03ef4f0e8c0d2767944f2 F test/aggnested.test b35b4cd69fc913f90d39a575e171e1116c3a4bb7 F test/alias.test 4529fbc152f190268a15f9384a5651bbbabc9d87 @@@ -388,9 -385,9 +389,9 @@@ F test/boundary4.test 89e02fa66397b8a32 F test/btree01.test e08b3613540145b353f20c81cb18ead54ff12e0f F test/btreefault.test c2bcb542685eea44621275cfedbd8a13f65201e3 F test/busy.test 76b4887f8b9160ba903c1ac22e8ff406ad6ae2f0 -F test/cache.test 13bc046b26210471ca6f2889aceb1ea52dc717de +F test/cache.test 0bc2195f4a7207108af2617ed356e77daf4412f7 F test/capi2.test 011c16da245fdc0106a2785035de6b242c05e738 - F test/capi3.test f0718f4f90d0efdc980119bfbdf1d7f1541ee5ef + F test/capi3.test bf6f0308bbbba1e770dac13aa08e5c2ac61c7324 F test/capi3b.test efb2b9cfd127efa84433cd7a2d72ce0454ae0dc4 F test/capi3c.test fdc0d67a2cb8e8fc400d5b7735e330161ea057a2 F test/capi3d.test a82b6321c50a1cfc848e386fa2c851893606f68c @@@ -754,10 -751,10 +756,10 @@@ F test/mmap1.test 1bfd611b9841eafb44f7d F test/mmap2.test 9d6dd9ddb4ad2379f29cc78f38ce1e63ed418022 F test/mmap3.test c92273e16eb8d23c1d55c9815b446bb72ef0512e F test/mmapfault.test d4c9eff9cd8c2dc14bc43e71e042f175b0a26fe3 -F test/multiplex.test efd015ca0b5b4a57dc9535b8feb1273eebeadb60 +F test/multiplex.test 2ed4db53c3304b7eb7b8744206ee9271799a32eb F test/multiplex2.test 580ca5817c7edbe4cc68fa150609c9473393003a F test/multiplex3.test d228f59eac91839a977eac19f21d053f03e4d101 - F test/multiplex4.test d3e8a5a522c51cbf3ed1c5b0bd496be02c29d7b1 + F test/multiplex4.test e8ae4c4bd70606a5727743241f13b5701990abe4 F test/mutex1.test 78b2b9bb320e51d156c4efdb71b99b051e7a4b41 F test/mutex2.test bfeaeac2e73095b2ac32285d2756e3a65e681660 F test/nan.test e9648b9d007c7045242af35e11a984d4b169443a @@@ -792,8 -789,8 +794,8 @@@ F test/pcache.test 488061b5dd685df2234d F test/pcache2.test a83efe2dec0d392f814bfc998def1d1833942025 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff F test/permutations.test f9cc1dd987986c9d4949211c7a4ed55ec9aecba1 - F test/pragma.test ad028e69dc67bfa19ac1d057e5619cdef73cf9a4 - F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13 -F test/pragma.test ad99d05e411c7687302124be56f3b362204be041 ++F test/pragma.test 2886007790614c52f5e1489936f82a4b6be42927 + F test/pragma2.test f624a496a95ee878e81e59961eade66d5c00c028 F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552 F test/printf2.test b4acd4bf8734243257f01ddefa17c4fb090acc8a @@@ -870,7 -867,7 +872,7 @@@ F test/shell4.test 8a9c08976291e6c6c808 F test/shell5.test c04e9f9f948305706b88377c464c7f08ce7479f9 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3 F test/show_speedtest1_rtree.tcl 32e6c5f073d7426148a6936a0408f4b5b169aba5 - F test/shrink.test 41ab166b276af4812bcaf6f1b99c53fab4e706d0 -F test/shrink.test 06deac10d591186017466ce67d10645150bfdeec ++F test/shrink.test ce0f6f3f99ed0154a6ca04dc135d35a3fddf9455 F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329 F test/skipscan1.test 2ddfe5d168462170c4487f534e2a99fb006b2076 F test/skipscan2.test d1d1450952b7275f0b0a3a981f0230532743951a @@@ -895,9 -892,9 +897,9 @@@ F test/speed4p.explain 6b5f104ebeb34a03 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b F test/speedtest1.c 2b416dca3a155fcaa849540b2e7fc1df12896c23 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/stat.test 1e5faf39649a0bb368770f780f926847520ea3f4 +F test/stmt.test 78a6764439cfa5abdcbf98d4d084739e81eeec4f F test/subquery.test 666fdecceac258f5fd84bed09a64e49d9f37edd9 F test/subquery2.test 438f8a7da1457277b22e4176510f7659b286995f F test/subselect.test d24fd8757daf97dafd2e889c73ea4c4272dcf4e4 @@@ -1211,7 -1208,7 +1213,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 1c68493ffa2f1f17ae9c984623a3bb9401f7e848 -F tool/mksqlite3c.tcl 95ab31eda659e7ffb091e04bd83178f260d8edfd ++F tool/mksqlite3c.tcl c684fc94a977e5b64fa85b831ea23d2b6e5f535f F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105 @@@ -1244,7 -1241,8 +1246,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 3896e23373d41371fc6839168a97a669106486af 03bbb947192b0c28d960604eae12e5fc2fa6e74e - R f75793a6656523174b46c9813cd2d7cf -P e5da5e7d5dc5a3438ced23f1ee83e695abc29c45 0e02dc94fd1bb891d0edd1e34b57e923b17712a7 -R c1700660b0fab033a6359aa8c00c1b69 -T +closed 0e02dc94fd1bb891d0edd1e34b57e923b17712a7 ++P ba8294e2f76a0cfcf48200634e6076a8995024f0 984c3fd5261619fb542a5a95dab37707b5d79dbf ++R 1e0c78d4cacbb02fa90879347a2ff3d1 U drh - Z 20b31072cb0711dea72979ae2a5b442f -Z 0d4bf9b628bd332a63a01f9a77a070c3 ++Z 9d1689cb5b0a1a7d1bebe577ddd9509c diff --cc manifest.uuid index ffac4fc8d2,5e807e391c..405162b2a8 --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - ba8294e2f76a0cfcf48200634e6076a8995024f0 -984c3fd5261619fb542a5a95dab37707b5d79dbf ++5e04eec88e4f5cb9d57577ee2d9e3569de930fbb diff --cc src/os_unix.c index 406cfb5560,927b9e1c54..c28943d03b --- a/src/os_unix.c +++ b/src/os_unix.c @@@ -97,19 -85,19 +85,20 @@@ # include #endif - #if SQLITE_ENABLE_LOCKING_STYLE || OS_VXWORKS + #if SQLITE_ENABLE_LOCKING_STYLE # include +# include - # if OS_VXWORKS - # include - # include - # else - # include - # include - # endif + # include + # include #endif /* SQLITE_ENABLE_LOCKING_STYLE */ - #if defined(__APPLE__) || (SQLITE_ENABLE_LOCKING_STYLE && !OS_VXWORKS) + #if OS_VXWORKS + # include + # include + # include + #endif /* OS_VXWORKS */ + + #if defined(__APPLE__) || SQLITE_ENABLE_LOCKING_STYLE # include #endif diff --cc tool/mksqlite3c.tcl index 56dce2b5e7,fd823385b3..86ba8695e2 --- a/tool/mksqlite3c.tcl +++ b/tool/mksqlite3c.tcl @@@ -117,9 -117,9 +117,10 @@@ foreach hdr sqliteicu.h sqliteInt.h sqliteLimit.h + sqlrr.h vdbe.h vdbeInt.h + vxworks.h wal.h whereInt.h } {