From: drh <drh@noemail.net>
Date: Thu, 23 Jun 2011 17:40:15 +0000 (+0000)
Subject: Pull the latest version 3.7.7 release-candidate changes into the
X-Git-Tag: version-3.13.0~148^2~268
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=88ab69f6144539ca2ec1dc66c14252ddcf9ce485;p=thirdparty%2Fsqlite.git

Pull the latest version 3.7.7 release-candidate changes into the
sessions branch.

FossilOrigin-Name: 840bf9c2d92192ee3cc2aa7c0e9bdb805a066fd4
---

88ab69f6144539ca2ec1dc66c14252ddcf9ce485
diff --cc manifest
index c5e575d44c,5971790c88..8bdd0ba57a
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Pull\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2011-06-23T02:11:11.003
 -C Add\sa\sbit\sto\sthe\sSQLITE_TESTCTRL_OPTIMIZATIONS\ssetting\sthat\swill\sdisable\naffinity\swhen\swriting\sto\sany\sindex,\sregardless\sof\swhether\sor\snot\sthe\sindex\nis\son\sa\smanifestation\sof\sa\sview.\s\sThis\sallows\sbetter\stesting\sof\sthe\sfix\nfor\sticket\s[91e2e8ba6ff2e2].
 -D 2011-06-23T17:29:33.244
++C Pull\sthe\slatest\sversion\s3.7.7\srelease-candidate\schanges\sinto\sthe\nsessions\sbranch.
++D 2011-06-23T17:40:15.467
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -142,7 -132,7 +142,7 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 7deec4534f3b5a0c3b4a4cbadf809d321f64f9c4
  F src/date.c d3c11de76392ea62637bfac0f4655889fc2f5a85
- F src/delete.c c84066147544e8fddb7ca60ac7fd36ed2df8487f
 -F src/delete.c 4925f9121525fc871f5d8d13c1f7dcc91abb38bb
++F src/delete.c 7a8683a38e86d48a0e67ef949fddac6daf46d89d
  F src/expr.c ab46ab0f0c44979a8164ca31728d7d10ae5e8106
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9fabba17a4d4778dc660f0cb9d781fc86d7b9d41
@@@ -191,14 -181,14 +191,14 @@@ 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 4b7255c10d39c5faf089dbd29cde7c367ff39f1f
 +F src/sqlite.h.in f292d325b466081f8980911316743192cce6832a
  F src/sqlite3ext.h c90bd5507099f62043832d73f6425d8d5c5da754
- F src/sqliteInt.h 72cff2b19f04b1de96675fc7dbc1dd4645d90e05
 -F src/sqliteInt.h 7b72f7c6929757c0678d94524dbc7e7e3d6dc398
++F src/sqliteInt.h 3c2f3f13d8ea942ddfee1df1b78013566eae8a74
  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 669b8fde7f3c72250d59fef1adda5e040f7baae0
+ F src/test1.c 8eef932f1024f1076a8adb8a6f5d9c5267c9e969
  F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
  F src/test3.c 124ff9735fb6bb7d41de180d6bac90e7b1509432
  F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
@@@ -959,7 -949,7 +960,7 @@@ F tool/symbols.sh bc2a3709940d47c8ac8e0
  F tool/tostr.awk 11760e1b94a5d3dcd42378f3cc18544c06cfa576
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
- P 48d5cab3ac08b25ec94d6ecfd25779320558110f 8dca748b23fa6f9abf47a186dcd1766f4dcf3ab7
- R 3169acda05ed5fbe4acf037bcfc9a4ff
 -P c271f7e88fc081a460dd3f4afb24aa9fb7fa2917
 -R 5805b6f3882ce897a61c4ce87076bc70
++P 5d95b42946b5cf0346164aebe0a8c4f37527bc31 b61a76a53af04f731fe7617f7b6b4fb2aef6587b
++R 5b9118bd8782ff0e4b99f3cb89f8be24
  U drh
- Z 2442f47412d7510881ef0ca2870675d8
 -Z 83d974f3e6b84b4810ac6511db96428d
++Z 3edc7355d0a27e1ff60419d5d75c34a3
diff --cc manifest.uuid
index 63b5313abf,b421fc183b..6c62bceba4
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5d95b42946b5cf0346164aebe0a8c4f37527bc31
 -b61a76a53af04f731fe7617f7b6b4fb2aef6587b
++840bf9c2d92192ee3cc2aa7c0e9bdb805a066fd4