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

Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41

Browse source 
into  siva.hindu.god:/usr/home/tim/m/bk/41


sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
This commit is contained in:
unknown 2006-08-23 18:06:07 -06:00
commit 66d913482f
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/r/func_misc.result
View file

@ -93,3 +93,7 @@ SELECT IS_USED_LOCK('bug16501');
IS_USED_LOCK('bug16501')
NULL
DROP TABLE t1;
select export_set(3, _latin1'foo', _utf8'bar', ',', 4);
export_set(3, _latin1'foo', _utf8'bar', ',', 4)
foo,foo,bar,bar
End of 4.1 tests

7
mysql-test/t/func_misc.test
View file

@ -83,4 +83,9 @@ connection default;
DROP TABLE t1;
# End of 4.1 tests
#
# Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
#
select export_set(3, _latin1'foo', _utf8'bar', ',', 4);
--echo End of 4.1 tests

3
sql/item_func.h
View file

@ -159,8 +159,7 @@ public:
return agg_item_collations_for_comparison(c, func_name(),
items, nitems, flags);
}
bool agg_arg_charsets(DTCollation &c, Item **items, uint nitems,
uint flags= 0)
bool agg_arg_charsets(DTCollation &c, Item **items, uint nitems, uint flags)
{
return agg_item_charsets(c, func_name(), items, nitems, flags);
}

4
sql/item_strfunc.cc
View file

@ -2641,8 +2641,8 @@ void Item_func_export_set::fix_length_and_dec()
uint sep_length=(arg_count > 3 ? args[3]->max_length : 1);
max_length=length*64+sep_length*63;
if (agg_arg_charsets(collation, args+1, min(4,arg_count)-1),
MY_COLL_ALLOW_CONV)
if (agg_arg_charsets(collation, args+1, min(4,arg_count)-1,
MY_COLL_ALLOW_CONV))
return;
}