diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-03-20 13:37:30 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-03-20 13:37:30 +0200 |
| commit | 7699bb4784dd84eb98963fa3abdbc27af0c3169c (patch) | |
| tree | 0a80558837354b86ef292c9d179028a813cb44b9 /sql/item_strfunc.cc | |
| parent | f379d7b172401206de5654f52466601de874cade (diff) | |
| parent | 4bfa7a01227c6fad663094d3f4e9edd4c74a488b (diff) | |
| download | mariadb-git-7699bb4784dd84eb98963fa3abdbc27af0c3169c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-select_list-4.1
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index a711d9b92b1..933995c1d22 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -641,9 +641,11 @@ void Item_func_concat_ws::fix_length_and_dec() max_length=separator->max_length*(arg_count-1); for (uint i=0 ; i < arg_count ; i++) { + DTCollation tmp(collation.collation, collation.derivation); max_length+=args[i]->max_length; if (collation.aggregate(args[i]->collation)) { + collation.set(tmp); // Restore the previous value my_coll_agg_error(collation, args[i]->collation, func_name()); break; } |