From: drh Date: Mon, 9 Mar 2015 13:07:45 +0000 (+0000) Subject: Merge recent trunk enhancements into the sessions branch. X-Git-Tag: version-3.13.0~148^2~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c11a172d5fff6eff2bb54f391e36112ea32fb1c1;p=thirdparty%2Fsqlite.git Merge recent trunk enhancements into the sessions branch. FossilOrigin-Name: 68c8937e83b770d5ec6b1855c1bde81057c11b5f --- c11a172d5fff6eff2bb54f391e36112ea32fb1c1 diff --cc manifest index 646a50f52f,a8566de963..476951ee73 --- a/manifest +++ b/manifest @@@ -1,12 -1,12 +1,12 @@@ - C Merge\sthe\slatest\strunk\sfixes\sinto\sthe\ssessions\sbranch. - D 2015-02-25T14:02:53.832 -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\ssessions\sbranch. ++D 2015-03-09T13:07:45.320 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f - F Makefile.in e63f98067fef9d9112380e3aec9881f56d49f77e -F Makefile.in 2f643d6968dfc0b82d2e546a0525a39079f9e928 ++F Makefile.in 5c5f6000dd1e4d8d8a402e4e749499720318fbd9 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 - F Makefile.msc bed794fe507466c950f2b5c2d6d70b4e1e9bf14f -F Makefile.msc 529e61cd9d29a3934758b4b3a0bb649b6c653481 ++F Makefile.msc 0de5ab64775feb698a51950874e56cf15fb8f67f 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 @@@ -169,7 -152,7 +169,7 @@@ F ext/userauth/userauth.c 5fa3bdb492f48 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 - F main.mk 381e4d0e86c82cfe40bc7b2f742bb8547d253d90 -F main.mk 04c49c495795b18a7b70053eef285be1e4d43fa4 ++F main.mk 758bb6ffbe5fbfe676c150dd1c3332eba8f42135 F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 @@@ -212,7 -195,7 +212,7 @@@ F src/journal.c b4124532212b6952f42eb2c F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660 - F src/main.c d01a9b0a8cee34d6a533148bcdc94d65e9205a33 -F src/main.c fa997fa27d95febc16d57095299384b667a7f762 ++F src/main.c 17902e3835e77d58a672dbd7b40a502afee733cc F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987 @@@ -247,16 -230,16 +247,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 f21e2cec006b04d4d871209016286157279d70e0 - F src/sqlite.h.in 763e178cf0e47056a0abc572a42eacb5d1164196 + F src/select.c 94e016b6733b1d39a2f4c8d431155b4c2897d907 -F src/shell.c cce82ca26392578a4a1ee927dfe55ea3411c7c92 -F src/sqlite.h.in 356e69db9500b3fd11705c21ca247e19b95884a3 ++F src/shell.c b90258c9083d94f51434ab57ab12336550a1483f ++F src/sqlite.h.in b0e4bb95b2728d7663a9d8f64ba3d3865ac646e1 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d - F src/sqliteInt.h 1e1c08093c57dbd7c5d0b6d945f1c1d039f1128e - F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d -F src/sqliteInt.h fae682c2b4dfbe489b134d74521c41c088f16ab1 ++F src/sqliteInt.h 9c62b8dff75ed3a8fc3bb5883a91e66ece8666da + F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46 F src/status.c 81712116e826b0089bb221b018929536b2b5406f F src/table.c e7a09215315a978057fb42c640f890160dbcc45e - F src/tclsqlite.c 8dd6e1241a88a33db11b82b4c8f3a7511259c815 -F src/tclsqlite.c b290774586f022e16e04ba8ed2f0b8edd86b5b77 ++F src/tclsqlite.c 82984e46304db7fdf4163180b106b5bdf81b5d0e F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585 F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622 @@@ -271,7 -254,7 +271,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 fc2616bded292c77e7c13e5aa62dd2732a613ba2 -F src/test_config.c c2d3ff6c129d50183900c7eff14158ff7e9b3f03 ++F src/test_config.c 5140cf3a0b766d177dfb9f8f2a3b00224ec3f5c8 F src/test_demovfs.c 0de72c2c89551629f58486fde5734b7d90758852 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc F src/test_fs.c ced436e3d4b8e4681328409b8081051ce614e28f @@@ -310,13 -293,13 +310,13 @@@ F src/update.c d207deb7a031f698104bee87 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec - F src/vdbe.c d18d7bbe5099b4ae7573673232eb29c12075f174 -F src/vdbe.c 94cbc2115075b1a562a2a702c29ba48e74f85d34 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3 -F src/vdbeInt.h bb56fd199d8af1a2c1b9639ee2f70724b4338e3a -F src/vdbeapi.c dac0d0d8009a8aa549cd77d9c29da44c0344f0c4 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5 -F src/vdbeblob.c 4f2e8e075d238392df98c5e03a64342465b03f90 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f ++F src/vdbe.c e70e58bfce88e0075c1b17a2f37c57389b7bc0ba +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc +F src/vdbeInt.h 50fc184e25bfe1b39b8e508082cd3f0cd8a29b3d - F src/vdbeapi.c 1f5af816d4206a48c2ed610be7a44ca613673521 ++F src/vdbeapi.c be4717b0a037fd834d195ef152682513533cddb5 +F src/vdbeaux.c fbc0e6dfcf472e76001f7684b3b534710a645138 +F src/vdbeblob.c ab33f9b57cfce7dddb23853090186da614be4846 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744 F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010 F src/vtab.c 699f2b8d509cfe379c33dde33827875d5b030e01 @@@ -520,8 -504,8 +521,8 @@@ F test/fkey1.test e1d1fa84cde579185ea01 F test/fkey2.test 1db212cda86b0d3ce72714001f7b6381c321341c F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49 F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d - F test/fkey5.test 488601fbda8350619b3029487e56830447056fd2 + F test/fkey5.test 56bcb5a6e8b725b17febc267fb041a6695e86853 -F test/fkey6.test abb59f866c1b44926fd02d1fdd217d831fe04f48 +F test/fkey6.test 6697550baa38505c9952eff130ab26a2d156c0cc F test/fkey7.test 72e915890ee4a005daaf3002cb208e8fe973ac13 F test/fkey8.test 8f08203458321e6c19a263829de4cfc936274ab0 F test/fkey_malloc.test 594a7ea1fbab553c036c70813cd8bd9407d63749 @@@ -803,9 -788,9 +805,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 e5e9f708879336e10095ded8d61966007f4a2c5c - F test/pragma.test 6cf0f0ce4618e841457aa42745afda55ddbc95fe - 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 @@@ -1224,8 -1208,8 +1226,8 @@@ 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 66b14dbaa7322a24eb3055da884244c832118bae -F tool/mksqlite3c.tcl 95ab31eda659e7ffb091e04bd83178f260d8edfd -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12 ++F tool/mksqlite3c.tcl 87d0000c12cfb0a8c5438f9a754fb45ab0aeb2e2 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467 F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091 @@@ -1257,7 -1241,8 +1259,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 f36bb5fa5c5e3430808fe35d58f45559a216d341 03bbb947192b0c28d960604eae12e5fc2fa6e74e - R fea8faac07d1963bbee76d04f5507233 -P e5da5e7d5dc5a3438ced23f1ee83e695abc29c45 0e02dc94fd1bb891d0edd1e34b57e923b17712a7 -R c1700660b0fab033a6359aa8c00c1b69 -T +closed 0e02dc94fd1bb891d0edd1e34b57e923b17712a7 ++P 131a2d3116436ca6304777c9c5d46b7c4051d949 984c3fd5261619fb542a5a95dab37707b5d79dbf ++R cb093bb12447629434661af3de009e52 U drh - Z 94f89bcaf784abbabd110bdd6f219892 -Z 0d4bf9b628bd332a63a01f9a77a070c3 ++Z afb94d5a3aa820ac14e063085ce8c969 diff --cc manifest.uuid index 31db3b1068,5e807e391c..638ddfa55b --- a/manifest.uuid +++ b/manifest.uuid @@@ -1,1 -1,1 +1,1 @@@ - 131a2d3116436ca6304777c9c5d46b7c4051d949 -984c3fd5261619fb542a5a95dab37707b5d79dbf ++68c8937e83b770d5ec6b1855c1bde81057c11b5f