From: drh <drh@noemail.net>
Date: Fri, 16 Oct 2015 20:52:35 +0000 (+0000)
Subject: Merge the 3.9.1 changes.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e11f8aec5f6802a7859c0e866405b3df22b2a7e;p=thirdparty%2Fsqlite.git

Merge the 3.9.1 changes.

FossilOrigin-Name: dd07688d3a478bead1174cf243fd5a667ccdda8d
---

8e11f8aec5f6802a7859c0e866405b3df22b2a7e
diff --cc manifest
index c54b0921c3,4136b6383d..43f6bbc08f
--- a/manifest
+++ b/manifest
@@@ -1,7 -1,7 +1,7 @@@
- C Merge\s3.9.0\sprerelease\schanges\sinto\sthe\sapple-osx\sbranch.
- D 2015-10-13T17:49:19.827
 -C Version\s3.9.1
 -D 2015-10-16T17:31:12.550
++C Merge\sthe\s3.9.1\schanges.
++D 2015-10-16T20:52:35.547
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in f0088ff0d2ac949fce6de7c00f13a99ac5bdb663
 +F Makefile.in 0f9801da22670ba81bd7b6a17a0db2ea52650841
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
  F Makefile.msc 0ed934b4ae6a5ec0b9d7e770104864f8372414ab
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@@ -233,10 -233,10 +233,10 @@@ F ext/rbu/rbufault2.test 9a7f19edd6ea35
  F ext/rbu/rbufts.test 828cd689da825f0a7b7c53ffc1f6f7fdb6fa5bda
  F ext/rbu/rbusave.test 0f43b6686084f426ddd040b878426452fd2c2f48
  F ext/rbu/sqlite3rbu.c ea47de615e911b3a69a8e7fb3be3866298403a25
- F ext/rbu/sqlite3rbu.h 5357f070cd8c0bcad459b620651ec1656859e4d0
+ F ext/rbu/sqlite3rbu.h 1d568cb33738d7900975cc5c72e6f68049f15914
  F ext/rbu/test_rbu.c 2a3652241fa45d5eaa141775e4ae68c1d3582c03
  F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 -F ext/rtree/rtree.c 0f9b595bd0debcbedf1d7a63d0e0678d619e6c9c
 +F ext/rtree/rtree.c 65a024af764c4ee608f039ee67e5bf009327b7bd
  F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
  F ext/rtree/rtree1.test 96a80c08440c932cd72aac50660e7af2612d2cda
  F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@@ -1362,8 -1357,8 +1362,8 @@@ F tool/mkopts.tcl 66ac10d240cc6e86abd37
  F tool/mkpragmatab.tcl 84af2b180484323a2ea22a2279e8bd9e3e1e492e
  F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
  F tool/mksqlite3c-noext.tcl 87240b09c20042999b41d5fabe091b7111287835
 -F tool/mksqlite3c.tcl b66b4170f693602cd6985aed15d9509fe2f18c84
 +F tool/mksqlite3c.tcl a4f564e10c919d35dcf0f1b87d16be2cbb082bd7
- F tool/mksqlite3h.tcl e3ac3f23897d86cb8f5f5df92e91643229fcc8d1
+ F tool/mksqlite3h.tcl 1d41ab59bffb025121f75b76e183125ce41b3ec8
  F tool/mksqlite3internalh.tcl eb994013e833359137eb53a55acdad0b5ae1049b
  F tool/mkvsix.tcl bbe57cd9ae11c6cc70319241101ef8d2b8c3765b
  F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@@ -1395,7 -1390,10 +1395,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 1ccae39b8a7094c2cee2f3fea57c847d0063fa81 9ecafc0c94102dca6da192f400278399464086fb
- R fabf24b95e012c3a1542d89da941f547
 -P 746fcd2fd412ddc27071827fb20eb6df0741dfb1
 -R d66bf398f8de1fb81851cd37ab3877c3
 -T +bgcolor * #d0c0ff
 -T +sym-release *
 -T +sym-version-3.9.1 *
++P 1900ce011c7e0c10d670d86833ac701ecf4fa223 767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
++R 0bf5e3cfd1318620e1ed74136811fe8c
  U drh
- Z e6ba91c2b45e36708e68a01eecfdc42d
 -Z 1827cdee71f363c0f73376b432ed6e27
++Z 2d5e2f5daa5600640fefdbf03922d24a
diff --cc manifest.uuid
index 8cb7dd7060,b00e53a180..6262a7a4e9
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 1900ce011c7e0c10d670d86833ac701ecf4fa223
 -767c1727fec4ce11b83f25b3f1bfcfe68a2c8b02
++dd07688d3a478bead1174cf243fd5a667ccdda8d