Rows order has been made more explicit

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

2 files changed, 257 insertions, 257 deletions

diff --git a/mysql-test/r/ctype_many.result b/mysql-test/r/ctype_many.result
index b6c0f25853d..7a09c008309 100644
--- a/mysql-test/r/ctype_many.result
+++ b/mysql-test/r/ctype_many.result
@@ -753,485 +753,485 @@ a
 a
 SELECT t11.comment,t12.comment 
 FROM t1 t11,t1 t12 WHERE CONVERT(t11.koi8_ru_f USING utf8)=t12.utf8_f
-ORDER BY t11.koi8_ru_f;
+ORDER BY t11.koi8_ru_f,t11.comment,t12.comment;
 comment	comment
-LAT SMALL A	LAT SMALL A
-LAT SMALL A	LAT CAPIT A
-LAT CAPIT A	LAT SMALL A
 LAT CAPIT A	LAT CAPIT A
-LAT SMALL B	LAT CAPIT B
-LAT CAPIT B	LAT SMALL B
+LAT CAPIT A	LAT SMALL A
+LAT SMALL A	LAT CAPIT A
+LAT SMALL A	LAT SMALL A
 LAT CAPIT B	LAT CAPIT B
+LAT CAPIT B	LAT SMALL B
+LAT SMALL B	LAT CAPIT B
 LAT SMALL B	LAT SMALL B
-LAT CAPIT C	LAT SMALL C
 LAT CAPIT C	LAT CAPIT C
-LAT SMALL C	LAT SMALL C
+LAT CAPIT C	LAT SMALL C
 LAT SMALL C	LAT CAPIT C
+LAT SMALL C	LAT SMALL C
 LAT CAPIT D	LAT CAPIT D
-LAT SMALL D	LAT SMALL D
-LAT SMALL D	LAT CAPIT D
 LAT CAPIT D	LAT SMALL D
-LAT SMALL E	LAT SMALL E
-LAT SMALL E	LAT CAPIT E
-LAT CAPIT E	LAT SMALL E
+LAT SMALL D	LAT CAPIT D
+LAT SMALL D	LAT SMALL D
 LAT CAPIT E	LAT CAPIT E
-LAT SMALL F	LAT SMALL F
-LAT SMALL F	LAT CAPIT F
-LAT CAPIT F	LAT SMALL F
+LAT CAPIT E	LAT SMALL E
+LAT SMALL E	LAT CAPIT E
+LAT SMALL E	LAT SMALL E
 LAT CAPIT F	LAT CAPIT F
-LAT SMALL G	LAT CAPIT G
-LAT CAPIT G	LAT SMALL G
+LAT CAPIT F	LAT SMALL F
+LAT SMALL F	LAT CAPIT F
+LAT SMALL F	LAT SMALL F
 LAT CAPIT G	LAT CAPIT G
+LAT CAPIT G	LAT SMALL G
+LAT SMALL G	LAT CAPIT G
 LAT SMALL G	LAT SMALL G
 LAT CAPIT H	LAT CAPIT H
-LAT SMALL H	LAT SMALL H
-LAT SMALL H	LAT CAPIT H
 LAT CAPIT H	LAT SMALL H
+LAT SMALL H	LAT CAPIT H
+LAT SMALL H	LAT SMALL H
 LAT CAPIT I	LAT CAPIT I
-LAT SMALL I	LAT SMALL I
-LAT SMALL I	LAT CAPIT I
 LAT CAPIT I	LAT SMALL I
-LAT SMALL J	LAT SMALL J
-LAT SMALL J	LAT CAPIT J
-LAT CAPIT J	LAT SMALL J
+LAT SMALL I	LAT CAPIT I
+LAT SMALL I	LAT SMALL I
 LAT CAPIT J	LAT CAPIT J
-LAT SMALL K	LAT CAPIT K
-LAT CAPIT K	LAT SMALL K
+LAT CAPIT J	LAT SMALL J
+LAT SMALL J	LAT CAPIT J
+LAT SMALL J	LAT SMALL J
 LAT CAPIT K	LAT CAPIT K
+LAT CAPIT K	LAT SMALL K
+LAT SMALL K	LAT CAPIT K
 LAT SMALL K	LAT SMALL K
-LAT SMALL L	LAT CAPIT L
-LAT CAPIT L	LAT SMALL L
 LAT CAPIT L	LAT CAPIT L
+LAT CAPIT L	LAT SMALL L
+LAT SMALL L	LAT CAPIT L
 LAT SMALL L	LAT SMALL L
 LAT CAPIT M	LAT CAPIT M
-LAT SMALL M	LAT SMALL M
-LAT SMALL M	LAT CAPIT M
 LAT CAPIT M	LAT SMALL M
-LAT SMALL N	LAT SMALL N
-LAT SMALL N	LAT CAPIT N
-LAT CAPIT N	LAT SMALL N
+LAT SMALL M	LAT CAPIT M
+LAT SMALL M	LAT SMALL M
 LAT CAPIT N	LAT CAPIT N
-LAT SMALL O	LAT SMALL O
-LAT SMALL O	LAT CAPIT O
-LAT CAPIT O	LAT SMALL O
+LAT CAPIT N	LAT SMALL N
+LAT SMALL N	LAT CAPIT N
+LAT SMALL N	LAT SMALL N
 LAT CAPIT O	LAT CAPIT O
-LAT SMALL P	LAT CAPIT P
-LAT CAPIT P	LAT SMALL P
+LAT CAPIT O	LAT SMALL O
+LAT SMALL O	LAT CAPIT O
+LAT SMALL O	LAT SMALL O
 LAT CAPIT P	LAT CAPIT P
+LAT CAPIT P	LAT SMALL P
+LAT SMALL P	LAT CAPIT P
 LAT SMALL P	LAT SMALL P
-LAT CAPIT Q	LAT SMALL Q
 LAT CAPIT Q	LAT CAPIT Q
-LAT SMALL Q	LAT SMALL Q
+LAT CAPIT Q	LAT SMALL Q
 LAT SMALL Q	LAT CAPIT Q
+LAT SMALL Q	LAT SMALL Q
 LAT CAPIT R	LAT CAPIT R
-LAT SMALL R	LAT SMALL R
-LAT SMALL R	LAT CAPIT R
 LAT CAPIT R	LAT SMALL R
-LAT SMALL S	LAT SMALL S
-LAT SMALL S	LAT CAPIT S
-LAT CAPIT S	LAT SMALL S
+LAT SMALL R	LAT CAPIT R
+LAT SMALL R	LAT SMALL R
 LAT CAPIT S	LAT CAPIT S
-LAT SMALL T	LAT CAPIT T
-LAT CAPIT T	LAT SMALL T
+LAT CAPIT S	LAT SMALL S
+LAT SMALL S	LAT CAPIT S
+LAT SMALL S	LAT SMALL S
 LAT CAPIT T	LAT CAPIT T
+LAT CAPIT T	LAT SMALL T
+LAT SMALL T	LAT CAPIT T
 LAT SMALL T	LAT SMALL T
-LAT SMALL U	LAT CAPIT U
-LAT CAPIT U	LAT SMALL U
 LAT CAPIT U	LAT CAPIT U
+LAT CAPIT U	LAT SMALL U
+LAT SMALL U	LAT CAPIT U
 LAT SMALL U	LAT SMALL U
 LAT CAPIT V	LAT CAPIT V
-LAT SMALL V	LAT SMALL V
-LAT SMALL V	LAT CAPIT V
 LAT CAPIT V	LAT SMALL V
+LAT SMALL V	LAT CAPIT V
+LAT SMALL V	LAT SMALL V
 LAT CAPIT W	LAT CAPIT W
-LAT SMALL W	LAT SMALL W
-LAT SMALL W	LAT CAPIT W
 LAT CAPIT W	LAT SMALL W
-LAT SMALL X	LAT SMALL X
-LAT SMALL X	LAT CAPIT X
-LAT CAPIT X	LAT SMALL X
+LAT SMALL W	LAT CAPIT W
+LAT SMALL W	LAT SMALL W
 LAT CAPIT X	LAT CAPIT X
-LAT SMALL Y	LAT CAPIT Y
-LAT CAPIT Y	LAT SMALL Y
+LAT CAPIT X	LAT SMALL X
+LAT SMALL X	LAT CAPIT X
+LAT SMALL X	LAT SMALL X
 LAT CAPIT Y	LAT CAPIT Y
+LAT CAPIT Y	LAT SMALL Y
+LAT SMALL Y	LAT CAPIT Y
 LAT SMALL Y	LAT SMALL Y
-LAT CAPIT Z	LAT SMALL Z
 LAT CAPIT Z	LAT CAPIT Z
-LAT SMALL Z	LAT SMALL Z
+LAT CAPIT Z	LAT SMALL Z
 LAT SMALL Z	LAT CAPIT Z
+LAT SMALL Z	LAT SMALL Z
+CYR CAPIT A	CYR CAPIT A
 CYR CAPIT A	CYR SMALL A
 CYR SMALL A	CYR CAPIT A
-CYR CAPIT A	CYR CAPIT A
 CYR SMALL A	CYR SMALL A
-CYR SMALL BE	CYR CAPIT BE
 CYR CAPIT BE	CYR CAPIT BE
-CYR SMALL BE	CYR SMALL BE
 CYR CAPIT BE	CYR SMALL BE
+CYR SMALL BE	CYR CAPIT BE
+CYR SMALL BE	CYR SMALL BE
 CYR CAPIT VE	CYR CAPIT VE
-CYR SMALL VE	CYR SMALL VE
 CYR CAPIT VE	CYR SMALL VE
 CYR SMALL VE	CYR CAPIT VE
+CYR SMALL VE	CYR SMALL VE
 CYR CAPIT GE	CYR CAPIT GE
-CYR SMALL GE	CYR SMALL GE
 CYR CAPIT GE	CYR SMALL GE
 CYR SMALL GE	CYR CAPIT GE
+CYR SMALL GE	CYR SMALL GE
+CYR CAPIT DE	CYR CAPIT DE
 CYR CAPIT DE	CYR SMALL DE
 CYR SMALL DE	CYR CAPIT DE
-CYR CAPIT DE	CYR CAPIT DE
 CYR SMALL DE	CYR SMALL DE
-CYR SMALL IE	CYR SMALL IO
-CYR SMALL IE	CYR CAPIT IE
-CYR CAPIT IE	CYR SMALL IE
+CYR CAPIT IE	CYR CAPIT IE
 CYR CAPIT IE	CYR CAPIT IO
-CYR SMALL IE	CYR SMALL IE
-CYR SMALL IE	CYR CAPIT IO
+CYR CAPIT IE	CYR SMALL IE
 CYR CAPIT IE	CYR SMALL IO
-CYR CAPIT IE	CYR CAPIT IE
-CYR SMALL IO	CYR SMALL IE
-CYR SMALL IO	CYR CAPIT IO
-CYR CAPIT IO	CYR SMALL IO
+CYR SMALL IE	CYR CAPIT IE
+CYR SMALL IE	CYR CAPIT IO
+CYR SMALL IE	CYR SMALL IE
+CYR SMALL IE	CYR SMALL IO
 CYR CAPIT IO	CYR CAPIT IE
-CYR SMALL IO	CYR SMALL IO
-CYR SMALL IO	CYR CAPIT IE
-CYR CAPIT IO	CYR SMALL IE
 CYR CAPIT IO	CYR CAPIT IO
+CYR CAPIT IO	CYR SMALL IE
+CYR CAPIT IO	CYR SMALL IO
+CYR SMALL IO	CYR CAPIT IE
+CYR SMALL IO	CYR CAPIT IO
+CYR SMALL IO	CYR SMALL IE
+CYR SMALL IO	CYR SMALL IO
+CYR CAPIT ZHE	CYR CAPIT ZHE
 CYR CAPIT ZHE	CYR SMALL ZHE
 CYR SMALL ZHE	CYR CAPIT ZHE
-CYR CAPIT ZHE	CYR CAPIT ZHE
 CYR SMALL ZHE	CYR SMALL ZHE
-CYR SMALL ZE	CYR CAPIT ZE
 CYR CAPIT ZE	CYR CAPIT ZE
-CYR SMALL ZE	CYR SMALL ZE
 CYR CAPIT ZE	CYR SMALL ZE
+CYR SMALL ZE	CYR CAPIT ZE
+CYR SMALL ZE	CYR SMALL ZE
 CYR CAPIT I	CYR CAPIT I
-CYR SMALL I	CYR SMALL I
 CYR CAPIT I	CYR SMALL I
 CYR SMALL I	CYR CAPIT I
+CYR SMALL I	CYR SMALL I
 CYR CAPIT KA	CYR CAPIT KA
-CYR SMALL KA	CYR SMALL KA
 CYR CAPIT KA	CYR SMALL KA
 CYR SMALL KA	CYR CAPIT KA
+CYR SMALL KA	CYR SMALL KA
+CYR CAPIT EL	CYR CAPIT EL
 CYR CAPIT EL	CYR SMALL EL
 CYR SMALL EL	CYR CAPIT EL
-CYR CAPIT EL	CYR CAPIT EL
 CYR SMALL EL	CYR SMALL EL
+CYR CAPIT EM	CYR CAPIT EM
 CYR CAPIT EM	CYR SMALL EM
 CYR SMALL EM	CYR CAPIT EM
-CYR CAPIT EM	CYR CAPIT EM
 CYR SMALL EM	CYR SMALL EM
-CYR SMALL EN	CYR CAPIT EN
 CYR CAPIT EN	CYR CAPIT EN
-CYR SMALL EN	CYR SMALL EN
 CYR CAPIT EN	CYR SMALL EN
+CYR SMALL EN	CYR CAPIT EN
+CYR SMALL EN	CYR SMALL EN
 CYR CAPIT O	CYR CAPIT O
-CYR SMALL O	CYR SMALL O
 CYR CAPIT O	CYR SMALL O
 CYR SMALL O	CYR CAPIT O
-CYR SMALL PE	CYR SMALL PE
+CYR SMALL O	CYR SMALL O
+CYR CAPIT PE	CYR CAPIT PE
 CYR CAPIT PE	CYR SMALL PE
 CYR SMALL PE	CYR CAPIT PE
-CYR CAPIT PE	CYR CAPIT PE
+CYR SMALL PE	CYR SMALL PE
+CYR CAPIT ER	CYR CAPIT ER
 CYR CAPIT ER	CYR SMALL ER
 CYR SMALL ER	CYR CAPIT ER
-CYR CAPIT ER	CYR CAPIT ER
 CYR SMALL ER	CYR SMALL ER
-CYR SMALL ES	CYR CAPIT ES
 CYR CAPIT ES	CYR CAPIT ES
-CYR SMALL ES	CYR SMALL ES
 CYR CAPIT ES	CYR SMALL ES
+CYR SMALL ES	CYR CAPIT ES
+CYR SMALL ES	CYR SMALL ES
 CYR CAPIT TE	CYR CAPIT TE
-CYR SMALL TE	CYR SMALL TE
 CYR CAPIT TE	CYR SMALL TE
 CYR SMALL TE	CYR CAPIT TE
+CYR SMALL TE	CYR SMALL TE
 CYR CAPIT U	CYR CAPIT U
-CYR SMALL U	CYR SMALL U
 CYR CAPIT U	CYR SMALL U
 CYR SMALL U	CYR CAPIT U
+CYR SMALL U	CYR SMALL U
+CYR CAPIT EF	CYR CAPIT EF
 CYR CAPIT EF	CYR SMALL EF
 CYR SMALL EF	CYR CAPIT EF
-CYR CAPIT EF	CYR CAPIT EF
 CYR SMALL EF	CYR SMALL EF
+CYR CAPIT HA	CYR CAPIT HA
 CYR CAPIT HA	CYR SMALL HA
 CYR SMALL HA	CYR CAPIT HA
-CYR CAPIT HA	CYR CAPIT HA
 CYR SMALL HA	CYR SMALL HA
-CYR SMALL TSE	CYR CAPIT TSE
 CYR CAPIT TSE	CYR CAPIT TSE
-CYR SMALL TSE	CYR SMALL TSE
 CYR CAPIT TSE	CYR SMALL TSE
+CYR SMALL TSE	CYR CAPIT TSE
+CYR SMALL TSE	CYR SMALL TSE
 CYR CAPIT CHE	CYR CAPIT CHE
-CYR SMALL CHE	CYR SMALL CHE
 CYR CAPIT CHE	CYR SMALL CHE
 CYR SMALL CHE	CYR CAPIT CHE
+CYR SMALL CHE	CYR SMALL CHE
 CYR CAPIT SHA	CYR CAPIT SHA
-CYR SMALL SHA	CYR SMALL SHA
 CYR CAPIT SHA	CYR SMALL SHA
 CYR SMALL SHA	CYR CAPIT SHA
+CYR SMALL SHA	CYR SMALL SHA
+CYR CAPIT SCHA	CYR CAPIT SCHA
 CYR CAPIT SCHA	CYR SMALL SCHA
 CYR SMALL SCHA	CYR CAPIT SCHA
-CYR CAPIT SCHA	CYR CAPIT SCHA
 CYR SMALL SCHA	CYR SMALL SCHA
+CYR CAPIT HARD SIGN	CYR CAPIT HARD SIGN
 CYR CAPIT HARD SIGN	CYR SMALL HARD SIGN
 CYR SMALL HARD SIGN	CYR CAPIT HARD SIGN
-CYR CAPIT HARD SIGN	CYR CAPIT HARD SIGN
 CYR SMALL HARD SIGN	CYR SMALL HARD SIGN
 CYR CAPIT YERU	CYR CAPIT YERU
-CYR SMALL YERU	CYR SMALL YERU
 CYR CAPIT YERU	CYR SMALL YERU
 CYR SMALL YERU	CYR CAPIT YERU
+CYR SMALL YERU	CYR SMALL YERU
 CYR CAPIT SOFT SIGN	CYR CAPIT SOFT SIGN
-CYR SMALL SOFT SIGN	CYR SMALL SOFT SIGN
 CYR CAPIT SOFT SIGN	CYR SMALL SOFT SIGN
 CYR SMALL SOFT SIGN	CYR CAPIT SOFT SIGN
+CYR SMALL SOFT SIGN	CYR SMALL SOFT SIGN
+CYR CAPIT E	CYR CAPIT E
 CYR CAPIT E	CYR SMALL E
 CYR SMALL E	CYR CAPIT E
-CYR CAPIT E	CYR CAPIT E
 CYR SMALL E	CYR SMALL E
+CYR CAPIT YU	CYR CAPIT YU
 CYR CAPIT YU	CYR SMALL YU
 CYR SMALL YU	CYR CAPIT YU
-CYR CAPIT YU	CYR CAPIT YU
 CYR SMALL YU	CYR SMALL YU
-CYR SMALL YA	CYR CAPIT YA
 CYR CAPIT YA	CYR CAPIT YA
-CYR SMALL YA	CYR SMALL YA
 CYR CAPIT YA	CYR SMALL YA
+CYR SMALL YA	CYR CAPIT YA
+CYR SMALL YA	CYR SMALL YA
 SELECT t11.comment,t12.comment 
 FROM t1 t11,t1 t12 
 WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_ru)
-ORDER BY t12.utf8_f;
+ORDER BY t12.utf8_f,t11.comment,t12.comment;
 comment	comment
-LAT SMALL A	LAT SMALL A
-LAT SMALL A	LAT CAPIT A
-LAT CAPIT A	LAT SMALL A
 LAT CAPIT A	LAT CAPIT A
-LAT SMALL B	LAT CAPIT B
-LAT CAPIT B	LAT SMALL B
+LAT CAPIT A	LAT SMALL A
+LAT SMALL A	LAT CAPIT A
+LAT SMALL A	LAT SMALL A
 LAT CAPIT B	LAT CAPIT B
+LAT CAPIT B	LAT SMALL B
+LAT SMALL B	LAT CAPIT B
 LAT SMALL B	LAT SMALL B
-LAT CAPIT C	LAT SMALL C
 LAT CAPIT C	LAT CAPIT C
-LAT SMALL C	LAT SMALL C
+LAT CAPIT C	LAT SMALL C
 LAT SMALL C	LAT CAPIT C
+LAT SMALL C	LAT SMALL C
 LAT CAPIT D	LAT CAPIT D
-LAT SMALL D	LAT SMALL D
-LAT SMALL D	LAT CAPIT D
 LAT CAPIT D	LAT SMALL D
-LAT SMALL E	LAT SMALL E
-LAT SMALL E	LAT CAPIT E
-LAT CAPIT E	LAT SMALL E
+LAT SMALL D	LAT CAPIT D
+LAT SMALL D	LAT SMALL D
 LAT CAPIT E	LAT CAPIT E
-LAT SMALL F	LAT SMALL F
-LAT SMALL F	LAT CAPIT F
-LAT CAPIT F	LAT SMALL F
+LAT CAPIT E	LAT SMALL E
+LAT SMALL E	LAT CAPIT E
+LAT SMALL E	LAT SMALL E
 LAT CAPIT F	LAT CAPIT F
-LAT SMALL G	LAT CAPIT G
-LAT CAPIT G	LAT SMALL G
+LAT CAPIT F	LAT SMALL F
+LAT SMALL F	LAT CAPIT F
+LAT SMALL F	LAT SMALL F
 LAT CAPIT G	LAT CAPIT G
+LAT CAPIT G	LAT SMALL G
+LAT SMALL G	LAT CAPIT G
 LAT SMALL G	LAT SMALL G
 LAT CAPIT H	LAT CAPIT H
-LAT SMALL H	LAT SMALL H
-LAT SMALL H	LAT CAPIT H
 LAT CAPIT H	LAT SMALL H
+LAT SMALL H	LAT CAPIT H
+LAT SMALL H	LAT SMALL H
 LAT CAPIT I	LAT CAPIT I
-LAT SMALL I	LAT SMALL I
-LAT SMALL I	LAT CAPIT I
 LAT CAPIT I	LAT SMALL I
-LAT SMALL J	LAT SMALL J
-LAT SMALL J	LAT CAPIT J
-LAT CAPIT J	LAT SMALL J
+LAT SMALL I	LAT CAPIT I
+LAT SMALL I	LAT SMALL I
 LAT CAPIT J	LAT CAPIT J
-LAT SMALL K	LAT CAPIT K
-LAT CAPIT K	LAT SMALL K
+LAT CAPIT J	LAT SMALL J
+LAT SMALL J	LAT CAPIT J
+LAT SMALL J	LAT SMALL J
 LAT CAPIT K	LAT CAPIT K
+LAT CAPIT K	LAT SMALL K
+LAT SMALL K	LAT CAPIT K
 LAT SMALL K	LAT SMALL K
-LAT SMALL L	LAT CAPIT L
-LAT CAPIT L	LAT SMALL L
 LAT CAPIT L	LAT CAPIT L
+LAT CAPIT L	LAT SMALL L
+LAT SMALL L	LAT CAPIT L
 LAT SMALL L	LAT SMALL L
 LAT CAPIT M	LAT CAPIT M
-LAT SMALL M	LAT SMALL M
-LAT SMALL M	LAT CAPIT M
 LAT CAPIT M	LAT SMALL M
-LAT SMALL N	LAT SMALL N
-LAT SMALL N	LAT CAPIT N
-LAT CAPIT N	LAT SMALL N
+LAT SMALL M	LAT CAPIT M
+LAT SMALL M	LAT SMALL M
 LAT CAPIT N	LAT CAPIT N
-LAT SMALL O	LAT SMALL O
-LAT SMALL O	LAT CAPIT O
-LAT CAPIT O	LAT SMALL O
+LAT CAPIT N	LAT SMALL N
+LAT SMALL N	LAT CAPIT N
+LAT SMALL N	LAT SMALL N
 LAT CAPIT O	LAT CAPIT O
-LAT SMALL P	LAT CAPIT P
-LAT CAPIT P	LAT SMALL P
+LAT CAPIT O	LAT SMALL O
+LAT SMALL O	LAT CAPIT O
+LAT SMALL O	LAT SMALL O
 LAT CAPIT P	LAT CAPIT P
+LAT CAPIT P	LAT SMALL P
+LAT SMALL P	LAT CAPIT P
 LAT SMALL P	LAT SMALL P
-LAT CAPIT Q	LAT SMALL Q
 LAT CAPIT Q	LAT CAPIT Q
-LAT SMALL Q	LAT SMALL Q
+LAT CAPIT Q	LAT SMALL Q
 LAT SMALL Q	LAT CAPIT Q
+LAT SMALL Q	LAT SMALL Q
 LAT CAPIT R	LAT CAPIT R
-LAT SMALL R	LAT SMALL R
-LAT SMALL R	LAT CAPIT R
 LAT CAPIT R	LAT SMALL R
-LAT SMALL S	LAT SMALL S
-LAT SMALL S	LAT CAPIT S
-LAT CAPIT S	LAT SMALL S
+LAT SMALL R	LAT CAPIT R
+LAT SMALL R	LAT SMALL R
 LAT CAPIT S	LAT CAPIT S
-LAT SMALL T	LAT CAPIT T
-LAT CAPIT T	LAT SMALL T
+LAT CAPIT S	LAT SMALL S
+LAT SMALL S	LAT CAPIT S
+LAT SMALL S	LAT SMALL S
 LAT CAPIT T	LAT CAPIT T
+LAT CAPIT T	LAT SMALL T
+LAT SMALL T	LAT CAPIT T
 LAT SMALL T	LAT SMALL T
-LAT SMALL U	LAT CAPIT U
-LAT CAPIT U	LAT SMALL U
 LAT CAPIT U	LAT CAPIT U
+LAT CAPIT U	LAT SMALL U
+LAT SMALL U	LAT CAPIT U
 LAT SMALL U	LAT SMALL U
 LAT CAPIT V	LAT CAPIT V
-LAT SMALL V	LAT SMALL V
-LAT SMALL V	LAT CAPIT V
 LAT CAPIT V	LAT SMALL V
+LAT SMALL V	LAT CAPIT V
+LAT SMALL V	LAT SMALL V
 LAT CAPIT W	LAT CAPIT W
-LAT SMALL W	LAT SMALL W
-LAT SMALL W	LAT CAPIT W
 LAT CAPIT W	LAT SMALL W
-LAT SMALL X	LAT SMALL X
-LAT SMALL X	LAT CAPIT X
-LAT CAPIT X	LAT SMALL X
+LAT SMALL W	LAT CAPIT W
+LAT SMALL W	LAT SMALL W
 LAT CAPIT X	LAT CAPIT X
-LAT SMALL Y	LAT CAPIT Y
-LAT CAPIT Y	LAT SMALL Y
+LAT CAPIT X	LAT SMALL X
+LAT SMALL X	LAT CAPIT X
+LAT SMALL X	LAT SMALL X
 LAT CAPIT Y	LAT CAPIT Y
+LAT CAPIT Y	LAT SMALL Y
+LAT SMALL Y	LAT CAPIT Y
 LAT SMALL Y	LAT SMALL Y
-LAT CAPIT Z	LAT SMALL Z
 LAT CAPIT Z	LAT CAPIT Z
-LAT SMALL Z	LAT SMALL Z
+LAT CAPIT Z	LAT SMALL Z
 LAT SMALL Z	LAT CAPIT Z
-CYR CAPIT A	CYR SMALL A
+LAT SMALL Z	LAT SMALL Z
 CYR CAPIT A	CYR CAPIT A
-CYR SMALL A	CYR SMALL A
+CYR CAPIT A	CYR SMALL A
 CYR SMALL A	CYR CAPIT A
-CYR SMALL BE	CYR SMALL BE
-CYR SMALL BE	CYR CAPIT BE
-CYR CAPIT BE	CYR SMALL BE
+CYR SMALL A	CYR SMALL A
 CYR CAPIT BE	CYR CAPIT BE
-CYR SMALL VE	CYR SMALL VE
-CYR SMALL VE	CYR CAPIT VE
-CYR CAPIT VE	CYR SMALL VE
+CYR CAPIT BE	CYR SMALL BE
+CYR SMALL BE	CYR CAPIT BE
+CYR SMALL BE	CYR SMALL BE
 CYR CAPIT VE	CYR CAPIT VE
-CYR SMALL GE	CYR SMALL GE
-CYR SMALL GE	CYR CAPIT GE
-CYR CAPIT GE	CYR SMALL GE
+CYR CAPIT VE	CYR SMALL VE
+CYR SMALL VE	CYR CAPIT VE
+CYR SMALL VE	CYR SMALL VE
 CYR CAPIT GE	CYR CAPIT GE
-CYR CAPIT DE	CYR SMALL DE
+CYR CAPIT GE	CYR SMALL GE
+CYR SMALL GE	CYR CAPIT GE
+CYR SMALL GE	CYR SMALL GE
 CYR CAPIT DE	CYR CAPIT DE
-CYR SMALL DE	CYR SMALL DE
+CYR CAPIT DE	CYR SMALL DE
 CYR SMALL DE	CYR CAPIT DE
-CYR CAPIT IE	CYR SMALL IE
+CYR SMALL DE	CYR SMALL DE
 CYR CAPIT IE	CYR CAPIT IE
-CYR SMALL IO	CYR SMALL IO
-CYR SMALL IO	CYR CAPIT IO
-CYR SMALL IE	CYR SMALL IE
-CYR SMALL IE	CYR CAPIT IE
-CYR CAPIT IO	CYR SMALL IO
+CYR CAPIT IE	CYR SMALL IE
 CYR CAPIT IO	CYR CAPIT IO
-CYR SMALL ZHE	CYR SMALL ZHE
-CYR SMALL ZHE	CYR CAPIT ZHE
-CYR CAPIT ZHE	CYR SMALL ZHE
+CYR CAPIT IO	CYR SMALL IO
+CYR SMALL IE	CYR CAPIT IE
+CYR SMALL IE	CYR SMALL IE
+CYR SMALL IO	CYR CAPIT IO
+CYR SMALL IO	CYR SMALL IO
 CYR CAPIT ZHE	CYR CAPIT ZHE
-CYR CAPIT ZE	CYR SMALL ZE
+CYR CAPIT ZHE	CYR SMALL ZHE
+CYR SMALL ZHE	CYR CAPIT ZHE
+CYR SMALL ZHE	CYR SMALL ZHE
 CYR CAPIT ZE	CYR CAPIT ZE
-CYR SMALL ZE	CYR SMALL ZE
+CYR CAPIT ZE	CYR SMALL ZE
 CYR SMALL ZE	CYR CAPIT ZE
-CYR CAPIT I	CYR SMALL I
+CYR SMALL ZE	CYR SMALL ZE
 CYR CAPIT I	CYR CAPIT I
-CYR SMALL I	CYR SMALL I
+CYR CAPIT I	CYR SMALL I
 CYR SMALL I	CYR CAPIT I
-CYR SMALL KA	CYR SMALL KA
-CYR SMALL KA	CYR CAPIT KA
-CYR CAPIT KA	CYR SMALL KA
+CYR SMALL I	CYR SMALL I
 CYR CAPIT KA	CYR CAPIT KA
-CYR SMALL EL	CYR SMALL EL
-CYR SMALL EL	CYR CAPIT EL
-CYR CAPIT EL	CYR SMALL EL
+CYR CAPIT KA	CYR SMALL KA
+CYR SMALL KA	CYR CAPIT KA
+CYR SMALL KA	CYR SMALL KA
 CYR CAPIT EL	CYR CAPIT EL
-CYR SMALL EM	CYR SMALL EM
-CYR SMALL EM	CYR CAPIT EM
-CYR CAPIT EM	CYR SMALL EM
+CYR CAPIT EL	CYR SMALL EL
+CYR SMALL EL	CYR CAPIT EL
+CYR SMALL EL	CYR SMALL EL
 CYR CAPIT EM	CYR CAPIT EM
-CYR CAPIT EN	CYR SMALL EN
+CYR CAPIT EM	CYR SMALL EM
+CYR SMALL EM	CYR CAPIT EM
+CYR SMALL EM	CYR SMALL EM
 CYR CAPIT EN	CYR CAPIT EN
-CYR SMALL EN	CYR SMALL EN
+CYR CAPIT EN	CYR SMALL EN
 CYR SMALL EN	CYR CAPIT EN
-CYR CAPIT O	CYR SMALL O
+CYR SMALL EN	CYR SMALL EN
 CYR CAPIT O	CYR CAPIT O
-CYR SMALL O	CYR SMALL O
+CYR CAPIT O	CYR SMALL O
 CYR SMALL O	CYR CAPIT O
-CYR SMALL PE	CYR SMALL PE
-CYR SMALL PE	CYR CAPIT PE
-CYR CAPIT PE	CYR SMALL PE
+CYR SMALL O	CYR SMALL O
 CYR CAPIT PE	CYR CAPIT PE
-CYR SMALL ER	CYR SMALL ER
-CYR SMALL ER	CYR CAPIT ER
-CYR CAPIT ER	CYR SMALL ER
+CYR CAPIT PE	CYR SMALL PE
+CYR SMALL PE	CYR CAPIT PE
+CYR SMALL PE	CYR SMALL PE
 CYR CAPIT ER	CYR CAPIT ER
-CYR SMALL ES	CYR SMALL ES
-CYR SMALL ES	CYR CAPIT ES
-CYR CAPIT ES	CYR SMALL ES
+CYR CAPIT ER	CYR SMALL ER
+CYR SMALL ER	CYR CAPIT ER
+CYR SMALL ER	CYR SMALL ER
 CYR CAPIT ES	CYR CAPIT ES
-CYR CAPIT TE	CYR SMALL TE
+CYR CAPIT ES	CYR SMALL ES
+CYR SMALL ES	CYR CAPIT ES
+CYR SMALL ES	CYR SMALL ES
 CYR CAPIT TE	CYR CAPIT TE
-CYR SMALL TE	CYR SMALL TE
+CYR CAPIT TE	CYR SMALL TE
 CYR SMALL TE	CYR CAPIT TE
-CYR SMALL U	CYR SMALL U
-CYR SMALL U	CYR CAPIT U
-CYR CAPIT U	CYR SMALL U
+CYR SMALL TE	CYR SMALL TE
 CYR CAPIT U	CYR CAPIT U
-CYR SMALL EF	CYR SMALL EF
-CYR SMALL EF	CYR CAPIT EF
-CYR CAPIT EF	CYR SMALL EF
+CYR CAPIT U	CYR SMALL U
+CYR SMALL U	CYR CAPIT U
+CYR SMALL U	CYR SMALL U
 CYR CAPIT EF	CYR CAPIT EF
-CYR SMALL HA	CYR SMALL HA
-CYR SMALL HA	CYR CAPIT HA
-CYR CAPIT HA	CYR SMALL HA
+CYR CAPIT EF	CYR SMALL EF
+CYR SMALL EF	CYR CAPIT EF
+CYR SMALL EF	CYR SMALL EF
 CYR CAPIT HA	CYR CAPIT HA
-CYR CAPIT TSE	CYR SMALL TSE
+CYR CAPIT HA	CYR SMALL HA
+CYR SMALL HA	CYR CAPIT HA
+CYR SMALL HA	CYR SMALL HA
 CYR CAPIT TSE	CYR CAPIT TSE
-CYR SMALL TSE	CYR SMALL TSE
+CYR CAPIT TSE	CYR SMALL TSE
 CYR SMALL TSE	CYR CAPIT TSE
-CYR CAPIT CHE	CYR SMALL CHE
+CYR SMALL TSE	CYR SMALL TSE
 CYR CAPIT CHE	CYR CAPIT CHE
-CYR SMALL CHE	CYR SMALL CHE
+CYR CAPIT CHE	CYR SMALL CHE
 CYR SMALL CHE	CYR CAPIT CHE
-CYR SMALL SHA	CYR SMALL SHA
-CYR SMALL SHA	CYR CAPIT SHA
-CYR CAPIT SHA	CYR SMALL SHA
+CYR SMALL CHE	CYR SMALL CHE
 CYR CAPIT SHA	CYR CAPIT SHA
-CYR SMALL SCHA	CYR SMALL SCHA
-CYR SMALL SCHA	CYR CAPIT SCHA
-CYR CAPIT SCHA	CYR SMALL SCHA
+CYR CAPIT SHA	CYR SMALL SHA
+CYR SMALL SHA	CYR CAPIT SHA
+CYR SMALL SHA	CYR SMALL SHA
 CYR CAPIT SCHA	CYR CAPIT SCHA
-CYR SMALL HARD SIGN	CYR SMALL HARD SIGN
-CYR SMALL HARD SIGN	CYR CAPIT HARD SIGN
-CYR CAPIT HARD SIGN	CYR SMALL HARD SIGN
+CYR CAPIT SCHA	CYR SMALL SCHA
+CYR SMALL SCHA	CYR CAPIT SCHA
+CYR SMALL SCHA	CYR SMALL SCHA
 CYR CAPIT HARD SIGN	CYR CAPIT HARD SIGN
-CYR CAPIT YERU	CYR SMALL YERU
+CYR CAPIT HARD SIGN	CYR SMALL HARD SIGN
+CYR SMALL HARD SIGN	CYR CAPIT HARD SIGN
+CYR SMALL HARD SIGN	CYR SMALL HARD SIGN
 CYR CAPIT YERU	CYR CAPIT YERU
-CYR SMALL YERU	CYR SMALL YERU
+CYR CAPIT YERU	CYR SMALL YERU
 CYR SMALL YERU	CYR CAPIT YERU
-CYR CAPIT SOFT SIGN	CYR SMALL SOFT SIGN
+CYR SMALL YERU	CYR SMALL YERU
 CYR CAPIT SOFT SIGN	CYR CAPIT SOFT SIGN
-CYR SMALL SOFT SIGN	CYR SMALL SOFT SIGN
+CYR CAPIT SOFT SIGN	CYR SMALL SOFT SIGN
 CYR SMALL SOFT SIGN	CYR CAPIT SOFT SIGN
-CYR SMALL E	CYR SMALL E
-CYR SMALL E	CYR CAPIT E
-CYR CAPIT E	CYR SMALL E
+CYR SMALL SOFT SIGN	CYR SMALL SOFT SIGN
 CYR CAPIT E	CYR CAPIT E
-CYR SMALL YU	CYR SMALL YU
-CYR SMALL YU	CYR CAPIT YU
-CYR CAPIT YU	CYR SMALL YU
+CYR CAPIT E	CYR SMALL E
+CYR SMALL E	CYR CAPIT E
+CYR SMALL E	CYR SMALL E
 CYR CAPIT YU	CYR CAPIT YU
-CYR CAPIT YA	CYR SMALL YA
+CYR CAPIT YU	CYR SMALL YU
+CYR SMALL YU	CYR CAPIT YU
+CYR SMALL YU	CYR SMALL YU
 CYR CAPIT YA	CYR CAPIT YA
-CYR SMALL YA	CYR SMALL YA
+CYR CAPIT YA	CYR SMALL YA
 CYR SMALL YA	CYR CAPIT YA
+CYR SMALL YA	CYR SMALL YA
 ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2 NOT NULL;
 INSERT INTO t1 (ucs2_f,comment) VALUES (0x0391,'GREEK CAPIT ALPHA');
 INSERT INTO t1 (ucs2_f,comment) VALUES (0x0392,'GREEK CAPIT BETA');
diff --git a/mysql-test/t/ctype_many.test b/mysql-test/t/ctype_many.test
index 7db8f49919b..572784b8d34 100644
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@@ -147,12 +147,12 @@ SELECT lower(utf8_f) FROM t1 ORDER BY 1 DESC;
 
 SELECT t11.comment,t12.comment 
 FROM t1 t11,t1 t12 WHERE CONVERT(t11.koi8_ru_f USING utf8)=t12.utf8_f
-ORDER BY t11.koi8_ru_f;
+ORDER BY t11.koi8_ru_f,t11.comment,t12.comment;
 
 SELECT t11.comment,t12.comment 
 FROM t1 t11,t1 t12 
 WHERE t11.koi8_ru_f=CONVERT(t12.utf8_f USING koi8_ru)
-ORDER BY t12.utf8_f;
+ORDER BY t12.utf8_f,t11.comment,t12.comment;
 
 ALTER TABLE t1 ADD ucs2_f CHAR(32) CHARACTER SET ucs2 NOT NULL;