diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-11-22 14:08:43 +0300 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-11-22 14:08:43 +0300 |
| commit | f3c9b38ea3ee65e3131511fe55d029bf87150a66 (patch) | |
| tree | 9674db118cdbd175665678fbd60ed43eb2e29d92 /sql/item_sum.cc | |
| parent | 7c35c3d5e66b350b59fb0aaef4d1cc97f332bea7 (diff) | |
| parent | 5af294b9aa250f393fea101ba3534b27ab8b9dd7 (diff) | |
| download | mariadb-git-f3c9b38ea3ee65e3131511fe55d029bf87150a66.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21635
sql/item_sum.cc:
Auto merged
tests/mysql_client_test.c:
Manual merge.
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index b2ff62028c1..0d18cf1d424 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -322,9 +322,13 @@ void Item_sum::make_field(Send_field *tmp_field) if (args[0]->type() == Item::FIELD_ITEM && keep_field_type()) { ((Item_field*) args[0])->field->make_field(tmp_field); - tmp_field->db_name=(char*)""; - tmp_field->org_table_name=tmp_field->table_name=(char*)""; - tmp_field->org_col_name=tmp_field->col_name=name; + /* For expressions only col_name should be non-empty string. */ + char *empty_string= (char*)""; + tmp_field->db_name= empty_string; + tmp_field->org_table_name= empty_string; + tmp_field->table_name= empty_string; + tmp_field->org_col_name= empty_string; + tmp_field->col_name= name; if (maybe_null) tmp_field->flags&= ~NOT_NULL_FLAG; } |