1 files changed, 18 insertions, 18 deletions

diff --git a/mysql-test/main/ctype_utf32.test b/mysql-test/main/ctype_utf32.test
index 891fd14d15f..59cc13015af 100644
--- a/mysql-test/main/ctype_utf32.test
+++ b/mysql-test/main/ctype_utf32.test
@@ -554,12 +554,12 @@ drop table t1;
 set names latin1;
 set collation_connection=utf32_general_ci;
 #
-# Testing cs->coll->instr()
+# Testing instr()
 #
 select position('bb' in 'abba');
 
 #
-# Testing cs->coll->hash_sort()
+# Testing hash_sort()
 #
 create table t1 (a varchar(10) character set utf32) engine=heap;
 insert into t1 values ('a'),('A'),('b'),('B');
@@ -568,17 +568,17 @@ select hex(min(binary a)),count(*) from t1 group by a;
 drop table t1;
 
 #
-# Testing cs->cset->numchars()
+# Testing numchars()
 #
 select char_length('abcd'), octet_length('abcd');
 
 #
-# Testing cs->cset->charpos()
+# Testing charpos()
 #
 select left('abcd',2);
 
 #
-# Testing cs->cset->well_formed_length()
+# Testing well_formed_length()
 #
 create table t1 (a varchar(10) character set utf32);
 insert into t1 values (_utf32 0x0010FFFF);
@@ -625,7 +625,7 @@ select hex(s1) from t1 where s1 = 0xfffd;
 drop table t1;
 
 #
-# Testing cs->cset->lengthsp()
+# Testing lengthsp()
 #
 create table t1 (a char(10)) character set utf32;
 insert into t1 values ('a   ');
@@ -633,13 +633,13 @@ select hex(a) from t1;
 drop table t1;
 
 #
-# Testing cs->cset->caseup() and cs->cset->casedn()
+# Testing caseup() and casedn()
 #
 select upper('abcd'), lower('ABCD');
 
 #
 # TODO: str_to_datetime() is broken and doesn't work with ucs2 and utf32
-# Testing cs->cset->snprintf()
+# Testing snprintf()
 #
 #create table t1 (a date);
 #insert into t1 values ('2007-09-16');
@@ -647,11 +647,11 @@ select upper('abcd'), lower('ABCD');
 #drop table t1;
 
 #
-# Testing cs->cset->l10tostr
+# Testing l10tostr
 # !!! Not used in the code
 
 #
-# Testing cs->cset->ll10tostr
+# Testing ll10tostr
 #
 create table t1 (a varchar(10) character set utf32);
 insert into t1 values (123456);
@@ -659,16 +659,16 @@ select a, hex(a) from t1;
 drop table t1;
 
 #
-# Testing cs->cset->fill
+# Testing fill
 # SOUNDEX fills strings with DIGIT ZERO up to four characters
 select hex(soundex('a'));
 
 #
-# Testing cs->cset->strntol
+# Testing strntol
 # !!! Not used in the code
 
 #
-# Testing cs->cset->strntoul
+# Testing strntoul
 #
 create table t1 (a enum ('a','b','c')) character set utf32;
 insert into t1 values ('1');
@@ -676,14 +676,14 @@ select * from t1;
 drop table t1;
 
 #
-# Testing cs->cset->strntoll and cs->cset->strntoull
+# Testing strntoll and strntoull
 #
 set names latin1;
 select hex(conv(convert('123' using utf32), -10, 16));
 select hex(conv(convert('123' using utf32), 10, 16));
 
 #
-# Testing cs->cset->strntod
+# Testing strntod
 #
 set names latin1;
 set character_set_connection=utf32;
@@ -691,12 +691,12 @@ select 1.1 + '1.2';
 select 1.1 + '1.2xxx';
 
 # Testing strntoll10_utf32
-# Testing cs->cset->strtoll10
+# Testing strtoll10
 select left('aaa','1');
 --source include/ctype_strtoll10.inc
 
 #
-# Testing cs->cset->strntoull10rnd
+# Testing strntoull10rnd
 #
 create table t1 (a int);
 insert into t1 values ('-1234.1e2');
@@ -706,7 +706,7 @@ select * from t1;
 drop table t1;
 
 #
-# Testing cs->cset->scan
+# Testing scan
 #
 create table t1 (a int);
 insert into t1 values ('1 ');