After merge fixes

Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings

1 files changed, 3 insertions, 3 deletions

diff --git a/mysql-test/t/func_in.test b/mysql-test/t/func_in.test
index 105612bf238..689b061f88d 100644
--- a/mysql-test/t/func_in.test
+++ b/mysql-test/t/func_in.test
@@ -61,11 +61,11 @@ c char(1) character set latin1 collate latin1_danish_ci
 );
 insert into t1 values ('A','B','C');
 insert into t1 values ('a','c','c');
---error 1265
+--error 1266
 select * from t1 where a in (b);
---error 1268
-select * from t1 where a in (b,c);
 --error 1269
+select * from t1 where a in (b,c);
+--error 1270
 select * from t1 where 'a' in (a,b,c);
 select * from t1 where 'a' in (a);
 select * from t1 where a in ('a');