diff options
| author | unknown <tsmith/tim@siva.hindu.god> | 2006-08-23 18:06:07 -0600 |
|---|---|---|
| committer | unknown <tsmith/tim@siva.hindu.god> | 2006-08-23 18:06:07 -0600 |
| commit | 29c1fc534425da91a67c5d1c6ae630f017714c34 (patch) | |
| tree | d9c3bb1b33b9029876d0d22d120b32eaf174388c /sql/item_strfunc.cc | |
| parent | 4415b140a42f5f078b47bceb7db64d113400941a (diff) | |
| parent | 399b9b35b26f7bd3f43bdea857afa1fdcc1ceec0 (diff) | |
| download | mariadb-git-29c1fc534425da91a67c5d1c6ae630f017714c34.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/b21531-41
into siva.hindu.god:/usr/home/tim/m/bk/41
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
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 e6cb23a9b88..1ef11945bd5 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -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; } |