diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-05-07 22:20:42 +0200 |
| commit | 5be07ceaddcae282a1c41b62fb3222715c773577 (patch) | |
| tree | fd4bc4e87a0385cd676cd34fe9ba93dd57358f2e /sql/item_subselect.cc | |
| parent | 1d47bbe3bf80f5fbd2770d56c97f788f8401ffa0 (diff) | |
| parent | 83d455be90a06e8fc1293a611061bd9529ed8536 (diff) | |
| download | mariadb-git-5be07ceaddcae282a1c41b62fb3222715c773577.tar.gz | |
Merge 5.5.24 back into main 5.5.
This is a weave merge, but without any conflicts.
In 14 source files, the copyright year needed to be updated to 2012.
Diffstat (limited to 'sql/item_subselect.cc')
| -rw-r--r-- | sql/item_subselect.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index a6bcdbd8645..97b8dbbe113 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -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; |