These functions now return a result of proper collation:

BIN
OCT
CONV
HEX
CHAR
FORMAT
REPLACE

1 files changed, 39 insertions, 2 deletions

diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index ffb7f2cd911..302d9d7374b 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -249,6 +249,24 @@ INSERT INTO t1 VALUES (1, 'a545f661efdd1fb66fdee3aab79945bf');
 SELECT 1 FROM t1 WHERE tmp=AES_DECRYPT(tmp,"password");
 1
 DROP TABLE t1;
+select collation(bin(130)), coercibility(bin(130));
+collation(bin(130))	coercibility(bin(130))
+latin1_swedish_ci	3
+select collation(oct(130)), coercibility(oct(130));
+collation(oct(130))	coercibility(oct(130))
+latin1_swedish_ci	3
+select collation(conv(130,16,10)), coercibility(conv(130,16,10));
+collation(conv(130,16,10))	coercibility(conv(130,16,10))
+latin1_swedish_ci	3
+select collation(hex(130)), coercibility(hex(130));
+collation(hex(130))	coercibility(hex(130))
+latin1_swedish_ci	3
+select collation(char(130)), coercibility(hex(130));
+collation(char(130))	coercibility(hex(130))
+binary	3
+select collation(format(130,10)), coercibility(format(130,10));
+collation(format(130,10))	coercibility(format(130,10))
+latin1_swedish_ci	3
 select collation(lcase(_latin2'a')), coercibility(lcase(_latin2'a'));
 collation(lcase(_latin2'a'))	coercibility(lcase(_latin2'a'))
 latin2_general_ci	3
@@ -306,8 +324,17 @@ latin2_general_ci	3
 select collation(insert(_latin2'abcd',2,3,_latin2'ef')), coercibility(insert(_latin2'abcd',2,3,_latin2'ef'));
 collation(insert(_latin2'abcd',2,3,_latin2'ef'))	coercibility(insert(_latin2'abcd',2,3,_latin2'ef'))
 latin2_general_ci	3
+select collation(replace(_latin2'abcd',_latin2'b',_latin2'B')), coercibility(replace(_latin2'abcd',_latin2'b',_latin2'B'));
+collation(replace(_latin2'abcd',_latin2'b',_latin2'B'))	coercibility(replace(_latin2'abcd',_latin2'b',_latin2'B'))
+latin2_general_ci	3
 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'), 
@@ -326,11 +353,20 @@ reverse(_latin2'ab'),
 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')
 ;
+Warnings:
+Warning	1263	Data truncated for column 'format(130,10)' at row 1
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
+  `bin(130)` char(64) NOT NULL default '',
+  `oct(130)` char(64) NOT NULL default '',
+  `conv(130,16,10)` char(64) NOT NULL default '',
+  `hex(130)` char(6) NOT NULL default '',
+  `char(130)` char(1) NOT NULL default '',
+  `format(130,10)` char(4) NOT NULL default '',
   `left(_latin2'a',1)` char(1) character set latin2 NOT NULL default '',
   `right(_latin2'a',1)` char(1) character set latin2 NOT NULL default '',
   `lcase(_latin2'a')` char(1) character set latin2 NOT NULL default '',
@@ -349,6 +385,7 @@ t1	CREATE TABLE `t1` (
   `quote(_latin2'ab')` char(6) character set latin2 NOT NULL default '',
   `soundex(_latin2'ab')` char(4) character set latin2 NOT NULL default '',
   `substring(_latin2'ab',1)` char(2) character set latin2 NOT NULL default '',
-  `insert(_latin2'abcd',2,3,_latin2'ef')` char(6) character set latin2 NOT NULL default ''
+  `insert(_latin2'abcd',2,3,_latin2'ef')` char(6) character set latin2 NOT NULL default '',
+  `replace(_latin2'abcd',_latin2'b',_latin2'B')` char(4) character set latin2 NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin1
 drop table t1;