diff options
| author | tsmith/tim@siva.hindu.god <> | 2006-08-23 18:02:31 -0600 |
|---|---|---|
| committer | tsmith/tim@siva.hindu.god <> | 2006-08-23 18:02:31 -0600 |
| commit | 45460bd0afbf5f31111ee44f352622cd79402a0d (patch) | |
| tree | 85b2e4bdba015b6e73f9c6b852f94f169899e51a /sql/item_strfunc.cc | |
| parent | dba7b8e81c462e81256c95986d0b5daec9ba36ac (diff) | |
| download | mariadb-git-45460bd0afbf5f31111ee44f352622cd79402a0d.tar.gz | |
Bug #21531: EXPORT_SET() doesn't accept args with coercible character sets
- Fix typo in Item_func_export_set::fix_length_and_dec() which caused character set aggregation to fail
- Remove default argument from last arg of agg_arg_charsets() function, to reduce potential errors
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 56a31d074ac..a43f8b5a22a 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -2624,8 +2624,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; } |