Fix a problem with resolving ORDER BY clauses that feature COLLATE clauses attached...

FossilOrigin-Name: edc1de2a588fd50c0049bb2be76d3f6783443165

diff --cc manifest
index 31dda707605a439b005b612b8e78cc756456f499,ad90ce9662e8e4673a50a18aff59c6a0d0924fc2..762233f67693f44c867d04c15377d89c552a6fdf
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Disable\sthe\sSQLITE_FCNTL_WAL_BLOCK\sfeature\sfor\snow.\s\sIt\sneeds\smore\swork\sand\nis\snot\syet\sready\sfor\srelease.
- D 2015-04-03T20:33:33.240
+ C Fix\sa\sproblem\swith\sresolving\sORDER\sBY\sclauses\sthat\sfeature\sCOLLATE\sclauses\sattached\sto\scompound\sSELECT\sstatements.
 -D 2015-04-04T16:43:16.254
++D 2015-04-04T16:49:04.697
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1249,7 -1249,10 +1249,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 6868cc66d2be67b7f03776c982962ffa4b30de11
- R f821ca69e41f19033ce555eacc91c4ed
- U drh
- Z 7ec9ecc18bf834ba571fcbb8e1e49df1
 -P 4ae9a3acc4eeeb7998769eb856c97c2233476f72
++P 4ae9a3acc4eeeb7998769eb856c97c2233476f72 427b50fba7362e5b447e79d39050f25ed2ef10af
+ R 0a683c8bd67cbd2be5ea29e95266b636
 -T *branch * compound-order-by-fix
 -T *sym-compound-order-by-fix *
 -T -sym-trunk *
+ U dan
 -Z 235b3663512a162fe4fda68eec524b54
++Z c9ac74415bdb7893d918eacf5a95862c

diff --cc manifest.uuid
index 174ac4daaf94bc45d138d6cbeb9b5bd56f3bba7c,dcc45e29184399f8cbf371fa256684932025564c..ff36ec293f64947148a4772e5ba61f67010a840e
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4ae9a3acc4eeeb7998769eb856c97c2233476f72
 -427b50fba7362e5b447e79d39050f25ed2ef10af
++edc1de2a588fd50c0049bb2be76d3f6783443165