diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-24 14:44:15 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-24 14:44:15 +0400 |
| commit | 0012d0d884b5ab8097d3b2fcda3a58dfe0ba6375 (patch) | |
| tree | c9d948ebbec6cbf77e58eb8c68710063542130ce /sql/field.cc | |
| parent | b54bb190ced5a990ca69fc18ffb9482242739172 (diff) | |
| parent | cd4ca4b7a3d8e2971f76858895b36829d27fe845 (diff) | |
| download | mariadb-git-0012d0d884b5ab8097d3b2fcda3a58dfe0ba6375.tar.gz | |
Automerge.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index c887a5f1c9b..619e6a780da 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1535,7 +1535,7 @@ void Field::make_field(Send_field *field) } else field->org_table_name= field->db_name= ""; - if (orig_table) + if (orig_table && orig_table->alias) { field->table_name= orig_table->alias; field->org_col_name= field_name; |