Merge latest changes from trunk. Including the "ORDER BY ... LIMIT" optimization.

FossilOrigin-Name: 83a4c9f0885768ed3cbe556aed9f4709a1d7a1cd52f2e3632ade28091febee47

diff --cc manifest
index 4a7ae26b7bb01ac1664ba6a54e3af16eaa853423,78138b0dbfcbf092e0c7e0449efa3d282841dacc..0207c2a8913d998a68a21a55e54ad323d03da7e0
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Update\sthis\sbranch\swith\slatest\schanges\sfrom\strunk.
- D 2018-04-24T19:22:49.264
 -C Merge\slatest\schanges\sfrom\strunk.\sIncluding\sthe\s"ORDER\sBY\s...\sLIMIT"\noptimization.
 -D 2018-04-26T17:54:11.487
++C Merge\slatest\schanges\sfrom\strunk.\sIncluding\sthe\s"ORDER\sBY\s...\sLIMIT"\soptimization.
++D 2018-04-26T18:01:48.281
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F Makefile.in 5ce9343cba9c189046f1afe6d2bcc1f68079439febc05267b98aec6ecc752439
@@@ -436,11 -436,11 +436,11 @@@ F src/attach.c 4a3138bd771d5426ae4344d8
  F src/auth.c 6277d63837357549fe14e723490d6dc1a38768d71c795c5eb5c0f8a99f918f73
  F src/backup.c faf17e60b43233c214aae6a8179d24503a61e83b
  F src/bitvec.c 8433d9e98dd6f2ea3286e0d2fe5d65de1bfc18a706486eb2026b01be066b5806
- F src/btmutex.c 0e9ce2d56159b89b9bc8e197e023ee11e39ff8ca
+ F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
 -F src/btree.c a64d302f0fa956af74d2a74538d206c3c854bdb9c6d53b92825b774e8465bcb6
 +F src/btree.c d74175078416a6c64f88f647fc624461a27aa7b7cae375ee5c6e8762af9ead8d
  F src/btree.h 0cd745755efd1f3df4c70544c54253920ea32fe6b179b97e9daeb786ba0de4ba
  F src/btreeInt.h 6c65e6c96f561596f6870c79a64d4706af81613881d7947e3f063e923f14115f
- F src/build.c 1a27e1f4ba613d6cc97ef90fce4da81f843190b4930cd48584a2a8b51cf73f56
+ F src/build.c 1ef8945748702f0069521bafe33df41647bea777fd2353c73530d522a9fedaf8
  F src/callback.c fe677cb5f5abb02f7a772a62a98c2f516426081df68856e8f2d5f950929b966a
  F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
  F src/ctime.c 849d4cebe008cfc6e4799b034a172b4eaf8856b100739632a852732ba66eee48
@@@ -490,18 -490,18 +490,18 @@@ F src/pcache.c 135ef0bc6fb2e3b7178d49ab
  F src/pcache.h 072f94d29281cffd99e46c1539849f248c4b56ae7684c1f36626797fee375170
  F src/pcache1.c 716975564c15eb6679e97f734cec1bfd6c16ac3d4010f05f1f8e509fc7d19880
  F src/pragma.c bea56df3ae0637768c0da4fbbb8f2492f780980d95000034a105ff291bf7ca69
 -F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324
 +F src/pragma.h ce41efb7d4cdafca499839f29014d9b1d9534c8f503eeceb88310920c62d6097
- F src/prepare.c b086fea6a1952db88beca31fdd621201ee5e4ce3f02905248cc3035a8174aa89
+ F src/prepare.c d16cb8a553c09bc0c46c33f8e0add77c8f755cfb4681ca5101aaff3a04df9625
  F src/printf.c d3b7844ddeb11fbbdd38dd84d09c9c1ac171d21fb038473c3aa97981201cc660
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 6415381a0e9d22c0e7cba33ca4a53f81474190862f5d4838190f5eb5b0b47bc9
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c 3dbce4379836189acbc5719f40125f3d1e0dbaee024ec4550ab449744a8cb074
- F src/shell.c.in fc3f9e47198c6baea6987b6ec86fb99e7c79cee8109ce9bdece790345d8c246f
- F src/sqlite.h.in 327e096f7851806f10450853d3896864fb06b48794d00c93cc7194d5ade68ff6
+ F src/select.c daf07d8defce3311f9e69f1280a874d78bc1d16c305f6aa689640f7afa02842f
+ F src/shell.c.in d63f06c870ec1761ea98bd1cae651ff0ea6beadf8be892105dabd913f94cb3da
+ F src/sqlite.h.in 4ef0c79b0740f6335af2e355a28241b19c0ca2fe2d95dba379aae3cb77dcd789
  F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
  F src/sqlite3ext.h 83a3c4ce93d650bedfd1aa558cb85a516bd6d094445ee989740827d0d944368d
- F src/sqliteInt.h 717add42a8dde245c6dba6d21fb7a76e82ed77718959322621cbadca3e6ceb57
 -F src/sqliteInt.h 2947156d68fff632397c4d4b23e716e1b420493479a1642425e7f13241951cdf
++F src/sqliteInt.h 288351b650168c06cb83e4ffdf562ee8dbd34d7ba825858684a5b19c15b906f6
  F src/sqliteLimit.h 1513bfb7b20378aa0041e7022d04acb73525de35b80b252f1b83fedb4de6a76b
  F src/status.c 46e7aec11f79dad50965a5ca5fa9de009f7d6bde08be2156f1538a0a296d4d0e
  F src/table.c b46ad567748f24a326d9de40e5b9659f96ffff34
@@@ -561,7 -561,7 +561,7 @@@ F src/threads.c 4ae07fa022a3dc7c5beb373
  F src/tokenize.c bbde32eac9eb1280f5292bcdfef66f5a57e43176cbf9347e0efab9f75e133f97
  F src/treeview.c 6cea286ca9af8b126dae9714799265353387244eba0d451c3cc2cd60946cc4c7
  F src/trigger.c 4ace6d1d5ba9a89822deb287317f33c810440526eafe185c2d8a48c31df1e995
- F src/update.c cedbdad8ed5e0f5fdd73d764730e88f882472509b02d6805299bda083c2d661f
 -F src/update.c 75ac1102d791d999ca918d7b3dced4b3023fb0ed1167a4b11591c5bc3cfbb439
++F src/update.c d46f8fb3782dc736c8f2c8b482443b22db1e6a764c8f6a5148a280cd05696d14
  F src/upsert.c ae4a4823b45c4daf87e8aea8c0f582a8844763271f5ed54ee5956c4c612734f4
  F src/utf.c 810fbfebe12359f10bc2a011520a6e10879ab2a163bcb26c74768eab82ea62a5
  F src/util.c d9eb0a6c4aae1b00a7369eadd7ca0bbe946cb4c953b6751aa20d357c2f482157
@@@ -1738,7 -1736,7 +1738,7 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 257900494f9aac7e4181b65d0eddc9cf2e9a52dc794ad68284f085d1c402addb b27bd799ea66748b89223044c536813d56d0aa513f077499cbf8ed9c974d7b01
- R 4e3d451896b0cca9a152e6aceae9fbeb
 -P b27bd799ea66748b89223044c536813d56d0aa513f077499cbf8ed9c974d7b01 0fcfc36ceb820fc70136b799a0405fe92e50646e697be2872bbe9a53a05ed5a9
 -R aacb8135e5d5d61c420d0eb994490898
++P 2d8d13e4a169cbfa957c4e978b559817a13927a85e30fe275129bf7e3fb54920 d8ae7ba083551f05b963f13c5164ff60257c7b615cd48d675027cb6289b463da
++R 42476a3caaafeb45304ac96159327603
  U dan
- Z 98df4f03e922e4971f92ee91a1c1e0e3
 -Z 0c0899207e7f0c3c73b0ec6107e8e193
++Z 6c1b4b7be03880c9c440ac5364d59059

diff --cc manifest.uuid
index 24b44c487d768a448a570bb6d44712267bc44da4,9dcfb8e644a0ea4fca6690a994b06dea3cbb310b..8a642e4feba7e369cf4a4db2fd38d632b93afc1f
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 2d8d13e4a169cbfa957c4e978b559817a13927a85e30fe275129bf7e3fb54920
 -d8ae7ba083551f05b963f13c5164ff60257c7b615cd48d675027cb6289b463da
++83a4c9f0885768ed3cbe556aed9f4709a1d7a1cd52f2e3632ade28091febee47

diff --cc src/sqliteInt.h
Simple merge

diff --cc src/update.c
Simple merge