diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-04 03:27:47 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-04 03:27:47 +0200 |
| commit | adfe2c3ab4f62288458de25175312de3e1b6a29c (patch) | |
| tree | 3a6bba47bac328cc93f9cd819173f03f417cb0d9 /sql/item.cc | |
| parent | 55cb867968297072192a1736af708ca156ca69d7 (diff) | |
| parent | 5f64e3e8436c56a4e77879db0b47e7f9672fdad8 (diff) | |
| download | mariadb-git-adfe2c3ab4f62288458de25175312de3e1b6a29c.tar.gz | |
merge
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sql/item.cc b/sql/item.cc index 0d39b95b570..d6f0d59e058 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -721,11 +721,13 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) void Item::init_make_field(Send_field *tmp_field, enum enum_field_types field_type) { - tmp_field->db_name=(char*) ""; - tmp_field->org_table_name=(char*) ""; - tmp_field->org_col_name=(char*) ""; - tmp_field->table_name=(char*) ""; - tmp_field->col_name=name; + char *empty_name= (char*) ""; + tmp_field->db_name= empty_name; + tmp_field->org_table_name= empty_name; + tmp_field->org_col_name= empty_name; + tmp_field->table_name= empty_name; + tmp_field->col_name= name; + tmp_field->charsetnr= charset()->number; tmp_field->flags=maybe_null ? 0 : NOT_NULL_FLAG; tmp_field->type=field_type; tmp_field->length=max_length; |