summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil.kalimullin@oracle.com>2012-03-05 22:36:56 +0400
committerRamil Kalimullin <ramil.kalimullin@oracle.com>2012-03-05 22:36:56 +0400
commit036a1e842a16a7726a4a554fd492d9eac15d6d1c (patch)
tree7c42dc5cc151be239f1ffc2ef5ca6fb09a66fe70 /sql/item_subselect.cc
parent663b99d2274672768145cfa9954e405c45160175 (diff)
parent97c429f65b14335a3322c0c78700582e136607ec (diff)
downloadmariadb-git-036a1e842a16a7726a4a554fd492d9eac15d6d1c.tar.gz
Auto-merge from mysql-5.1-security.
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 0c4b96f7be0..458465ea8f7 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -182,6 +182,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;