From: drh <drh@noemail.net>
Date: Fri, 4 Oct 2013 20:39:44 +0000 (+0000)
Subject: Merge trunk changes.
X-Git-Tag: version-3.8.1~39^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03e1754e31125883f60eeff5b7d5268fadb91673;p=thirdparty%2Fsqlite.git

Merge trunk changes.

FossilOrigin-Name: c6ac80ed8d5240dd30783d62d9f133e159809dec
---

03e1754e31125883f60eeff5b7d5268fadb91673
diff --cc manifest
index 7c1f0bb0d5,abbe874d85..785d3f86cc
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Further\srefinements\sof\sthe\sindex\sscanning\sspeed\slogic.
- D 2013-10-04T18:29:25.135
 -C If\san\s"INSERT\sINTO\s...\sSELECT"\scan\suse\sthe\sxfer\soptimization,\spass\sthe\sOPFLAG_BULKCSR\shint\sto\sbtree\scursors\sused\sto\supdate\sindices.\sThis\sresults\sin\sa\stighter\skey\spacking.
 -D 2013-10-04T18:17:18.371
++C Merge\strunk\schanges.
++D 2013-10-04T20:39:44.163
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -216,7 -216,7 +216,7 @@@ F src/printf.c da9119eb31a187a4b99f60aa
  F src/random.c 0b2dbc37fdfbfa6bd455b091dfcef5bdb32dba68
  F src/resolve.c 7459801d02997b07e8b8da85ef255392ba1d022b
  F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
- F src/select.c f64a972fc74cd01dd6e3a6cbfdae4f3b422e202f
 -F src/select.c 2d71af95ee534afee69f5649ecf54180a9d8704b
++F src/select.c 6131008151ddc09bd04ceda98c3fcb8a36edacdd
  F src/shell.c 5ee50ca3e35453bbd6ccdf1bdd0f6bbe9738e9fb
  F src/sqlite.h.in ec40aa958a270416fb04b4f72210357bf163d2c5
  F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
@@@ -1119,7 -1121,7 +1121,7 @@@ F tool/warnings-clang.sh f6aa929dc20ef1
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 2f394de88f23dacd3c61e586a4214ffc6f927d97
- R 5ccf33e3078e70324dfa975f1d6b983c
 -P 9f2f4c0a50808910ad01c8c4352367f25747be08
 -R 1a5e7ad489720bad14bf8a2c7fdcf705
 -U dan
 -Z 7e4842290c9eaa42ff3b5e8577f2751e
++P e5d9371da92b4cc2c1df177cf40e0ced4d4c7421 087af29ee2e1572f8668dd0152a14d7f9796a530
++R 838bbc74cdb0ef42bd304761cfe55c8f
 +U drh
- Z dd56ec9b94b111ff7da0d679d65274c2
++Z cee568528af628e5a352dc111e7dd8d1
diff --cc manifest.uuid
index 58f23ec91d,4b4096b4e8..14406b3890
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- e5d9371da92b4cc2c1df177cf40e0ced4d4c7421
 -087af29ee2e1572f8668dd0152a14d7f9796a530
++c6ac80ed8d5240dd30783d62d9f133e159809dec