From: drh <drh@noemail.net>
Date: Thu, 23 Jun 2011 02:11:11 +0000 (+0000)
Subject: Pull the latest trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=893ab7ccbae68a4de5d3bbf7efb7ae1223afd4e4;p=thirdparty%2Fsqlite.git

Pull the latest trunk changes into the sessions branch.

FossilOrigin-Name: 5d95b42946b5cf0346164aebe0a8c4f37527bc31
---

893ab7ccbae68a4de5d3bbf7efb7ae1223afd4e4
diff --cc manifest
index 9fde5b8fdf,aaff29d2eb..c5e575d44c
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\ssessions\sbranch\swith\slatest\strunk\schanges.
- D 2011-06-22T12:01:09
 -C Provide\sthe\sSQLITE_MAX_SCHEMA_RETRY\scompile-time\sparameter\sfor\sadjusting\sthe\nnumber\sof\sreparse\sattempts\safter\sa\sschema\schange.
 -D 2011-06-23T01:42:53.188
++C Pull\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-06-23T02:11:11.003
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -197,8 -187,8 +197,8 @@@ F src/sqliteInt.h 72cff2b19f04b1de96675
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
 -F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef
 +F src/tclsqlite.c 6a34149c9ff4a6f998a4cb8336d4481670b576b6
- F src/test1.c ce2fab9e36932f5771c35291539366c9af229df3
+ F src/test1.c 669b8fde7f3c72250d59fef1adda5e040f7baae0
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -248,11 -238,11 +248,11 @@@ F src/update.c a81bda229f8c3b698f8dcf8e
  F src/utf.c c53eb7404b3eb5c1cbb5655c6a7a0e0ce6bd50f0
  F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
 -F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f
 -F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
 -F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 2f908c65337b16c6249ab378d477e74492cf759b
 -F src/vdbeaux.c 0b2e2880f13af400a27c92a7673287c3eaec8b21
 +F src/vdbe.c df52db6162fd94767b76bb4e9a7cb9207e83086f
 +F src/vdbe.h 322af148cceef120bb1ec9cff7f122e76abf94da
 +F src/vdbeInt.h 3de6588b36c833969aebab202e1766d586c37ec2
- F src/vdbeapi.c 3f6e988bd19391be1aa49ffd1f259654dcc8d975
++F src/vdbeapi.c 1d947da083c24e8bf61823f02f619a1f4a682100
 +F src/vdbeaux.c db3d4eedccea5add714dfb8b10f70d0f8d692db5
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -959,7 -948,7 +959,7 @@@ F tool/symbols.sh bc2a3709940d47c8ac8e0
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P f3d148e0d10e16cd744ec88a2961fd617368c5ed 6e1f4df51ad32e36715cba16f9df0d17a08dc653
- R 13b557f9f4fbb1acb5f4e9d6383e3c30
- U dan
- Z e013d0e7eccb6ac9a42c9313b4aac9ad
 -P 07884cc218e6899efd163448ab116f296722f7b8
 -R 1ebb2dce4c03a2b8c248fc12b488baac
++P 48d5cab3ac08b25ec94d6ecfd25779320558110f 8dca748b23fa6f9abf47a186dcd1766f4dcf3ab7
++R 3169acda05ed5fbe4acf037bcfc9a4ff
+ U drh
 -Z ee2965e68946933dec7ceb7c99aa065f
++Z 2442f47412d7510881ef0ca2870675d8
diff --cc manifest.uuid
index 86f3655672,fe91914370..63b5313abf
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 48d5cab3ac08b25ec94d6ecfd25779320558110f
 -8dca748b23fa6f9abf47a186dcd1766f4dcf3ab7
++5d95b42946b5cf0346164aebe0a8c4f37527bc31