mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 02:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into  mysql.com:/usr/home/bar/mysql-4.1.b13751
This commit is contained in:
bar@mysql.com 2005-10-14 11:54:10 +05:00
commit 5df9c6c2a3
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mysql-test/r/ctype_utf8.result
View file

@ -1056,3 +1056,8 @@ hex(a)
5B
E880BD
drop table t1;
set names 'latin1';
create table t1 (a varchar(255)) default charset=utf8;
select * from t1 where find_in_set('-1', a);
a
drop table t1;

8
mysql-test/t/ctype_utf8.test
View file

@ -865,4 +865,12 @@ insert into t1 values (_utf8 0x5b);
select hex(a) from t1;
drop table t1;
#
# Bug#13751 find_in_set: Illegal mix of collations
#
set names 'latin1';
create table t1 (a varchar(255)) default charset=utf8;
select * from t1 where find_in_set('-1', a);
drop table t1;
# End of 4.1 tests

2
sql/item_func.cc
View file

@ -1454,7 +1454,7 @@ void Item_func_find_in_set::fix_length_and_dec()
}
}
}
agg_arg_collations_for_comparison(cmp_collation, args, 2);
agg_arg_charsets(cmp_collation, args, 2, MY_COLL_CMP_CONV);
}
static const char separator=',';