diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
| commit | bc2e383e4a0dbc1949d5b65102e843c01237e23c (patch) | |
| tree | 23bb774ead6f6cc840c11c0536f3f59c5d417aca /sql/field.cc | |
| parent | 4cce72a9292c98fab5628adc24c1635e315444e7 (diff) | |
| parent | 4cfa91f42c4cde9c35979cd2b9837cb60213d876 (diff) | |
| download | mariadb-git-bc2e383e4a0dbc1949d5b65102e843c01237e23c.tar.gz | |
mysql-5.1 -> mysql-5.5 merge
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 728cd7e4090..be7441f6bfd 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; |