Update this branch with the latest changes from sorter-opt.

FossilOrigin-Name: 08c0b19b89ea62d40c85bab64d9c80e02eaa8d5d

diff --cc manifest
index 896a9a9a0a7780dd23803d919263d308175fbb28,bd566ce541a5052b897f8c37275ac6bb6f69bee6..4a301e6f42b25794960c5a73ee8f087fd12fa1ff
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,9 -1,9 +1,9 @@@
- C Merge\ssorter\soptimizations\swith\sthis\sbranch.
- D 2015-03-30T15:45:45.183
 -C Update\sthis\sbranch\swith\slatest\strunk\schanges.
 -D 2015-04-10T08:20:42.809
++C Update\sthis\sbranch\swith\sthe\slatest\schanges\sfrom\ssorter-opt.
++D 2015-04-10T08:28:24.183
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
- F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
+ F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
- F Makefile.msc 3481e2dd260968742c715542db178c2bdd5db99f
+ F Makefile.msc fa6a6de11af800d89f86e8a4266fd40a46008347
  F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
  F README.md d58e3bebc0a4145e0f2a87994015fdb575a8e866
  F VERSION 319eb1ced4b4d17a67730f2b7b85f15c1346cb60
@@@ -190,7 -190,7 +190,7 @@@ F src/global.c 4f77cadbc5427d00139ba43d
  F src/hash.c 4263fbc955f26c2e8cdc0cf214bc42435aa4e4f5
  F src/hash.h c8f3c31722cf3277d03713909761e152a5b81094
  F src/hwtime.h d32741c8f4df852c7d959236615444e2b1063b08
- F src/insert.c 9f92c04e9bc6056ffd6129767749f2f16d5cd309
 -F src/insert.c 1cc9dc4e939b5dd4a74ac4a3222b89e66b074210
++F src/insert.c 5be66348c733c6f6cf9281aa99a6d49de3fc1897
  F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
  F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
  F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
@@@ -235,7 -235,7 +235,7 @@@ F src/shell.c 84a1593bd86aaa14f4da8a8f9
  F src/sqlite.h.in 278602140d49575e8708e643161f4263e428a02a
  F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
  F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
- F src/sqliteInt.h c622684344dd0f008ba5198342426aacec36d9f2
 -F src/sqliteInt.h 90b7bfd89d7307cd0750663da419ba4bb81e7379
++F src/sqliteInt.h 6ee18690cb02494d7aa381584102701ec783fc5d
  F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
  F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
  F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@@ -288,12 -288,12 +288,12 @@@ F src/test_vfstrace.c bab9594adc976cbe6
  F src/test_wsd.c 41cadfd9d97fe8e3e4e44f61a4a8ccd6f7ca8fe9
  F src/threads.c 6bbcc9fe50c917864d48287b4792d46d6e873481
  F src/tokenize.c a8d270b06e5f709930f7b67cf70a847969cb5bf3
- F src/trigger.c 25571661fdeae8c7f975ff40ffec205520a3f92f
+ F src/trigger.c 69a91bed7c94e46223e37ffccfeeb35e34b999ac
 -F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 +F src/update.c 250cefb96cfc7ca8f86f92ecf6b6b6c7e289daf7
  F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
  F src/util.c 98a7627ca48ad3265b6940915a1d08355eb3fc7e
- F src/vacuum.c 9460b9de7b2d4e34b0d374894aa6c8a0632be8ec
- F src/vdbe.c 5cb31321523c4723a70f965c996feedf89e24c1f
+ F src/vacuum.c 2ddd5cad2a7b9cef7f9e431b8c7771634c6b1701
 -F src/vdbe.c f6647e7426b70826a03e69bd295d18c93ff5ae07
++F src/vdbe.c 3c28266d50807ab9194874392dccb8f78d2078b4
  F src/vdbe.h 7e538ecf47dccb307ea2d087c3ddc2dd8d70e79d
  F src/vdbeInt.h 9cbaa84f53ddd2d09a0cf61a94337a3a035d08a0
  F src/vdbeapi.c 583d56b129dd27f12bed518270de9ebe521e6a75
@@@ -482,9 -483,9 +483,9 @@@ F test/e_select2.test aceb80ab927d46fba
  F test/e_totalchanges.test b12ee5809d3e63aeb83238dd501a7bca7fd72c10
  F test/e_update.test 312cb8f5ccfe41515a6bb092f8ea562a9bd54d52
  F test/e_uri.test 5ae33760fb2039c61aa2d90886f1664664173585
 -F test/e_vacuum.test 5bfbdc21b65c0abf24398d0ba31dc88d93ca77a9
 +F test/e_vacuum.test a83cbb0b1f52cfda735909609f9f6422d1655bc3
  F test/e_wal.test ae9a593207a77d711443ee69ffe081fda9243625
- F test/e_walauto.test ca70cf75c07a6cb1874ced101dd426da76625649
+ F test/e_walauto.test 6544af03423abc61b53cfb976839385ddc2a0a70
  F test/e_walckpt.test 65e29b6631e51f210f83e4ff11571e647ba93608
  F test/e_walhook.test da3ea8b3483d1af72190337bda50155a91a4b664
  F test/enc.test e54531cd6bf941ee6760be041dff19a104c7acea
@@@ -1248,7 -1250,7 +1251,7 @@@ F tool/vdbe_profile.tcl 67746953071a9f8
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P aeb8e9a9f2092fda0c3e051f135e1d65cf77ff13 601e7b6b8e6bfabda03b70f75094c9014e3a3c49
- R ecee2ba850684cc6832777f6c1e18b7d
 -P 80a00539506c95443165a781d1d869205057ca6c 0a72726da21581ab16cb3e964bd825b8f2e931e4
 -R 0ddadab44a50ca2385f4faee2452bd2a
++P 9bf1cfb4d99328bb95567330fdae76518f6386e2 60be9c1c1ad0d8250a99cadda820dff40a31c94e
++R 172efa9ba854731d65055b3485ef57e0
  U dan
- Z 755e374c8f5315221aeb3673026dbb0a
 -Z 2d4c23b7be7026ef7423fe176f4067b9
++Z a9138cfc25929a66b1eec293ef992a21

diff --cc manifest.uuid
index e0f7a9103da91bf2bcb6bff94f5a69cba4aebac2,fc8d4fdf741494af0bd3276d0355dcd9bece11d9..b839b48e9e6df8871832152732be4d16c4997e78
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 9bf1cfb4d99328bb95567330fdae76518f6386e2
 -60be9c1c1ad0d8250a99cadda820dff40a31c94e
++08c0b19b89ea62d40c85bab64d9c80e02eaa8d5d

diff --cc src/insert.c
Simple merge

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/vdbe.c
Simple merge