summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2012-05-18 14:23:05 +0200
committerSergei Golubchik <sergii@pisem.net>2012-05-18 14:23:05 +0200
commit280fcf08085e43b5359ec79c0e34166e51b3ebd8 (patch)
tree0180226f5648752d1d5bc2b7dd23e7cecf3253b1 /sql/item_subselect.cc
parent5a47413934a0ba0aeb91224f1010bb70bd9b1e8a (diff)
parent57f824b0990b0a8708665a4a9ede245ce6064539 (diff)
downloadmariadb-git-280fcf08085e43b5359ec79c0e34166e51b3ebd8.tar.gz
5.1 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 15c8bbfe395..fc214a584ee 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -177,6 +177,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;