summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.cornsilk.net>2006-09-28 10:02:53 -0400
committerunknown <cmiller@zippy.cornsilk.net>2006-09-28 10:02:53 -0400
commit6e985efb1e273a4e768b439337c56bb7dcd7ce26 (patch)
tree93a63f0b435058a39bd5c10d6cdcbf5af3c6831f /mysql-test
parent7731acb5147700d1974c873f6f604f359182fbd0 (diff)
parentabd883f4d02e6d32c4ac0446345bd27c2455db55 (diff)
downloadmariadb-git-6e985efb1e273a4e768b439337c56bb7dcd7ce26.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint mysql-test/r/ctype_utf8.result: Manual merge. mysql-test/t/ctype_utf8.test: Manual merge.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/ctype_utf8.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ctype_utf8.test b/mysql-test/t/ctype_utf8.test
index 90d7ec1b3a0..cb34d51e3cb 100644
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@@ -1072,6 +1072,7 @@ explain select a from t1 group by a;
select a from t1 group by a;
drop table t1;
+
#
# Bug#20393: User name truncation in mysql client
# Bug#21432: Database/Table name limited to 64 bytes, not chars, problems with multi-byte
@@ -1099,5 +1100,4 @@ explain
select substr(Z.a,-1), Z.a from t1 as Y join t1 as Z on Y.a=Z.a order by 1;
select substr(Z.a,-1), Z.a from t1 as Y join t1 as Z on Y.a=Z.a order by 1;
drop table t1;
-
# End of 4.1 tests