diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2003-07-04 20:19:07 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2003-07-04 20:19:07 +0500 |
| commit | 35332781ef6eb900dbba1873e436a1bc0ada0883 (patch) | |
| tree | d020bda4212193202065c0bcd34c3ae3174bbb83 /sql/item_strfunc.cc | |
| parent | 077b8328931177ff2d03f5f9c4b5b45d4c3d00b9 (diff) | |
| download | mariadb-git-35332781ef6eb900dbba1873e436a1bc0ada0883.tar.gz | |
More code was reused
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index f46959e5365..2d29f76c2d7 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1317,7 +1317,8 @@ void Item_func_trim::fix_length_and_dec() remove.set_ascii(" ",1); } else - if (collation.set(args[1]->collation, args[0]->collation)) + if (collation.set(args[1]->collation, args[0]->collation) || + collation.derivation == DERIVATION_NONE) { my_coll_agg_error(args[1]->collation, args[0]->collation, func_name()); } |