From: drh <drh@noemail.net>
Date: Sat, 6 Apr 2013 18:10:27 +0000 (+0000)
Subject: Merge trunk changes into the mptest branch.  The mptest needs the
X-Git-Tag: version-3.7.17~105^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f35eb024e9308621c31c9571e8f969d31e63735;p=thirdparty%2Fsqlite.git

Merge trunk changes into the mptest branch.  The mptest needs the
SQLITE_MAX_SCHEMA_RETRY fix in particular.

FossilOrigin-Name: fb7a7773965697855c12193408cb75300decc23c
---

8f35eb024e9308621c31c9571e8f969d31e63735
diff --cc manifest
index e1cc87dabd,5497db1fb1..bfff919823
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Add\sSQLITE_CONFIG_LOG\serror\slogging\sto\sthe\smptest\sprogram.
- D 2013-04-06T14:30:29.439
 -C Increase\sthe\sdefault\sSQLITE_MAX_SCHEMA_RETRY\sto\s50.\s\sMake\ssure\sthat\smacro\ncovers\severy\scase\swhere\sa\sprepared\sstatement\smight\sneed\sto\sbe\sreprepared\sdue\nto\sa\sschema\schange.\s\sThe\ssqlite3_exec()\sinterface\snow\suses\s\nsqlite3_prepare_v2().
 -D 2013-04-06T18:06:51.485
++C Merge\strunk\schanges\sinto\sthe\smptest\sbranch.\s\sThe\smptest\sneeds\sthe\nSQLITE_MAX_SCHEMA_RETRY\sfix\sin\sparticular.
++D 2013-04-06T18:10:27.166
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in aafa71d66bab7e87fb2f348152340645f79f0244
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1047,7 -1044,7 +1047,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
- P a0bae686c9d7f08afac00f66067f5147be6231e0
- R 861169f81b752fa53a7328f523d2af55
 -P 07a0e4e9820a85bf1690214fef3577866c763f92
 -R 2fd4d54ffecba80bddc0b0bfdd8ef6ea
++P 716c25bd125c8934499c1fb59a60d7e844c0691c c1d7304c80c4a6244c8a9f6fad1eebd0f339c724
++R 865d94cb53d70dd89436e58ffa63ebac
  U drh
- Z 4d9e999545d1ee7e59c6e7a0f5ed5b2c
 -Z d5343d886a406d77dc84001af2f5f17d
++Z 83b40ff56b301adcba03b758b3b36603
diff --cc manifest.uuid
index f6ccd0c84f,85d44ed73b..284652c9b5
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 716c25bd125c8934499c1fb59a60d7e844c0691c
 -c1d7304c80c4a6244c8a9f6fad1eebd0f339c724
++fb7a7773965697855c12193408cb75300decc23c