From: drh <drh@noemail.net>
Date: Thu, 6 Mar 2014 13:48:31 +0000 (+0000)
Subject: Merge the latest 3.8.4 tweaks from trunk.
X-Git-Tag: version-3.13.0~148^2~154
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2eded23f593efc061694c04a8f987f0831700aa;p=thirdparty%2Fsqlite.git

Merge the latest 3.8.4 tweaks from trunk.

FossilOrigin-Name: 1ed463d91866182fbc884fb88770717ee5bf33ce
---

f2eded23f593efc061694c04a8f987f0831700aa
diff --cc manifest
index 50543d2747,c1695f1700..60f4a66dd8
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\scompiler-warning\sfixes\sfrom\strunk.
- D 2014-03-05T23:12:55.336
 -C Improved\sEXPLAIN\sindentation\sof\sa\sloop\sin\sthe\sANALYZE\slogic\sfor\sSTAT4.\nMark\sthe\snot-found\sjump\sof\sa\sseek\soperation\sin\sthat\sloop\sas\snever\staken.
 -D 2014-03-06T13:38:37.861
++C Merge\sthe\slatest\s3.8.4\stweaks\sfrom\strunk.
++D 2014-03-06T13:48:31.335
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in 2ef13430cd359f7b361bb863504e227b25cc7f81
 +F Makefile.in e4ee6d36cdf6136aee0158675a3b24dd3bf31a5a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc fdacba6fb574868c71fde6db6b77789a383a4c19
 +F Makefile.msc b448317831d9c364bf501538becce5cc1f0a0f8b
  F Makefile.vxworks db21ed42a01d5740e656b16f92cb5d8d5e5dd315
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 0dc30ad5cf90736d5fd9e540c9f05c542658abe7
@@@ -194,7 -180,7 +194,7 @@@ F src/global.c 1d7bb7ea8254ae6a68ed9bfa
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c cb421bc5aa4831dae9d6f0715d869cc7a008c8b4
 -F src/insert.c d8bb30535c8c0785876025a4a07f9074640a15d1
++F src/insert.c e1ebd5d798da6b8dc180841c34e3c91b4d1fb798
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@@ -231,11 -217,11 +231,11 @@@ F src/random.c d10c1f85b6709ca97278428f
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
  F src/select.c 0adf172d33cc610ff5ffe26edfd2ba67c3551655
- F src/shell.c 7bf07bcacb181ecc3fc3ccacfdfeb4084aee67ed
+ F src/shell.c bab4de12b441369491812ecc93212ff4deda68fa
 -F src/sqlite.h.in a2ef671f92747a5a1c8a47bad5c585a8dd9eca80
 +F src/sqlite.h.in a31c8b7782a0388b4bd823ed3a3a3e4b93b0cf42
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h d24228c061305bd8303a2d220a2a437ab59ef713
 -F src/sqliteInt.h fa7161b3de18a9c355d4148233f3563c92311fcc
++F src/sqliteInt.h 00c7411fe2311279ff525b5e1c1b791696a4ab3b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -291,12 -277,12 +291,12 @@@ F src/update.c 7bb549d61efc6853f5cc708c
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c c46c90459ef9bdc0c6c73803cf4c55425b4771cf
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c ccddf62bcb2981b3aaa991ec72387c26aeaf65f6
 -F src/vdbe.c 5f0fffa9bf49a90c05dc3d46d8217603fd0ee00e
 -F src/vdbe.h d189f92468a17a6f04daeec9df3b767f50557b21
 -F src/vdbeInt.h e54fc4f289fce48e81b3371128446033d097733b
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e45e3f9daf38c5be3fd39e9aacc1c9066af57a06
 -F src/vdbeblob.c d939997de046b8fcc607cfee4248f3d33dbcca50
++F src/vdbe.c a088d1688e6e0aeb69ffccb4ba740dfd77b44420
 +F src/vdbe.h 6631430dddd1450dfe749ba6fa8e2acdda3933f6
 +F src/vdbeInt.h aa52feb8bfc05ea29ea262a9ce4050715c57ad5a
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
- F src/vdbeaux.c 955216d35e65dfc93e9b6d0226ad38c0b2e8036a
++F src/vdbeaux.c 1d0dad087b4d35ead04ebcc30e73ae7a172ad80f
 +F src/vdbeblob.c 666ce6596264fe88dad51bf60c160668d3cd0920
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
  F src/vdbesort.c 46801acb342e5e4c07ba1777fe58880c143abb59
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1170,7 -1155,7 +1170,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 0828975d580d309a1c66da4b6caeb65b21a01199 bfd75f471a607b442d8cd8a7070491a158e8fb1a
- R e965e9a7cdd596120cb3952130975039
 -P 4a4997221f3d61c1411a993053b40c787beea736
 -R 6c77c921c71ee968c47f10dbbbd337e5
++P a1f2b0428518ec18af74a0e01deb4e40cd95a78f 0a4200f95cf46ad620b9fd91f4444114a0c74730
++R 6b398dedc2e443426b8d1ae4a040c589
  U drh
- Z 92046e22a7cea92c290fbcbfd8db2a52
 -Z 43128f0b9615c8a6ed241332450c076a
++Z 5e939e72ef6a3efe23540b139841828b
diff --cc manifest.uuid
index d9b4b55baf,de8a5a7e02..732285ae0a
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a1f2b0428518ec18af74a0e01deb4e40cd95a78f
 -0a4200f95cf46ad620b9fd91f4444114a0c74730
++1ed463d91866182fbc884fb88770717ee5bf33ce