summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-06-04 13:26:18 +0300
committerGeorgi Kodinov <joro@sun.com>2009-06-04 13:26:18 +0300
commit8c18db4c8eb7fff4c94e11b96f14b51ab1f19cfa (patch)
treec78cd97041f7537234e71d1fb700c6954735a18c /sql/item.cc
parentd7bfc76deccc60636a4fbb4bebc386b9ec6bb184 (diff)
parenta037071a75cb388a17083ac0cca74e93b2dfd5d6 (diff)
downloadmariadb-git-8c18db4c8eb7fff4c94e11b96f14b51ab1f19cfa.tar.gz
merged 36995 to 5.1-bugteam
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 768af47d660..06eea020c23 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -417,6 +417,7 @@ Item::Item(THD *thd, Item *item):
name(item->name),
orig_name(item->orig_name),
max_length(item->max_length),
+ name_length(item->name_length),
marker(item->marker),
decimals(item->decimals),
maybe_null(item->maybe_null),
@@ -424,7 +425,9 @@ Item::Item(THD *thd, Item *item):
unsigned_flag(item->unsigned_flag),
with_sum_func(item->with_sum_func),
fixed(item->fixed),
+ is_autogenerated_name(item->is_autogenerated_name),
collation(item->collation),
+ with_subselect(item->with_subselect),
cmp_context(item->cmp_context)
{
next= thd->free_list; // Put in free list