From: drh <drh@noemail.net>
Date: Wed, 8 May 2013 16:57:48 +0000 (+0000)
Subject: Make sure the ORDER BY collating sequences are compatible with the
X-Git-Tag: version-3.7.17~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e6f450177b77e27e1a9228ca43afdf1bcc538290;p=thirdparty%2Fsqlite.git

Make sure the ORDER BY collating sequences are compatible with the
comparison collations before using the merge algorithm for compound
SELECT statements.  Fix for ticket [6709574d2a8d8].

FossilOrigin-Name: ce853a75068073d6acc8bec0819505a22c4c7e69
---

e6f450177b77e27e1a9228ca43afdf1bcc538290
diff --cc manifest
index 664b5cf818,404651e365..71317e9b94
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Fix\sthe\swholenumber\svirtual\stable\sso\sthat\sit\sreturns\shigher\scosts\sfor\nunconstrained\susage.\s\sCherrypick\sfrom\s[ceff8955020cd13].
- D 2013-05-08T14:20:28.350
 -C Make\ssure\sthe\sORDER\sBY\scollating\ssequences\sare\scompatible\swith\sthe\ncomparison\scollations\sbefore\susing\sthe\smerge\salgorithm\sfor\scompound\nSELECT\sstatements.\s\sCandidate\sfix\sfor\sticket\s[6709574d2a8d8].
 -D 2013-05-07T17:49:08.546
++C Make\ssure\sthe\sORDER\sBY\scollating\ssequences\sare\scompatible\swith\sthe\ncomparison\scollations\sbefore\susing\sthe\smerge\salgorithm\sfor\scompound\s\nSELECT\sstatements.\s\sFix\sfor\sticket\s[6709574d2a8d8].
++D 2013-05-08T16:57:48.917
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in ce81671efd6223d19d4c8c6b88ac2c4134427111
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -1061,8 -1062,10 +1062,7 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
  F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
--P 0ba67b64de258883e4c43db09e131bb67083855e
- Q +ceff8955020cd1314bf1ab0af7d075fe2c0863e5
- R 3c92370100000406d8695d9d00d3c30f
 -R 298d9b4b04cefe916bd24254e1442751
 -T *branch * tkt-6709574
 -T *sym-tkt-6709574 *
 -T -sym-trunk *
++P 7227b61512a534645c73883c2e37b4e647592e5d fc3630cdef6e2cdbfb4e7b373d1a094753e55016
++R dcccb23e4f316b16da66bbbbad7a9346
  U drh
- Z 3250570cd81603159ecf8b6de54c9572
 -Z 52d856a3284951cf8623e01987d271c7
++Z 6134f15a41242cbabed6e0256cc06784
diff --cc manifest.uuid
index a9e3d58d46,2528c2de9e..f381b2208e
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 7227b61512a534645c73883c2e37b4e647592e5d
 -fc3630cdef6e2cdbfb4e7b373d1a094753e55016
++ce853a75068073d6acc8bec0819505a22c4c7e69