These functions now return a result of proper collation:

BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE

1 files changed, 15 insertions, 2 deletions

diff --git a/mysql-test/t/func_str.test b/mysql-test/t/func_str.test
index 93e35efa455..1d33d196bdd 100644
--- a/mysql-test/t/func_str.test
+++ b/mysql-test/t/func_str.test
@@ -136,6 +136,12 @@ DROP TABLE t1;
 #
 # Test collation and coercibility
 #
+select collation(bin(130)), coercibility(bin(130));
+select collation(oct(130)), coercibility(oct(130));
+select collation(conv(130,16,10)), coercibility(conv(130,16,10));
+select collation(hex(130)), coercibility(hex(130));
+select collation(char(130)), coercibility(hex(130));
+select collation(format(130,10)), coercibility(format(130,10));
 select collation(lcase(_latin2'a')), coercibility(lcase(_latin2'a'));
 select collation(ucase(_latin2'a')), coercibility(ucase(_latin2'a'));
 select collation(left(_latin2'a',1)), coercibility(left(_latin2'a',1));
@@ -155,9 +161,16 @@ select collation(quote(_latin2'ab')), coercibility(quote(_latin2'ab'));
 select collation(soundex(_latin2'ab')), coercibility(soundex(_latin2'ab'));
 select collation(substring(_latin2'ab',1)), coercibility(substring(_latin2'ab',1));
 select collation(insert(_latin2'abcd',2,3,_latin2'ef')), coercibility(insert(_latin2'abcd',2,3,_latin2'ef'));
+select collation(replace(_latin2'abcd',_latin2'b',_latin2'B')), coercibility(replace(_latin2'abcd',_latin2'b',_latin2'B'));
 
 create table t1 
 select
+  bin(130),
+  oct(130),
+  conv(130,16,10),
+  hex(130),
+  char(130),
+  format(130,10),
   left(_latin2'a',1),
   right(_latin2'a',1), 
   lcase(_latin2'a'), 
@@ -176,8 +189,8 @@ select
   quote(_latin2'ab'),
   soundex(_latin2'ab'),
   substring(_latin2'ab',1),
-  insert(_latin2'abcd',2,3,_latin2'ef')
+  insert(_latin2'abcd',2,3,_latin2'ef'),
+  replace(_latin2'abcd',_latin2'b',_latin2'B')
 ;
-
 show create table t1;
 drop table t1;