bk commit into 6.0 tree (ramil:1.2707)

[ramil]

Below is the list of changes that have just been committed into a local
6.0 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-11-29 15:17:05+04:00, ramil@stripped +2 -0
  after-merge fix:
    - result adjusted.

  mysql-test/r/ctype_utf16_uca.result@stripped, 2007-11-29 15:17:03+04:00, ramil@stripped +4 -0
    after-merge fix:
      - result adjusted.

  mysql-test/r/ctype_utf32_uca.result@stripped, 2007-11-29 15:17:03+04:00, ramil@stripped +4 -0
    after-merge fix:
      - result adjusted.

diff -Nrup a/mysql-test/r/ctype_utf16_uca.result b/mysql-test/r/ctype_utf16_uca.result
--- a/mysql-test/r/ctype_utf16_uca.result	2007-10-22 17:19:07 +05:00
+++ b/mysql-test/r/ctype_utf16_uca.result	2007-11-29 15:17:03 +04:00
@@ -2231,6 +2231,10 @@ select a sounds like a from t1;
 a sounds like a
 1
 1
+select 1 from t1 order by cast(a as char(1));
+1
+1
+1
 drop table t1;
 DROP DATABASE d1;
 USE test;
diff -Nrup a/mysql-test/r/ctype_utf32_uca.result b/mysql-test/r/ctype_utf32_uca.result
--- a/mysql-test/r/ctype_utf32_uca.result	2007-10-22 17:19:07 +05:00
+++ b/mysql-test/r/ctype_utf32_uca.result	2007-11-29 15:17:03 +04:00
@@ -2231,6 +2231,10 @@ select a sounds like a from t1;
 a sounds like a
 1
 1
+select 1 from t1 order by cast(a as char(1));
+1
+1
+1
 drop table t1;
 DROP DATABASE d1;
 USE test;