From: drh <drh@noemail.net>
Date: Fri, 6 Feb 2015 15:40:32 +0000 (+0000)
Subject: Merge all the latest enhancements from trunk.
X-Git-Tag: version-3.13.0~148^2~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ee4a2dd88663517c8dd980926af9e76f37c88fb;p=thirdparty%2Fsqlite.git

Merge all the latest enhancements from trunk.

FossilOrigin-Name: ae7eef117f28a5dae7a05805f2d31ac532a9fcc5
---

1ee4a2dd88663517c8dd980926af9e76f37c88fb
diff --cc Makefile.msc
index 72a4c1612c,4621661ee5..bd8917e04c
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -839,16 -847,11 +858,14 @@@ SRC4 = 
    $(TOP)\ext\fts3\fts3_tokenize_vtab.c \
    $(TOP)\ext\fts3\fts3_unicode.c \
    $(TOP)\ext\fts3\fts3_unicode2.c \
-   $(TOP)\ext\fts3\fts3_write.c
- SRC = $(SRC) \
+   $(TOP)\ext\fts3\fts3_write.c \
    $(TOP)\ext\icu\sqliteicu.h \
-   $(TOP)\ext\icu\icu.c
- SRC = $(SRC) \
+   $(TOP)\ext\icu\icu.c \
    $(TOP)\ext\rtree\rtree.h \
    $(TOP)\ext\rtree\rtree.c
 +SRC = $(SRC) \
 +  $(TOP)\ext\session\sqlite3session.h \
 +  $(TOP)\ext\session\sqlite3session.c
  
  
  # Generated source code files
diff --cc manifest
index 1ff89b747c,b31e5b6454..8c2c5a108e
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\sall\s3.8.8\schanges\sinto\sthe\ssessions\sbranch.
- D 2015-01-16T12:44:52.039
 -C Change\sthe\sname\sof\s".info"\sto\s".dbinfo"\sand\sadd\san\soptional\ssecond\sargument\nwhich\sis\sthe\sATTACH-ed\sDB\sabout\swhich\sinformation\sis\sprovided.\s\sProvide\n".indexes"\sas\san\salternative\sname\sto\sthe\slegacy\s".indices"\scommand.
 -D 2015-02-06T14:51:13.355
++C Merge\sall\sthe\slatest\senhancements\sfrom\strunk.
++D 2015-02-06T15:40:32.340
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 198c0ac8962bd72275f99dc0cb0a3089b2bed497
 -F Makefile.in 6b9e7677829aa94b9f30949656e27312aefb9a46
++F Makefile.in e63f98067fef9d9112380e3aec9881f56d49f77e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 8f8be3042579d7c0140b3c5cf6b2cf81959ac5c1
 -F Makefile.msc fc6b0b233b5621f3e56298e4d6a0b3f6c936c520
++F Makefile.msc bed794fe507466c950f2b5c2d6d70b4e1e9bf14f
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION d846487aff892625eb8e75960234e7285f0462fe
@@@ -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 1cdd98cfcf1e771b339efb0dced91480e15313f3
 -F main.mk 0bae136db3f3ce451079ae335124b46163d37020
++F main.mk 381e4d0e86c82cfe40bc7b2f742bb8547d253d90
  F mkopcodec.awk c2ff431854d702cdd2d779c9c0d1f58fa16fa4ea
  F mkopcodeh.awk c6b3fa301db6ef7ac916b14c60868aeaec1337b5
  F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
@@@ -198,8 -181,8 +198,8 @@@ F src/callback.c 7b44ce59674338ad48b0e8
  F src/complete.c 198a0066ba60ab06fc00fba1998d870a4d575463
  F src/ctime.c 98f89724adc891a1a4c655bee04e33e716e05887
  F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 -F src/delete.c bd1a91ddd247ce13004075251e0b7fe2bf9925ef
 +F src/delete.c ba0a9915d533ffc72ed628bb7af577707e88a9ee
- F src/expr.c 7be80f7dc337329a24df45c2f3bdb2ea3b64c90e
+ F src/expr.c abe930897ccafae3819fd2855cbc1b00c262fd12
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c e0444b61bed271a76840cbe6182df93a9baa3f12
  F src/func.c 6d3c4ebd72aa7923ce9b110a7dc15f9b8c548430
@@@ -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 e5bcc6d9cf791a25ebfa4e3029293ac56939824a
 -F src/main.c 17e3a37374f3c13e27311773c30720b61584f5b9
++F src/main.c 649e23549326218dbb589be4a5a706954077a614
  F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -246,24 -230,24 +247,24 @@@ F src/printf.c 05edc41450d0eb2c05ef7db1
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c f6c46d3434439ab2084618d603e6d6dbeb0d6ada
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c e4c38c75e36f28aed80a69a725d888751bfd53df
- F src/shell.c ab438b98128dddee7eb60de63b67bbb5b9e7f4f5
- F src/sqlite.h.in 5b23162d86b48df8c3c95a340dead72bc61813f4
+ F src/select.c 1f2087523007c42900ffcbdeaef06a23ad9329fc
 -F src/shell.c 82c25508dac802b32198af6f5256ca1597c6a1af
 -F src/sqlite.h.in 54678c21401909f72b221344dd560d285a1ba5eb
++F src/shell.c a5c0f162adc38a110fd787c4df15450a88be3c35
++F src/sqlite.h.in b815e35cd1a62e1f75302b423bea00c11c900d1b
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h ab9ee44bdeefe57b808cfbafc2dbdb08a189cb0e
 -F src/sqliteInt.h c4e05f7489cd300f856e2283d5e61302ce826471
++F src/sqliteInt.h bb33187ba6dc43be4f739df94dd29780c7095639
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 81712116e826b0089bb221b018929536b2b5406f
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
- F src/tclsqlite.c b6a4f27d57e8f6dea3b2e41034b2dee68ea37fc4
- F src/test1.c 093d8b5b54b829dcfebae3181d4406edcc935d90
 -F src/tclsqlite.c b8014393a96a9781bb635c8b1f52fc9b77a2bfcf
++F src/tclsqlite.c 8dd6e1241a88a33db11b82b4c8f3a7511259c815
+ F src/test1.c 90fbedce75330d48d99eadb7d5f4223e86969585
  F src/test2.c 577961fe48961b2f2e5c8b56ee50c3f459d3359d
- F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
- F src/test4.c 9b32d22f5f150abe23c1830e2057c4037c45b3df
+ F src/test3.c 64d2afdd68feac1bb5e2ffb8226c8c639f798622
+ F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
  F src/test5.c 5a34feec76d9b3a86aab30fd4f6cc9c48cbab4c1
  F src/test6.c 41cacf3b0dd180823919bf9e1fbab287c9266723
- F src/test7.c 72b732baa5642f795655ba1126ea032af46ecfd2
- F src/test8.c df8dd4c99c1dd2225cb2a6f334299cddc5dcf1f1
+ F src/test7.c 9c89a4f1ed6bb13af0ed805b8d782bd83fcd57e3
+ F src/test8.c 610e3d523018ca63b08081795e76794a2121ec38
  F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
  F src/test_async.c 21e11293a2f72080eda70e1124e9102044531cd8
  F src/test_autoext.c dea8a01a7153b9adc97bd26161e4226329546e12
@@@ -298,24 -282,24 +299,24 @@@ F src/test_stat.c 9898687a6c2beca733b0d
  F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
  F src/test_syscall.c 2e21ca7f7dc54a028f1967b63f1e76155c356f9b
  F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
- F src/test_thread.c 1e133a40b50e9c035b00174035b846e7eef481cb
- F src/test_vfs.c 8ee7be45fe773a150b4015ef957da960179ee43a
+ F src/test_thread.c af391ec03d23486dffbcc250b7e58e073f172af9
+ F src/test_vfs.c 5a14c63da9579ba148138c1fb233100f2eb58ebb
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
- F src/threads.c 2fb3ea4d70d5acf68b539c2489b4adace61cc01b
+ F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c e00458c9938072b0ea711c850b8dcf4ddcb5fe18
  F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c d207deb7a031f698104bee879de0632b611e72dd
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
  F src/vacuum.c 9b30ec729337dd012ed88d4c292922c8ef9cf00c
 -F src/vdbe.c ddfc977981cd6324668aa6b114045eb1c677421a
 -F src/vdbe.h 6fc69d9c5e146302c56e163cb4b31d1ee64a18c3
 -F src/vdbeInt.h 9bb69ff2447c34b6ccc58b34ec35b615f86ead78
 -F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
 -F src/vdbeaux.c 97911edb61074b871ec4aa2d6bb779071643dee5
 -F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
 -F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 +F src/vdbe.c d18d7bbe5099b4ae7573673232eb29c12075f174
 +F src/vdbe.h b434bb75fbec973d18d49225a59833ae39ee2afc
 +F src/vdbeInt.h dc69f0351bef56456fdba3e09d3387ba4f1b1520
 +F src/vdbeapi.c 90aeb4b3f1dc86d6576a2ce2d5bad12761329bd5
- F src/vdbeaux.c db4cf9f69c415318fbc19c2e0d2efd693fbe51af
++F src/vdbeaux.c fbc0e6dfcf472e76001f7684b3b534710a645138
 +F src/vdbeblob.c cb7359c2d99df92c35cdaedc12af6d4f83854cb7
 +F src/vdbemem.c 96e41193b4affd9ebc0eea2fa628879dac88c744
  F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
  F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
  F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
@@@ -645,8 -629,9 +646,9 @@@ F test/fuzzer1.test d4c52aaf3ef923da293
  F test/fuzzerfault.test 8792cd77fd5bce765b05d0c8e01b9edcf8af8536
  F test/genesis.tcl 1e2e2e8e5cc4058549a154ff1892fe5c9de19f98
  F test/hexlit.test f9ecde8145bfc2341573473256c74ae37a200497
 -F test/hook.test 162d7cef7a2d2b04839fe14402934e6a1b79442f
 +F test/hook.test aa41c095d26822b8a51aa4c82904a14347961be6
  F test/icu.test 70df4faca133254c042d02ae342c0a141f2663f4
+ F test/imposter1.test c3f1db2d3db2c24611a6596a3fc0ffc14f1466c8
  F test/in.test 047c4671328e9032ab95666a67021adbbd36e98e
  F test/in2.test 5d4c61d17493c832f7d2d32bef785119e87bde75
  F test/in3.test 3cbf58c87f4052cee3a58b37b6389777505aa0c0
@@@ -800,8 -786,8 +803,8 @@@ 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 aa16dedfe01c02c8895169012f7dfde9c163f0d5
+ F test/pragma.test 6cf0f0ce4618e841457aa42745afda55ddbc95fe
  F test/pragma2.test aea7b3d82c76034a2df2b38a13745172ddc0bc13
  F test/pragma3.test 6f849ccffeee7e496d2f2b5e74152306c0b8757c
  F test/printf.test ec9870c4dce8686a37818e0bf1aba6e6a1863552
@@@ -1218,11 -1203,11 +1221,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 07a5124cf2dbafa1b375eefcf8ac4227028b0f8b
+ F tool/mkpragmatab.tcl 94f196c9961e0ca3513e29f57125a3197808be2d
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 9ef48e1748dce7b844f67e2450ff9dfeb0fb4ab5
- F tool/mksqlite3c.tcl d85bfc548f52fe4443e51355f5696f67f6d8236c
 -F tool/mksqlite3c.tcl 6b8e572a90eb4e0086e3ba90d88b76c085919863
 -F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
++F tool/mksqlite3c.tcl 66b14dbaa7322a24eb3055da884244c832118bae
 +F tool/mksqlite3h.tcl 2d0f1b3768f8d000b7881217d5fd4c776eb27467
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl 52a4c613707ac34ae9c226e5ccc69cb948556105
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1254,7 -1239,7 +1257,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 0ba124540b5b2a9ceda0f4f4a46e6be54edad813 7d68a42face3ab14ed88407d4331872f5b243fdf
- R 0819766cc49a8e68b0078048450bbb01
 -P 0a3100a7f264ffce6078c35e341f2f0af6c09fbb
 -R a582dddcff23f4b3aa0ab625ed7ba566
++P bebd131a3554ea95921e6edbc8aa36674ef25fe3 0f65a7e2e09f801b66897479d501607caeae4abf
++R 3e8e2e957fa8b0f2fdc88f57e368bf21
  U drh
- Z 6b9aa66fea16fe35a684677c7f0c81fc
 -Z 91c27780af6a4d5e0c7b8a8aa90c189d
++Z c69878ce0191da9398d2268dd32ed93d
diff --cc manifest.uuid
index 6049488211,408d77792f..f58b33afef
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- bebd131a3554ea95921e6edbc8aa36674ef25fe3
 -0f65a7e2e09f801b66897479d501607caeae4abf
++ae7eef117f28a5dae7a05805f2d31ac532a9fcc5
diff --cc tool/mksqlite3c.tcl
index 93343283d3,4ab8b12b45..5786c7c7b3
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@@ -110,8 -110,8 +110,9 @@@ foreach hdr 
     pager.h
     parse.h
     pcache.h
+    pragma.h
     rtree.h
 +   sqlite3session.h
     sqlite3ext.h
     sqlite3.h
     sqliteicu.h