From: drh <drh@noemail.net>
Date: Mon, 19 Sep 2011 20:36:42 +0000 (+0000)
Subject: Merge in all changes through the 3.7.8 release.
X-Git-Tag: version-3.7.9~67^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=72949adc950c5eafbcc84e75e49d3ffefe89bccc;p=thirdparty%2Fsqlite.git

Merge in all changes through the 3.7.8 release.

FossilOrigin-Name: 9607600b6ca9b546dd248982fd8e8d64f708be5c
---

72949adc950c5eafbcc84e75e49d3ffefe89bccc
diff --cc manifest
index 2c01fd577f,4fa7069d09..f6d23dbca6
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sall\sthe\slatest\strunk\schanges\sinto\sthe\sexperimental\sSTAT3\sbranch.
- D 2011-09-16T19:29:58.199
 -C Version\s3.7.8\srelease\scandidate
 -D 2011-09-19T14:49:19.255
++C Merge\sin\sall\schanges\sthrough\sthe\s3.7.8\srelease.
++D 2011-09-19T20:36:42.908
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -127,13 -127,13 +127,13 @@@ F src/btmutex.c 976f45a12e37293e32cae02
  F src/btree.c 77b09c69d4849a90361e6fe5db36d167f20600c0
  F src/btree.h f5d775cd6cfc7ac32a2535b70e8d2af48ef5f2ce
  F src/btreeInt.h 67978c014fa4f7cc874032dd3aacadd8db656bc3
 -F src/build.c 851e81f26a75abbb98bd99a7c5f10e8670d867bb
 +F src/build.c 57e3b27c26e6754393cd63a2774a6c673df1e804
  F src/callback.c 0425c6320730e6d3981acfb9202c1bed9016ad1a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 -F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d
 +F src/ctime.c dde6a9b835b9e8cc067b713de1a7f6a0c9ff807e
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
  F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
- F src/expr.c fd54c517869919c9b0b11dcadd43c66540ffa682
+ F src/expr.c f4dcaeb8252c4b16fcdc245660f70ed366bc6cdd
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
  F src/fkey.c 9f00ea98f6b360d477b5a78b5b59a1fbde82431c
  F src/func.c 59bb046d7e3df1ab512ac339ccb0a6f996a17cb7
@@@ -180,10 -180,10 +180,10 @@@ F src/random.c cd4a67b3953b88019f8cd4cc
  F src/resolve.c 36368f44569208fa074e61f4dd0b6c4fb60ca2b4
  F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697
  F src/select.c d9b7d20b0365f80761846f00ef3638d4b33eeaf2
- F src/shell.c bbe7818ff5bc8614105ceb81ad67b8bdc0b671dd
+ F src/shell.c 13fe2aeddc3cc90d6a273831d1f63736d1596f81
 -F src/sqlite.h.in 0a6c9c23337fd1352c5c75a613ff9533aa7d91cb
 +F src/sqlite.h.in 3f531daa04457e83bc13765c98c06c7d71c27fa5
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 -F src/sqliteInt.h feb4f2b212fe36bbd951e44d2490c6aacf02f689
 +F src/sqliteInt.h dea1be7eccbc4c4e28fffebae19ab5e2af2b3a26
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -963,8 -962,8 +964,8 @@@ F tool/split-sqlite3c.tcl d9be87f1c3402
  F tool/symbols.sh caaf6ccc7300fd43353318b44524853e222557d5
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 -F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
 -P db019465036171fcad31181bec7d6ac185f50430
 -R 0a2782a80f1b08369498ecce1d7a7aa8
 +F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
- P 11ca4ed8bf850dae1a24b7182f70039f32bd8dd1 cf51ef8ab8a610ddf64f66970dd689fe1df405b8
- R d21205869b95de630ee29bd2fddfacf5
++P 51908c8f2bc6c086570f7493a29b096f0a40ce34 3e0da808d2f5b4d12046e05980ca04578f581177
++R 33df24e64f9adc713ca6be5c23008117
  U drh
- Z cf2b3cc9409ff7ff8b423ef999aa2d40
 -Z 5f8dabab2a44903caad40fc4aceed901
++Z 7823e3ddec646924dd88293936a2470a
diff --cc manifest.uuid
index c0bc0031a6,6cc03efd83..e67d380b7d
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 51908c8f2bc6c086570f7493a29b096f0a40ce34
 -3e0da808d2f5b4d12046e05980ca04578f581177
++9607600b6ca9b546dd248982fd8e8d64f708be5c