From: drh <drh@noemail.net>
Date: Wed, 1 Jun 2011 19:44:57 +0000 (+0000)
Subject: Pull the latest trunk changes into the wal-readonly branch.
X-Git-Tag: version-3.7.7~81^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f167694f9a06eb3956d6eb30c8958d5854f0e0cd;p=thirdparty%2Fsqlite.git

Pull the latest trunk changes into the wal-readonly branch.

FossilOrigin-Name: 0b63b71357a65e26ecd3f3bb34a5f14feee322f4
---

f167694f9a06eb3956d6eb30c8958d5854f0e0cd
diff --cc manifest
index 22534d04aa,9e6489e647..b3a84d3a3f
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\swal-readonly\sbranch.
- D 2011-05-31T17:08:32.975
 -C Avoid\sunnecessary\sduplication\sof\sSQL\sparameter\snames.
 -D 2011-06-01T19:16:06.364
++C Pull\sthe\slatest\strunk\schanges\sinto\sthe\swal-readonly\sbranch.
++D 2011-06-01T19:44:57.308
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 11dcc00a8d0e5202def00e81732784fb0cc4fe1d
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -123,9 -123,9 +123,9 @@@ F src/backup.c 986c15232757f2873dff35ee
  F src/bitvec.c af50f1c8c0ff54d6bdb7a80e2fceca5a93670bef
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
  F src/btree.c 0d3b39dcb79565c053e35fc12713f12d8a74d6a9
 -F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
 +F src/btree.h d796dc4030b3cce7f5a0cc4f2f986d2befa6b8ac
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
- F src/build.c 0132bc6631fa617a1d28ef805921f6dbac18a514
+ F src/build.c c10ab9e2c77ade99dee23554787f8acfc0c231fc
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
@@@ -179,9 -179,9 +179,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 55fe75ae0d2ee71c33283bae647443c8ec8400be
 -F src/sqlite.h.in 91c63a69eeddbd62182ec00dbfee390016972bdb
++F src/sqlite.h.in dbe88418628302c0a93671a216346acb5746211a
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 8936583efbbc5820e9b01befa6e76947a2be8f52
 -F src/sqliteInt.h 6e58c558c57c8f44011736d5fa5295eb3130f9de
++F src/sqliteInt.h 219b21e80f46eef7cc7bb7477c12de61d00f5607
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -939,7 -938,7 +939,7 @@@ F tool/speedtest8.c 2902c46588c40b55661
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P 6a2ea52e6c09a570428161090c2f087c66f714ec a0ae314c7f41d0146a9ee1adc576cd977219a378
- R 2d882c761e53216861edc4b651b9e13f
 -P b3aaf715b60b8a338cc6c92dad1ead4a3f7146a3
 -R 018490a374b5cf414074a5a4bbd3de70
++P 2c6b5a28e3f6b7cb96b944d0a254f3707885f1ce e704e8690ae35decc9769a45cf8d519ccad8b79d
++R 5f4edf2ff77d011b562e3dc234f8f21d
  U drh
- Z 136bd350bac5191ea5a92cebd8db2492
 -Z dcf10ad87997753baf45956f9011da61
++Z 99212444a62258034d706d358ee0a50e
diff --cc manifest.uuid
index 80f0eef0d9,de373954a3..70ad59250f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2c6b5a28e3f6b7cb96b944d0a254f3707885f1ce
 -e704e8690ae35decc9769a45cf8d519ccad8b79d
++0b63b71357a65e26ecd3f3bb34a5f14feee322f4