From: drh <drh@noemail.net>
Date: Tue, 13 Oct 2015 20:42:16 +0000 (+0000)
Subject: Merge in the final few changes before the 3.9.0 release.
X-Git-Tag: version-3.13.0~148^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c22b5259e8d69e69fb27727204a48b992315967;p=thirdparty%2Fsqlite.git

Merge in the final few changes before the 3.9.0 release.

FossilOrigin-Name: e1afdbb50120f7d058b25538c6cb8ce3bb34993d
---

2c22b5259e8d69e69fb27727204a48b992315967
diff --cc manifest
index f50e403fd1,2b8b0a9573..807c51274c
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Pull\sin\sthe\slatest\s3.9.0\stweaks\sfrom\strunk.
- D 2015-10-10T20:35:10.026
 -C Remove\sthe\sunused\sfts5ExprColsetTest()\sroutine.
 -D 2015-10-12T22:31:02.804
++C Merge\sin\sthe\sfinal\sfew\schanges\sbefore\sthe\s3.9.0\srelease.
++D 2015-10-13T20:42:16.270
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 +F Makefile.in de2700ab4ca481c15970405274ccf3c872026e3c
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
 +F Makefile.msc 9025b539b5dc491ea9c6c9c04109d2ff617bc990
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION cacf16a72f9a03cd06b939a764e32f6f53254c7f
@@@ -327,8 -307,8 +327,8 @@@ F src/insert.c 5f9bbe7f68ce13a423edeb93
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c d344a95d60c24e2f490ee59db9784b1b17439012
- F src/loadext.c b3f1a529245b14c881b270a9f29fae6c5727cde8
+ F src/loadext.c c5916a158f1fb74d955847c84f7ebdb6f5de9d8c
 -F src/main.c fec97668771438033a7559883401067b139729e1
 +F src/main.c 3679a4f40434358fdfdfc86bf9576604b8d6fc9b
  F src/malloc.c 3a37ce6979a40f499d8cea9e9ab4e8517854d35d
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
@@@ -363,12 -343,12 +363,12 @@@ F src/printf.c 0c4bcdd1c2e2521024f0a69c
  F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
  F src/resolve.c 1954a0f01bf65d78d7d559aea3d5c67f33376d91
  F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
- F src/select.c 36c05502d5aef2a14aff3f7faba95b0c7d87ca9a
+ F src/select.c 0bc9cd2e1cacfdc9cdc9a83884cc100f166e80a4
 -F src/shell.c d25df04168d6ba5a4fa05bdbf859df667f9eb621
 -F src/sqlite.h.in dc35357824c6bb84a04acd4e99dee3e07299a8c6
 +F src/shell.c 993863f82d764be0c00803056e56b9b744f86f02
- F src/sqlite.h.in 8f4deb5874227c7635300fb75105ff6e92131fb5
++F src/sqlite.h.in ef10b6cba73e0a9848259b856480dd56e7f593a3
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
- F src/sqlite3ext.h 64350bf36833a56ad675e27392a913f417c5c308
+ F src/sqlite3ext.h 4b66e3e3435da4b4c8c83696d0349f0c503b3924
 -F src/sqliteInt.h e21cc96bc24161df7373f6b24367cf580496889d
 +F src/sqliteInt.h 4150e72a668204fbcbdfbcc5f44c9aa5151663f8
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c 51b46b2a62d1b3a959633d593b89bab5e2c9155e
@@@ -1411,7 -1390,7 +1411,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P c1d96fb654b2c0f66d586aa39d80ea0468186690 fab6f09044d033dd09ed8a22e06bc6a7851bbabf
- R 02a4785c3756a1a4b812b7d61a902d18
 -P 7f896a971c5953d5370215ecd834d1fb711b4263
 -R 9caea6f3d0d85e53ac44439278fad807
++P ed174ccf0ae615647ba026fed649d26dc9a98640 9ecafc0c94102dca6da192f400278399464086fb
++R a593153eed6b8719602610a964f8f5af
  U drh
- Z 2a76f9be830458577e699f50ad91ee21
 -Z 910ebb884723e98753b60b18fc83ff4b
++Z 09e44daf8eef00c891774cf00df5b0d3
diff --cc manifest.uuid
index 8feaf7595d,9f4eab788a..68abaccd9d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- ed174ccf0ae615647ba026fed649d26dc9a98640
 -9ecafc0c94102dca6da192f400278399464086fb
++e1afdbb50120f7d058b25538c6cb8ce3bb34993d