diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-26 14:17:27 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-08-26 14:17:27 +0400 |
| commit | d63b9feb103b5ebb2b4af378e1d2f420059e3e4b (patch) | |
| tree | 55929835a9c3e8f2676411ce6815b3cd091c7e5a /sql/field.cc | |
| parent | 8f87d12da1b678343bd7a611f7cbd50b368b6afa (diff) | |
| parent | 8a310d69f2b2b1172316d728050228fd15afe6fe (diff) | |
| download | mariadb-git-d63b9feb103b5ebb2b4af378e1d2f420059e3e4b.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 3c93ffadac5..c9b5f980ae5 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1564,7 +1564,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; |