diff options
| author | evgen@moonbone.local <> | 2007-09-28 23:27:23 +0000 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-09-28 23:27:23 +0000 |
| commit | 77dabba63f864e9f88ba5dbc365202c446051be1 (patch) | |
| tree | eb6cc71abd40b9945aa746fa74a351cd2ec22a60 /sql/field.cc | |
| parent | fbdf00f08553d3fdc84b2e437cb8ee03a5beece8 (diff) | |
| parent | b9e81c2ae3f838194f181b8fb1b389dd42334211 (diff) | |
| download | mariadb-git-77dabba63f864e9f88ba5dbc365202c446051be1.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/27990-bug-5.0-opt-mysql
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index 8191d885a27..e6e4195ba1e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1356,15 +1356,25 @@ void Field_num::add_zerofill_and_unsigned(String &res) const void Field::make_field(Send_field *field) { - if (orig_table->s->table_cache_key && *(orig_table->s->table_cache_key)) + if (orig_table && orig_table->s->table_cache_key && + *(orig_table->s->table_cache_key)) { field->org_table_name= orig_table->s->table_name; field->db_name= orig_table->s->table_cache_key; } else field->org_table_name= field->db_name= ""; - field->table_name= orig_table->alias; - field->col_name= field->org_col_name= field_name; + if (orig_table) + { + field->table_name= orig_table->alias; + field->org_col_name= field_name; + } + else + { + field->table_name= ""; + field->org_col_name= ""; + } + field->col_name= field_name; field->charsetnr= charset()->number; field->length=field_length; field->type=type(); |