Merge changes from trunk.

FossilOrigin-Name: 06f432fb7c979f1bb7f01f5c90716ce5c0248f73f70b78a9870b9de5c9bf7ef4

diff --cc manifest
index c63192e1bf123968ca52d8dd7f8efb6fd133a187,f377f6008f1d46f91c4f4a8f46ace7d59592b37f..839e47c4527b311dbd8fded6c4a3e94f655cc157
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Do\snot\sflatten\ssubqueries\sthat\scontain\san\sORDER\sBY\sor\sGROUP\sBY\sclause\sand\ncan\sbe\simplemented\susing\sa\sco-routine.
- D 2017-09-28T20:06:53.014
 -C Make\ssure\sthe\s6th\sparameter\sto\sthe\sauthorizer\scallback\sfor\sview\ssubqueries\nhas\sthe\scorrect\sview\sname.
 -D 2017-09-29T12:44:52.580
++C Merge\schanges\sfrom\strunk.
++D 2017-09-29T14:31:16.862
  F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
  F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@@ -458,7 -458,7 +458,7 @@@ F src/printf.c 40aee47ae9be4bd3dbdc8968
  F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
  F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
  F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
- F src/select.c d38163a76a0da425afd4a43f5dd0dc88fdbe0aa258c45f6a9cb44acf0a606bc5
 -F src/select.c 61f6ee59115ddba550504296587571fc82acc2a8f178a5cd172c7fff13f83685
++F src/select.c 117cbceca91e71956092afe064a32de6f8b73096c669a250a673bb5b9bed4c77
  F src/shell.c c1206a23d9239f8f51751d3be9b8c3b02fa4103546bea1add7f864d84a8276ab
  F src/shell.c.in bb9720a8c5c98d3984b16ab7540e7142bcae959666ecf248bfc523a1d44220ee
  F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
@@@ -1655,10 -1655,7 +1655,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 ff2f5a31a2ac67a2fdbb25793e8013cb0e062ab90bdcba2d52a62d6d4d8b6d18
- R 2327508642786ef6d3dd975eaebc22c4
- T *branch * prefer-coroutine-sort-subquery
- T *sym-prefer-coroutine-sort-subquery *
- T -sym-trunk *
 -P 04ef40a8fea88776e0d8b73d942922d45d0c038fbfac1a9a82b9322181b4ad92
 -R 366bed71d0ebda5b55c786e6b191d9a3
++P 042d655dd9002e8b89a798ad955b0285891aecf79f6978c5312e70ffe0609a46 2a45bbc9fd1c64f1c4c4dac38f063cd67480fcb6da24bf93fdefbfca66fd81ab
++R 635e2ef6a6d5adad412e10e82845888b
  U drh
- Z 34c1093fc7e9ecc2e1ce3f4d0b9d734a
 -Z 1e56973e5f1cf4ced8af06a37f0fc40f
++Z 2ad1dca5cd127635056074671b5ec8b9

diff --cc manifest.uuid
index 61c790dd191edb2d56fc10a82e827307faa13f16,448bac01f933026983532a51988a44a22393aba2..b63e737bcd8b38c74c50b4f3d86f79850fb56638
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 042d655dd9002e8b89a798ad955b0285891aecf79f6978c5312e70ffe0609a46
 -2a45bbc9fd1c64f1c4c4dac38f063cd67480fcb6da24bf93fdefbfca66fd81ab
++06f432fb7c979f1bb7f01f5c90716ce5c0248f73f70b78a9870b9de5c9bf7ef4

diff --cc src/select.c
Simple merge