diff options
| author | Ramil Kalimullin <ramil.kalimullin@oracle.com> | 2012-03-05 22:36:56 +0400 |
|---|---|---|
| committer | Ramil Kalimullin <ramil.kalimullin@oracle.com> | 2012-03-05 22:36:56 +0400 |
| commit | d371d5394531fc371facf2081763f66a5dd4ed94 (patch) | |
| tree | 7c42dc5cc151be239f1ffc2ef5ca6fb09a66fe70 /sql/item_subselect.cc | |
| parent | 6d393110fa275f48464296f96fd69b1e441311db (diff) | |
| parent | 30d32207e724ebf9dca7c2ecdaec04b076cd902b (diff) | |
| download | mariadb-git-d371d5394531fc371facf2081763f66a5dd4ed94.tar.gz | |
Auto-merge from mysql-5.1-security.
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 1 |
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; |