summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-20 14:57:29 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-20 14:57:29 +0200
commit7f6f53a8df10c76f93848c8d06bc5af71051c525 (patch)
tree9a539823cdf05f53574fdf91941b3a242025acba /sql/item_subselect.cc
parent0e7e724d6b36b2f5b8a0604171adb750d7c82c9c (diff)
parent280fcf08085e43b5359ec79c0e34166e51b3ebd8 (diff)
downloadmariadb-git-7f6f53a8df10c76f93848c8d06bc5af71051c525.tar.gz
5.2 merge
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index b1577d6a037..9d7edda8eb5 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -255,6 +255,7 @@ bool Item_subselect::fix_fields(THD *thd_param, Item **ref)
(*ref)= substitution;
substitution->name= name;
+ substitution->name_length= name_length;
if (have_to_be_excluded)
engine->exclude();
substitution= 0;