From: drh <drh@noemail.net>
Date: Tue, 21 Jun 2011 01:29:16 +0000 (+0000)
Subject: Merge the latest trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~271
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: f3d148e0d10e16cd744ec88a2961fd617368c5ed
---

34ffcfff0207a6b41e8b8bc3c5e4c1c7bd6a32ae
diff --cc manifest
index b3627525f0,42f907d912..55808a4f17
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C (no\scomment)
- D 2011-06-20T11:17:11.686
 -C More\stypo\sfixes\sin\sevidence\smarks.\s\sNo\scode\schanges.
 -D 2011-06-20T23:51:33.581
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-06-21T01:29:16.319
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -191,13 -181,13 +191,13 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c 0e0173b3e79d956368013e759f084caa7995ecb1
- F src/sqlite.h.in 1daf26cc593fa78dd041af564c708869b1f12df3
 -F src/sqlite.h.in a4d0baabe4f86b3ab9cf56eda23dfd9d022ece0a
++F src/sqlite.h.in 6bff7c59ae3cec01e628800b79ae87a2897c576c
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
 -F src/sqliteInt.h 7b7ec2394b94fc4516930cd9dae37af0f9312215
 +F src/sqliteInt.h 928caa40080d47e8f92e1edee83f6249d03c5862
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
- F src/tclsqlite.c 2c9ac84e46f9753e05dff1f1bfc745a390ebeb64
 -F src/tclsqlite.c 5db825be61708b1a2b3f8f6e185e9b753829acef
++F src/tclsqlite.c 6a34149c9ff4a6f998a4cb8336d4481670b576b6
  F src/test1.c efca486a25fb894988e7a82e84579a4e57388a02
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
@@@ -211,7 -201,7 +211,7 @@@ F src/test_async.c 0612a752896fad42d55c
  F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
  F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
  F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
- F src/test_config.c 2794d55f27c7faa6c8203b15e634e7103953ddcc
 -F src/test_config.c 791a9acbf9a695cf9c12ff6bbe874dfde9a8c5f3
++F src/test_config.c 470765ec36636d2c598766342b58e4c841e24512
  F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
@@@ -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 af4d8ba06efb768f405d189d4b992c81ae14d711
 -F src/vdbe.c 50b5b4ef29d928a4f60905f820ee1ab2f8ced29f
 -F src/vdbe.h 5cf09e7ee8a3f7d93bc51f196a96550786afe7a1
 -F src/vdbeInt.h ad84226cc0adcb1185c22b70696b235a1678bb45
 -F src/vdbeapi.c 0eeadc75e44a30efd996d6af6e7c5a2488e35be8
 -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/vdbeaux.c db3d4eedccea5add714dfb8b10f70d0f8d692db5
  F src/vdbeblob.c f024f0bf420f36b070143c32b15cc7287341ffd3
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -706,7 -695,7 +706,7 @@@ F test/tclsqlite.test 1ce9b6340d6d41242
  F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
  F test/temptable.test f42121a0d29a62f00f93274464164177ab1cc24a
  F test/temptrigger.test b0273db072ce5f37cf19140ceb1f0d524bbe9f05
- F test/tester.tcl 174f2bc00ddacc6c7666a15d3dbac9669dfc2373
 -F test/tester.tcl 78e63a11eaaec5c2b3c74977d61bf70666d8393f
++F test/tester.tcl 7b91ddd9b2513024b4f95ac3c0151b2dab8433e0
  F test/thread001.test a3e6a7254d1cb057836cb3145b60c10bf5b7e60f
  F test/thread002.test afd20095e6e845b405df4f2c920cb93301ca69db
  F test/thread003.test b824d4f52b870ae39fc5bae4d8070eca73085dca
@@@ -957,7 -946,7 +957,7 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 4c5e276c902e0b93cfc05bf2e1db966ecdac0ed0 e539d08a4dda073dc67dc39a104f89374d3bd8e9
- R f0476f177016b146d1b12f97f172f0c0
- U dan
- Z 9b9916cabe28f8e3dca16fc079f9fb31
 -P bd980be471b185e2dc45875804103d5afc8f78cf
 -R 129d3396a51cd277a2cd5fd90ed058d9
++P 699b884383f735fb9630d87d25dab61c97dc4485 e60eefc76fa5066720d76858f6cfca56365330ee
++R e193f5c5190325b306fe583331238ae9
+ U drh
 -Z c467af82d7eff2f784ff6186e148e641
++Z 4fd98ca50300bc27a920f010541b7f13
diff --cc manifest.uuid
index f28dccb162,df26e53231..4644aa1f38
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 699b884383f735fb9630d87d25dab61c97dc4485
 -e60eefc76fa5066720d76858f6cfca56365330ee
++f3d148e0d10e16cd744ec88a2961fd617368c5ed