summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergey Glukhov <gluh@mysql.com>2008-08-20 16:42:01 +0500
committerSergey Glukhov <gluh@mysql.com>2008-08-20 16:42:01 +0500
commitfad69f17c1323b1ab700d4e9363c6f50341b3711 (patch)
tree3a450116a7ea8608a8d2e04921b67e9e6b2520de /sql
parentb9bfa25fb20d410bf83925df9c813beca95025b4 (diff)
parentde73b729543f40f46463c0134e380057ee4adb27 (diff)
downloadmariadb-git-fad69f17c1323b1ab700d4e9363c6f50341b3711.tar.gz
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql')
-rw-r--r--sql/item.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 48fcb232bab..3f41c7211c8 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -5930,6 +5930,10 @@ void Item_ref::make_field(Send_field *field)
field->table_name= table_name;
if (db_name)
field->db_name= db_name;
+ if (orig_field_name)
+ field->org_col_name= orig_field_name;
+ if (orig_table_name)
+ field->org_table_name= orig_table_name;
}