From: drh <drh@noemail.net>
Date: Mon, 30 May 2011 13:39:20 +0000 (+0000)
Subject: Merge the latest trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf0ed47d82328aa2517e99d60b56b4c95cad17cd;p=thirdparty%2Fsqlite.git

Merge the latest trunk changes into the sessions branch.

FossilOrigin-Name: 832886b1e6edb916d9824924c7d88202f4eb1969
---

bf0ed47d82328aa2517e99d60b56b4c95cad17cd
diff --cc manifest
index 7c550ad27a,701dc47e95..ac09e78587
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch,\sespecially\nthe\sdisappearing\sWAL\stransaction\sfix.
- D 2011-05-19T02:48:46.609
 -C Fix\sa\s"#ifdef"\sfrom\scheck-in\s[03f7d36a8a]\sthat\sshould\shave\sbeen\s"#ifndef".
 -D 2011-05-28T19:24:15.852
++C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2011-05-30T13:39:20.980
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -189,9 -179,9 +189,9 @@@ F src/resolve.c 1c0f32b64f8e3f555fe1f73
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9d440809025a58547e39f4f268c2a296bfb56ff
  F src/shell.c decd04236a7ef26be5ef46d4ea963044bfad9a48
- F src/sqlite.h.in b851102bb0840bf6d4dde5d6690c2ad127a65ade
 -F src/sqlite.h.in 91c63a69eeddbd62182ec00dbfee390016972bdb
++F src/sqlite.h.in 6e087deaec87d358aa4027545ef7454e427b5619
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 2fb482cff778112e6b2797226f30f3862a627468
 -F src/sqliteInt.h d9ff5f198b5bac7ee0c6e1ea55f76897ba4dda87
++F src/sqliteInt.h 38481431b379b468f7bd282d2e318aed4b56d860
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -209,8 -199,8 +209,8 @@@ 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 9a6aa8301a56906612b5e70f5b38e80cfb8af8e7
 +F src/test_config.c 2794d55f27c7faa6c8203b15e634e7103953ddcc
- F src/test_demovfs.c 938d0f595f8bd310076e1c06cf7885a01ce7ce01
+ F src/test_demovfs.c 20a4975127993f4959890016ae9ce5535a880094
  F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
  F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
  F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
@@@ -246,11 -236,11 +246,11 @@@ F src/update.c f66b651c15e42875f36501ec
  F src/utf.c d83650c3ea08f7407bd9d0839d9885241c209c60
  F src/util.c 0f33bbbdfcc4a2d8cf20c3b2a16ffc3b57c58a70
  F src/vacuum.c 05513dca036a1e7848fe18d5ed1265ac0b32365e
- F src/vdbe.c af2e9d0ffd3e111140bc51769f6995834be69e11
 -F src/vdbe.c 380dddc404c1e4a9260a4194daa728b94ed102d7
 -F src/vdbe.h 8a675fefdf7119441fe817c800a9a52440c2e797
 -F src/vdbeInt.h fe8f58d305e629fff02f61f655aca1d299f1f6ae
 -F src/vdbeapi.c e0e2672e0a96ae3f8575c8ecd02912a3e8a554a1
 -F src/vdbeaux.c 07a5226ae6e9c6e54b5fcd3c395b86e7ffdba3a4
++F src/vdbe.c 619fb3fc054f7f9bf41c0e354702dfc35eebb17f
 +F src/vdbe.h 44fd57aeed86da0cd31206626c13cdde0e72cc0e
 +F src/vdbeInt.h b95de01246c15499c700ae00cfda0de25c01358a
 +F src/vdbeapi.c 8051038f7674c708f4515ab189fc3ea929e09a4c
- F src/vdbeaux.c be135f46ee48b5726fb59ca41224475c1dbe8f8b
++F src/vdbeaux.c 8c5a643ba7d0d9882902ef2b4ab3dc2084d838ae
  F src/vdbeblob.c c3ccb7c8732858c680f442932e66ad06bb036562
  F src/vdbemem.c 0498796b6ffbe45e32960d6a1f5adfb6e419883b
  F src/vdbetrace.c 5d0dc3d5fd54878cc8d6d28eb41deb8d5885b114
@@@ -949,7 -938,7 +949,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6883580e6c8973010a42d1d2c5bde04c6b2f4eb7 67bf1c9a888b0d84d252d6c4c754c2c51994d208
- R f15f9213bb9ad0f88efa9254eb2387a3
 -P 5f15579f8ca747f0fa0a7867ceffc8c7b8f904e6
 -R a63903941bea8f77658823b8763468e2
++P 5b1b536cf828850d0e8ac2ab08e8696082715877 edb865c35415f9553f8279028120f7b8de2bf7e2
++R 15c7d86baba462087df3e66721c44f54
  U drh
- Z 1a1886a9d9151866e45101a5d0e49b24
 -Z 62e9bfe1cc7669e25feec8cecb39066d
++Z 3723c6e367168438b5fa877d64e1595b
diff --cc manifest.uuid
index fe55e41565,60ef9e438e..a8da7a29c8
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5b1b536cf828850d0e8ac2ab08e8696082715877
 -edb865c35415f9553f8279028120f7b8de2bf7e2
++832886b1e6edb916d9824924c7d88202f4eb1969