From: drh <drh@noemail.net>
Date: Mon, 19 Sep 2011 20:28:07 +0000 (+0000)
Subject: Merge in all trunk changes through the version 3.7.8 release.
X-Git-Tag: version-3.13.0~148^2~252
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=946e610a8497e3868e47ad2c976913ec37fb0df6;p=thirdparty%2Fsqlite.git

Merge in all trunk changes through the version 3.7.8 release.

FossilOrigin-Name: 98619a23fd11a5eb319687adfdacc91ff2db896c
---

946e610a8497e3868e47ad2c976913ec37fb0df6
diff --cc manifest
index b3dd4e89fa,4fa7069d09..28145296af
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2011-09-16T19:40:24.719
 -C Version\s3.7.8\srelease\scandidate
 -D 2011-09-19T14:49:19.255
++C Merge\sin\sall\strunk\schanges\sthrough\sthe\sversion\s3.7.8\srelease.
++D 2011-09-19T20:28:07.777
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in d314143fa6be24828021d3f583ad37d9afdce505
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -144,8 -132,8 +144,8 @@@ F src/callback.c 0425c6320730e6d3981acf
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c e3132ec65240b2e2f3d50831021eac387f27584d
  F src/date.c a3c6842bad7ae632281811de112a8ba63ff08ab3
 -F src/delete.c ff68e5ef23aee08c0ff528f699a19397ed8bbed8
 +F src/delete.c 614d6e012aa5b624e78f3b556243497825de196b
- 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
@@@ -192,10 -180,10 +192,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 355493ac9492746a0bbd17a4fd40911aa89b5a3a
  F src/sqlite3ext.h 1a1a4f784aa9c3b00edd287940197de52487cd93
 -F src/sqliteInt.h feb4f2b212fe36bbd951e44d2490c6aacf02f689
 +F src/sqliteInt.h 2c05edf4b8155bf4ef0775a9c30e4b57d7527af3
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac64842c86cec2fc1a1d0e5c16d3beb8ad332bf
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -975,7 -963,7 +976,7 @@@ F tool/symbols.sh caaf6ccc7300fd4335331
  F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
  F tool/warnings.sh b7fdb2cc525f5ef4fa43c80e771636dd3690f9d2
- P c00e45ede7cbf71a3a6d1ccad0b9275010ca8493 cf51ef8ab8a610ddf64f66970dd689fe1df405b8
- R 8f9c10e95fc4061078755c289f7e07d0
 -P db019465036171fcad31181bec7d6ac185f50430
 -R 0a2782a80f1b08369498ecce1d7a7aa8
++P 5efb02949dbeabccfe1d848d275529f03f3dfc84 3e0da808d2f5b4d12046e05980ca04578f581177
++R 29a8a873fd8274eaac6f4c279a0f93a3
  U drh
- Z 423f374ece1297d22d3fad8417996b4a
 -Z 5f8dabab2a44903caad40fc4aceed901
++Z cf555a868961f047f28c626087f81d1a
diff --cc manifest.uuid
index a912068f8e,6cc03efd83..910a546531
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 5efb02949dbeabccfe1d848d275529f03f3dfc84
 -3e0da808d2f5b4d12046e05980ca04578f581177
++98619a23fd11a5eb319687adfdacc91ff2db896c