From: drh <drh@noemail.net>
Date: Thu, 29 May 2014 20:29:13 +0000 (+0000)
Subject: Merge trunk changes into the sessions branch.
X-Git-Tag: version-3.13.0~148^2~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbabb203908dc97166f2c5fe9366e134fdaf1ed2;p=thirdparty%2Fsqlite.git

Merge trunk changes into the sessions branch.

FossilOrigin-Name: 9f18e78f039ffa89a8806810ad385bdc51bc88ed
---

cbabb203908dc97166f2c5fe9366e134fdaf1ed2
diff --cc manifest
index f08b0895a2,5ca3da5016..cd46f94dfe
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2014-05-26T20:00:00.506
 -C Fix\sto\sthe\sEXPLAIN\sindentation\slogic\sin\sthe\scommand-line\sshell.
 -D 2014-05-29T20:17:57.027
++C Merge\strunk\schanges\sinto\sthe\ssessions\sbranch.
++D 2014-05-29T20:29:13.254
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 -F Makefile.in dd2b1aba364ff9b05de41086f74407f285c57670
 +F Makefile.in faf03dca4bd103f3e98b317aeba930dea49cfaa1
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 -F Makefile.msc 52911c6bfeaf9b40f47ef4615ab66d98ab0f2b3d
 +F Makefile.msc ac23895c1c2928518fa729b3b71bc30a6ab19347
  F Makefile.vxworks 034289efa9d591b04b1a73598623119c306cbba0
  F README.md 64f270c43c38c46de749e419c22f0ae2f4499fe8
  F VERSION 9f823c026c6a32fc5f84d212a8aae0a221dba45c
@@@ -187,16 -173,16 +187,16 @@@ F src/callback.c 174e3c8656bc29f91d710a
  F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
  F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
  F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 -F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
 +F src/delete.c 50b74c1dde25d1ebcb4fa5c870762e6470ee46f1
  F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
  F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
- F src/fkey.c 5269ef07b100763134f71b889327c333bd0989cf
+ F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
  F src/func.c 2e16316ec3a6365a0dc3e553c586f91b20f7f6c8
  F src/global.c 1e4bd956dc2f608f87d2a929abc4a20db65f30e4
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c baf598f56d5ed36444f8d7a8752c0b66e48917ab
 -F src/insert.c a038daeadfb818aaadafa854f40f5623b6929d84
++F src/insert.c 3f5e6cb2cfea0c20a11d51da943395ac480122cb
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
@@@ -234,12 -220,12 +234,12 @@@ F src/printf.c e5a0005f8b3de21f85da6a70
  F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
  F src/resolve.c 273d5f47c4e2c05b2d3d2bffeda939551ab59e66
  F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
- F src/select.c a6e8fe35d2929911448fe29fc9194eec73c6c0a5
- F src/shell.c bfac06fb15f3cd0d447e2e72ab3a283fac301813
+ F src/select.c 7df17ec5506c2427576d412bee0e6ea740e12563
+ F src/shell.c 33f6c0bc0e32eae099f7c2b79cfa7515b4b4702c
 -F src/sqlite.h.in 564fc23db33870b5096b20d72df7491ce0b8b74f
 +F src/sqlite.h.in 78ac857a20a16d03b343320973b7da1736ff8fe9
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
  F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
- F src/sqliteInt.h 01c7555ded7724ef808b27ccbf9af19da526e0a9
 -F src/sqliteInt.h fccdc735c27b3dc12322fec7cdad8bc76be8d00b
++F src/sqliteInt.h b9260ccf4c1ca2e26bc0789597c0a132aad4961b
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -291,18 -277,18 +291,18 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/tokenize.c 6da2de6e12218ccb0aea5184b56727d011f4bee7
  F src/trigger.c 66f3470b03b52b395e839155786966e3e037fddb
- F src/update.c 7bb549d61efc6853f5cc708c1de6931179f8a12d
 -F src/update.c 01564b3c430f6c7b0a35afaf7aba7987206fa3a5
++F src/update.c 0f16e1d55d642a7ae3199bd0c2c1f51a7ef1b9d4
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 79b08ff97ab75ab5742cfc96f57ed196484d309a
 -F src/vdbe.c 9bfe6becfc094382ae213656fbe511055ad83a54
 -F src/vdbe.h 394464909ed682334aa3d5831aae0c2fe2abef94
 -F src/vdbeInt.h e6d83e5bfd62fc6685ba1ed6153f7099f82de9f7
 -F src/vdbeapi.c 0ed6053f947edd0b30f64ce5aeb811872a3450a4
 -F src/vdbeaux.c e493f38758c4b8f4ca2007cf6a700bd405d192f3
 -F src/vdbeblob.c 9205ce9d3b064d9600f8418a897fc88b5687d9ac
++F src/vdbe.c 62f985592bfa011c2b35f8d7bfb4d4090340ae40
 +F src/vdbe.h d03fcf47890ae1c79a335ca994cb878b302697ca
 +F src/vdbeInt.h c05d4572211384c560b7579e7a299248cf31d6bd
 +F src/vdbeapi.c d3c662762b62e330a03f29de8e2ac7098ef78030
 +F src/vdbeaux.c e0c2e24ee12c94b6d7cb1c521a0b26cd2e3231d9
 +F src/vdbeblob.c d7c232d1c6afc7ee1176c38b7d81b2e17af15ceb
  F src/vdbemem.c 6fc77594c60f6155404f3f8d71bf36d1fdeb4447
- F src/vdbesort.c 4abb7c0f8f19b7d7d82f4558d5da1a30fdf9ea38
+ F src/vdbesort.c 44441d73b08b3a638dcdb725afffb87c6574ad27
  F src/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
  F src/vtab.c 21b932841e51ebd7d075e2d0ad1415dce8d2d5fd
  F src/wal.c 76e7fc6de229bea8b30bb2539110f03a494dc3a8
@@@ -1185,9 -1171,9 +1186,9 @@@ F tool/tostr.awk e75472c2f98dd76e06b8c9
  F tool/vdbe-compress.tcl 0cf56e9263a152b84da86e75a5c0cdcdb7a47891
  F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
- F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
+ F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 2d33afe0c43cb99caa521c48b721c3b0971e967c 856d44a206d82e96265103556dedda39ca3602b1
- R 1b56b8009ead47f6ec1e1c4ec0687826
 -P 48dce821a07ac29da6ce05e92cf3f6e52b6eb388
 -R f3f6ddac33e05ba165213ff981b802f2
++P a769c7e03e6d4163986d49652687de34d15906a0 8f916ed1e185ac728e00624d90e1d7bd2dda4469
++R 3370b40cbcc7803475544bb7516ae78d
  U drh
- Z 82cfe2ea739284c5d6fb20e24280c01d
 -Z 830218d29106127a2f4cf14b2b59a5e2
++Z cb38c4d301930323a7c7581f1a945fe2
diff --cc manifest.uuid
index afe5304d2b,16ffe06ff6..1031ff599e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- a769c7e03e6d4163986d49652687de34d15906a0
 -8f916ed1e185ac728e00624d90e1d7bd2dda4469
++9f18e78f039ffa89a8806810ad385bdc51bc88ed