From: drh <drh@noemail.net>
Date: Mon, 7 Oct 2013 10:48:06 +0000 (+0000)
Subject: Merge bug fixes from trunk.
X-Git-Tag: version-3.8.1~39^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f38a6418c8319bee3e9c4afbb52c4a0c2610b78;p=thirdparty%2Fsqlite.git

Merge bug fixes from trunk.

FossilOrigin-Name: 1d7b2dc0eae70c0c0e523b715acf758bb4cfa9ac
---

6f38a6418c8319bee3e9c4afbb52c4a0c2610b78
diff --cc manifest
index ce499250eb,f73f1c1ded..824d937e64
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Accept\sthe\ssz=N\sparameter\son\stable-only\slines\sof\ssqlite_stat1.
- D 2013-10-06T22:12:41.122
 -C Restore\sthe\shexrekey\spragma\swhich\swas\saccidently\sdeleted\sduring\sthe\npragma\srefactoring.\s\sMake\ssure\sthe\shexkey\sand\shexrekey\spragmas\sdo\snot\noverflow\sbuffers\swith\sa\sover-length\skey.
 -D 2013-10-07T00:36:01.510
++C Merge\sbug\sfixes\sfrom\strunk.
++D 2013-10-07T10:48:06.076
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -163,10 -163,10 +163,10 @@@ F src/auth.c 523da7fb4979469955d822ff92
  F src/backup.c 2f1987981139bd2f6d8c728d64bf09fb387443c3
  F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
  F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
- F src/btree.c 5ccbbaed7a32ba774306f610da4ab4f3e5348294
+ F src/btree.c d5720cbb21ae56e7e5b07847e05e5b203818acac
  F src/btree.h bfe0e8c5759b4ec77b0d18390064a6ef3cdffaaf
  F src/btreeInt.h f038e818bfadf75afbd09819ed93c26a333d39e0
 -F src/build.c 834fa4bb0fa936c39336c52f5aacc659035d973e
 +F src/build.c ea07ec35354cdcd017b128679391320220030336
  F src/callback.c f99a8957ba2adf369645fac0db09ad8adcf1caa2
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c ea4b7f3623a0fcb1146e7f245d7410033e86859c
@@@ -210,7 -210,7 +210,7 @@@ F src/parse.y a97566d6da75075589a7c716d
  F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
  F src/pcache.h a5e4f5d9f5d592051d91212c5949517971ae6222
  F src/pcache1.c a467393909a4ed7ca9de066d85ba5c5b04a5be63
- F src/pragma.c c9a867f6f96934e91d3a07d72d1b8d61c9963008
 -F src/pragma.c b65c8273162818095cfd2dd37bbbf791710de560
++F src/pragma.c f4ff6e29c316d06bf7dffca0c8cee7c229cae42e
  F src/prepare.c fa6988589f39af8504a61731614cd4f6ae71554f
  F src/printf.c da9119eb31a187a4b99f60aa4a225141c0ebb74b
  F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
@@@ -1120,8 -1119,9 +1120,8 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 -F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 029430c503f243a34439698779db7e591cfbe126
- R 7d04d9dc66c7827e69884f350d18f40f
 -P 2bb7f74bbd467b74581699d16b06758f9c9457dc
 -R cb77936fe5ecaea76a165316bdd4333b
++P e9e932aa400f217e383cda9922fbde8a4356f57a 0aca31e1514b3df254c049b4251bcb199831681a
++R 58571132dec54639078eadde66ba0889
  U drh
- Z eb0f6ed26fc853a592653c23c1c8b118
 -Z 43e1a965446b3e0121e18fe95479d9fc
++Z 412c711013eb3a5449cb7f9aec9f3c69
diff --cc manifest.uuid
index 92709212c2,4aae2f1188..eb89607625
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e9e932aa400f217e383cda9922fbde8a4356f57a
 -0aca31e1514b3df254c049b4251bcb199831681a
++1d7b2dc0eae70c0c0e523b715acf758bb4cfa9ac