diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-05 23:29:37 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-05 23:29:37 +0200 |
| commit | c533e47714851a804c3e212097584aa7a3e7c419 (patch) | |
| tree | b2bfcb415d4beb8645a2aecf2612bb83a6220f25 /sql | |
| parent | e34085fe13c7572ae355b456e5d9eb751bacdf7f (diff) | |
| parent | 6010bd18ae63ba22971f7ecf3f3aa4af70a4b3d3 (diff) | |
| download | mariadb-git-c533e47714851a804c3e212097584aa7a3e7c419.tar.gz | |
auto-merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 7c4e86d756f..7a81e48fcee 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -409,6 +409,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), @@ -416,7 +417,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 |