diff options
| author | unknown <sergefp@mysql.com> | 2005-09-09 10:54:59 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-09-09 10:54:59 +0400 |
| commit | 20994fec52db1d95b085704c424ef5d292c9a307 (patch) | |
| tree | d061df624f7dfc9d9b60f22b9a9d7e570f0a819d /sql/item_sum.cc | |
| parent | cf0b4702f568ca76e78e1ac47e0e37e19f1b00f8 (diff) | |
| parent | 213fa9cbc234c1a10e50f2bf53b2e1f520284034 (diff) | |
| download | mariadb-git-20994fec52db1d95b085704c424ef5d292c9a307.tar.gz | |
Merge 4.1->5.0
client/mysqlimport.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/connect.test:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 17d82e3fc98..4f991615bfa 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2740,7 +2740,9 @@ int dump_leaf_key(byte* key, element_count count __attribute__((unused)), String *result= &item->result; Item **arg= item->args, **arg_end= item->args + item->arg_count_field; - if (result->length()) + if (item->no_appended) + item->no_appended= FALSE; + else result->append(*item->separator); tmp.length(0); @@ -2925,6 +2927,7 @@ void Item_func_group_concat::clear() result.copy(); null_value= TRUE; warning_for_row= FALSE; + no_appended= TRUE; if (tree) reset_tree(tree); /* No need to reset the table as we never call write_row */ |