From: dan <dan@noemail.net>
Date: Sat, 4 Apr 2015 16:49:04 +0000 (+0000)
Subject: Fix a problem with resolving ORDER BY clauses that feature COLLATE clauses attached... 
X-Git-Tag: version-3.8.9~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf860700e5b3643f9088990c0f5c46353aa8808d;p=thirdparty%2Fsqlite.git

Fix a problem with resolving ORDER BY clauses that feature COLLATE clauses attached to compound SELECT statements.

FossilOrigin-Name: edc1de2a588fd50c0049bb2be76d3f6783443165
---

cf860700e5b3643f9088990c0f5c46353aa8808d
diff --cc manifest
index 31dda70760,ad90ce9662..762233f676
--- a/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 174ac4daaf,dcc45e2918..ff36ec293f
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 4ae9a3acc4eeeb7998769eb856c97c2233476f72
 -427b50fba7362e5b447e79d39050f25ed2ef10af
++edc1de2a588fd50c0049bb2be76d3f6783443165