diff options
author | Gleb Shchepa <gshchepa@mysql.com> | 2009-05-19 00:51:52 +0500 |
---|---|---|
committer | Gleb Shchepa <gshchepa@mysql.com> | 2009-05-19 00:51:52 +0500 |
commit | d4be7dadb8085facb90de4e68444903ecdb23310 (patch) | |
tree | 197dd2e2bdd4cbd7775f332cb827834ff7737492 /sql/item.cc | |
parent | bb3f97f4bfa7946e83bf69bc962efff8131bd11a (diff) | |
parent | a7294532b2f45342075d2a1bdac6cb8720a90ea3 (diff) | |
download | mariadb-git-d4be7dadb8085facb90de4e68444903ecdb23310.tar.gz |
manual merge 5.0-bugteam --> 5.1-bugteam (bug 40825)
Diffstat (limited to 'sql/item.cc')
-rw-r--r-- | sql/item.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 4d9dc50226f..8a8c3610198 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -5810,7 +5810,8 @@ void Item_ref::print(String *str, enum_query_type query_type) !table_name && name && alias_name_used) { THD *thd= current_thd; - append_identifier(thd, str, name, (uint) strlen(name)); + append_identifier(thd, str, (*ref)->real_item()->name, + (*ref)->real_item()->name_length); } else (*ref)->print(str, query_type); |