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

Merge recent trunk changes into the sessions branch.

FossilOrigin-Name: a769c7e03e6d4163986d49652687de34d15906a0
---

aff0fbb6a51b2ad8a5e1d7787236226603380437
diff --cc manifest
index dd302e6b0c,f1b1389523..f08b0895a2
--- a/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
 -C Fix\sa\sproblem\sin\sthe\sshell\swhen\simporting\sCSV\sfiles.\sIf\sthe\sleftmost\sfield\sof\sthe\sfirst\srow\sin\sthe\sCSV\sfile\swas\sboth\szero\sbytes\sin\ssize\sand\sunquoted,\sno\sdata\swas\simported.
 -D 2014-05-26T18:27:12.472
 +C Merge\srecent\strunk\schanges\sinto\sthe\ssessions\sbranch.
- D 2014-05-20T00:20:23.666
++D 2014-05-26T20:00:00.506
  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
@@@ -196,12 -182,12 +196,12 @@@ F src/global.c 1e4bd956dc2f608f87d2a929
  F src/hash.c d139319967164f139c8d1bb8a11b14db9c4ba3cd
  F src/hash.h 8890a25af81fb85a9ad7790d32eedab4b994da22
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 2396a980907782f959362c2aef8e1596bb57c5ac
 -F src/insert.c ac1a00ca5952555ad54911666762ee5d59cb63cd
++F src/insert.c baf598f56d5ed36444f8d7a8752c0b66e48917ab
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c 0df0b1550b9cc1f58229644735e317ac89131f12
  F src/lempar.c cdf0a000315332fc9b50b62f3b5e22e080a0952b
  F src/loadext.c 867c7b330b740c6c917af9956b13b81d0a048303
- F src/main.c d1fbc849b5a06bfd2e3a1952a68515064a0078ba
 -F src/main.c 40d0837e5d0597eadc47c3acc2fc95bdbd9250b8
++F src/main.c 887077056c8a20bf2880a27096d7a40630f6257a
  F src/malloc.c 0203ebce9152c6a0e5de520140b8ba65187350be
  F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
  F src/mem1.c c0c990fcaddff810ea277b4fb5d9138603dd5d4b
@@@ -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 089c4d46f067a5cccae93524c6377f981ba99bd9
- F src/shell.c 2afe7a7154e97be0c74c5feacf09626bda8493be
+ F src/select.c a6e8fe35d2929911448fe29fc9194eec73c6c0a5
+ F src/shell.c bfac06fb15f3cd0d447e2e72ab3a283fac301813
 -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 1977f44283be0d3b40da315fb4fd9e21c79fadcc
 +F src/sqliteInt.h 01c7555ded7724ef808b27ccbf9af19da526e0a9
  F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
  F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
  F src/table.c 2cd62736f845d82200acfa1287e33feb3c15d62e
@@@ -295,12 -281,12 +295,12 @@@ F src/update.c 7bb549d61efc6853f5cc708c
  F src/utf.c 6dc9ec9f1b3db43ae8ba0365377f11df1ee4c01c
  F src/util.c 049fe1d3c0e2209c1bee107aec2fcff6285f909f
  F src/vacuum.c 3728d74919d4fb1356f9e9a13e27773db60b7179
- F src/vdbe.c 9811665adcf4ad9ad67cf1116e3e6adbe901ece3
 -F src/vdbe.c 3ebcbe6a83198045b0411956fc6005b9f4a6991c
 -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 79b08ff97ab75ab5742cfc96f57ed196484d309a
 +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/vdbetrace.c 6f52bc0c51e144b7efdcfb2a8f771167a8816767
@@@ -1187,7 -1172,7 +1187,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P e158812c34b01ce516d26636a489509bf61d1c27 8180e320ee4090e41511836678e49a98c0b228e8
- R cb7779728ff23dc0c3ee0e1492ef0498
 -P d90c4964fcf46b0b043dbfd58267098582267001
 -R 4f49cf43bba70559a864b8b79fde7303
 -U dan
 -Z b7657af7a09e4e39091c8340eac623cc
++P 2d33afe0c43cb99caa521c48b721c3b0971e967c 856d44a206d82e96265103556dedda39ca3602b1
++R 1b56b8009ead47f6ec1e1c4ec0687826
 +U drh
- Z 89975b84354827e72d595bf54ff41778
++Z 82cfe2ea739284c5d6fb20e24280c01d
diff --cc manifest.uuid
index 7d4a9bdbde,daf356e5f4..afe5304d2b
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2d33afe0c43cb99caa521c48b721c3b0971e967c
 -856d44a206d82e96265103556dedda39ca3602b1
++a769c7e03e6d4163986d49652687de34d15906a0