database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

Browse Source 
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
This commit is contained in:
unknown
2004-03-20 13:37:30 +02:00
parent f379d7b172 4bfa7a0122
commit 7699bb4784
38 changed files with 581 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_strfunc.cc
View File

@ -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;
}