diff options
| author | serg@serg.mylan <> | 2004-04-07 16:20:46 +0200 |
|---|---|---|
| committer | serg@serg.mylan <> | 2004-04-07 16:20:46 +0200 |
| commit | 6ebf869b40a096c1d6a6ccdd42364c0ad4a20bc7 (patch) | |
| tree | 8e3d0724200afbcae1e7e7b321b2e166b4f4cd39 /sql/item_sum.cc | |
| parent | 61fd95d168b51092b7ce3ff56b2c8c8ed1a49c0f (diff) | |
| parent | 6fc74e13e7c175acecca86692ae4ce4209de203f (diff) | |
| download | mariadb-git-6ebf869b40a096c1d6a6ccdd42364c0ad4a20bc7.tar.gz | |
merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 3213ff94ab5..eac8d31b256 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -941,7 +941,7 @@ Item_sum_hybrid::min_max_update_str_field() if (!args[0]->null_value) { res_str->strip_sp(); - result_field->val_str(&tmp_value,&tmp_value); + result_field->val_str(&tmp_value); if (result_field->is_null() || (cmp_sign * sortcmp(res_str,&tmp_value,cmp_charset)) < 0) @@ -1655,8 +1655,7 @@ int dump_leaf_key(byte* key, uint32 count __attribute__((unused)), Item_func_group_concat *item) { char buff[MAX_FIELD_WIDTH]; - String tmp((char*) &buff, sizeof(buff), default_charset_info); - String tmp2((char *) &buff, sizeof(buff), default_charset_info); + String tmp((char *)&buff,sizeof(buff),default_charset_info), tmp2; char *record= (char*) item->table->record[0]; tmp.length(0); |