From: drh <drh@noemail.net>
Date: Fri, 16 Oct 2015 20:55:12 +0000 (+0000)
Subject: Merge the 3.9.1 updates from trunk.
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cd9491ca2f638e0c153a772c6d8485aacd400b5d;p=thirdparty%2Fsqlite.git

Merge the 3.9.1 updates from trunk.

FossilOrigin-Name: bf866e6c0d95d48744c86ff0c0be9b2653629a18
---

cd9491ca2f638e0c153a772c6d8485aacd400b5d
diff --cc manifest
index 26aaa3cd95,d339fd779d..05f081ba97
--- a/manifest
+++ b/manifest
@@@ -1,10 -1,10 +1,10 @@@
- C Merge\sin\sthe\s3.9.0\schanges\sfrom\strunk.
- D 2015-10-15T07:44:58.901
 -C Enhancements\sto\sthe\sMSVC\smakefile.
 -D 2015-10-16T20:13:57.036
++C Merge\sthe\s3.9.1\supdates\sfrom\strunk.
++D 2015-10-16T20:55:12.158
  F Makefile.in 2ea961bc09e441874eb3d1bf7398e04feb24f3ee
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc 9660c072f65b2742595687b30f6d9ae55001ae06
+ F Makefile.msc 4eb750e0fdf52050a06d881e1b060f4bb116ed7e
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
- F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
+ F VERSION a47917b59f38b632b3a8662d14fd20f94956bdd0
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
  F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
@@@ -325,12 -325,12 +325,12 @@@ F src/os_setup.h c9d4553b5aaa6f73391448
  F src/os_unix.c fc93d55f96bb978f0b0168c6ea7d6fc60b0e172c
  F src/os_win.c 1716291e5ec2dbfc5a1fe0b32182030f1f7d8acf
  F src/os_win.h eb7a47aa17b26b77eb97e4823f20a00b8bda12ca
 -F src/pager.c 2fbeeba28f4e6d08a15bc106f36c43346a81f09e
 -F src/pager.h ac213f8143ebfee6a8bfb91cf4ca02c9a83343c5
 -F src/parse.y f599aa5e871a493330d567ced93de696f61f48f7
 +F src/pager.c 13780cd829f48fbb4cbedc76b4d9185315861ea3
 +F src/pager.h 4d9e5ec29e44f32cf5e8bdad464e67a1c5a53d29
 +F src/parse.y 0dcce0ae4e106cdaad4053f73b3bc2dedca9c6d6
  F src/pcache.c 24be750c79272e0ca7b6e007bc94999700f3e5ef
  F src/pcache.h 9968603796240cdf83da7e7bef76edf90619cea9
- F src/pcache1.c e822007159d53a7ea7aa040d6e28964ddb6de083
+ F src/pcache1.c 902e1bc7bdaa81b40f8543407c5e2ac8ef4dc035
  F src/pragma.c dcfe3a35d2de935feeaba1455528b4a5c4f1208c
  F src/pragma.h 631a91c8b0e6ca8f051a1d8a4a0da4150e04620a
  F src/prepare.c 82e5db1013846a819f198336fed72c44c974e7b1
@@@ -338,14 -338,14 +338,14 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 0bc9cd2e1cacfdc9cdc9a83884cc100f166e80a4
+ F src/select.c dbf1fb82317043304da334a33206add211487f96
  F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
- F src/sqlite.h.in dc35357824c6bb84a04acd4e99dee3e07299a8c6
+ F src/sqlite.h.in 839c818e16ea68703d90d17bd2bb3607191debce
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
- F src/sqliteInt.h dfc94932c4f7f1bb0eafdbea1f8cd6645fba05cf
 -F src/sqliteInt.h 1ad779ee62efee60494af0a75d8d45592f9f53c3
++F src/sqliteInt.h b015def467069111aa556837331ee24a00765701
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
- F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
+ F src/status.c 286f6398a4d2cd1e8ff0771e3d30f8dddb4768ea
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
  F src/tclsqlite.c d9439b6a910985b7fff43ba6756bcef00de22649
  F src/test1.c 8fff9c5aa63d6490f516d018b70c12a9cb9a4d8a
@@@ -394,21 -394,21 +394,21 @@@ F src/test_vfs.c 3b65d42e18b262805716bd
  F src/test_vfstrace.c bab9594adc976cbe696ff3970728830b4c5ed698
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c bbfb74450643cb5372a43ad4f6cffd7e9dfcecb0
- F src/tokenize.c 83c6ed569423a3af83a83973b444cf7123be33a6
+ F src/tokenize.c 338bc8f7c9dd103188952cda7964696bacac6d22
  F src/treeview.c 154f0acc622fa3514de8777dcedf4c8a8802b4ce
  F src/trigger.c 322f23aad694e8f31d384dcfa386d52a48d3c52f
- F src/update.c dc37664095ca8604293ff1de2d9a547c6efb5e6e
+ F src/update.c aa10336a2719bd1b9f89004f3d7ba6d566623a49
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c fc612367108b74573c5fd13a85d0a23027f438bd
 -F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c e9315575bed64f9aa559151283c873be34143914
 +F src/vacuum.c 983cc3754718ef169a6ea9aef86798bd28106f21
- F src/vdbe.c 9e42ca33dbf7b717dc1e918cda4241b86249e7c6
++F src/vdbe.c 80c332d7c16ac768e31610586103e59985ce65d4
  F src/vdbe.h 4bc88bd0e06f8046ee6ab7487c0015e85ad949ad
- F src/vdbeInt.h 8b867eac234e28627ffcace3cd4b4b79bbec664b
+ F src/vdbeInt.h 777dd76d513347acb1a71d94df2be00516add637
  F src/vdbeapi.c 020681b943e77766b32ae1cddf86d7831b7374ca
- F src/vdbeaux.c 4988b83d1e1989ee554b2fa4ca18f3606a78437c
 -F src/vdbeaux.c 906bc74ea90707b57a23e4264727fff7b48d0cb5
++F src/vdbeaux.c 14e4b4d69882eb160bf20f31ded674f1b0455b5e
  F src/vdbeblob.c 565fabd302f5fca3bdf3d56cac330483616a39b6
- F src/vdbemem.c 19b3036aa4d676e7103b0fb5efd6327da455f915
- F src/vdbesort.c f5009e7a35e3065635d8918b9a31f498a499976b
+ F src/vdbemem.c fdd1578e47bea61390d472de53c565781d81e045
+ F src/vdbesort.c 8b23930a1289526f6d2a3a9f2e965bcc963e4a68
  F src/vdbetrace.c 8befe829faff6d9e6f6e4dee5a7d3f85cc85f1a0
  F src/vtab.c 2a8b44aa372c33f6154208e7a7f6c44254549806
  F src/vxworks.h c18586c8edc1bddbc15c004fa16aeb1e1342b4fb
@@@ -1336,8 -1333,8 +1336,8 @@@ F test/wordcount.c 9915e06cb33d8ca8109b
  F test/zeroblob.test 3857870fe681b8185654414a9bccfde80b62a0fa
  F test/zerodamage.test cf6748bad89553cc1632be51a6f54e487e4039ac
  F tool/GetFile.cs a15e08acb5dd7539b75ba23501581d7c2b462cb5
- F tool/GetTclKit.bat f8159730269bdbf5c334383134011dda4df45511
+ F tool/GetTclKit.bat 8606413d3035c05373a0d7fae82ebf59ae9e16c3
 -F tool/addopcodes.tcl 7cc82ecca456a6b3148abf492b0419b83140881a
 +F tool/addopcodes.tcl 2b5886e104b8d9ccee8ead9b873c99d2144644c9
  F tool/build-all-msvc.bat 2b1703b322da121e56b955cb58de091107f777c3 x
  F tool/build-shell.sh 950f47c6174f1eea171319438b93ba67ff5bf367
  F tool/checkSpacing.c 810e51703529a204fc4e1eb060e9ab663e3c06d2
@@@ -1394,7 -1391,7 +1394,7 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P c63c1e15f8cc8981aa4dbec82d510ed70cd09797 4bd0d43db7c1877f2d8a8d2f2a48f24a10f0c3b8
- R e25651cd110a4e24fff8bcf73faada51
 -P eb2317429fc3fc81ccd92e6f84f873585829259d
 -R c8195ddfd54e61d102ea2ab84cfcbce4
 -U mistachkin
 -Z 0b9815ef53884597c48f7e60955b08c9
++P 5c3a2a6ed64f4d0e10238720bc2e4ae3af3eded3 39e8a5d93fa370afb03223bf0c20ea0f3448b9fc
++R 7284c946ddd25bd093ddb09b393f0312
 +U drh
- Z 62684fe4eee441730a8c859a36c8880e
++Z 35321be2437db247384d1ee5f9fe5138
diff --cc manifest.uuid
index c1be1007fc,2d3dfc6c5d..9d32cbaf9c
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5c3a2a6ed64f4d0e10238720bc2e4ae3af3eded3
 -39e8a5d93fa370afb03223bf0c20ea0f3448b9fc
++bf866e6c0d95d48744c86ff0c0be9b2653629a18