diff options
| author | Gleb Shchepa <gleb.shchepa@oracle.com> | 2013-01-31 09:13:42 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gleb.shchepa@oracle.com> | 2013-01-31 09:13:42 +0400 |
| commit | dff10afb208ccfc2abc5211ffc807827d1769d73 (patch) | |
| tree | 988c67022a5a8af1b1136f0071a5bd19314a3a73 /sql/item.cc | |
| parent | 4dcd030420584ad6d851863de4e87745fcfb080a (diff) | |
| parent | 7ebfe30b53f3b07d0805493754f418f8a4837beb (diff) | |
| download | mariadb-git-dff10afb208ccfc2abc5211ffc807827d1769d73.tar.gz | |
Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLY
Manual up-merge from 5.1 to 5.5.
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc index 95563e31887..18831b83eae 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2000, 2013, 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 @@ -472,7 +472,7 @@ Item::Item(THD *thd, Item *item): fixed(item->fixed), is_autogenerated_name(item->is_autogenerated_name), collation(item->collation), - with_subselect(item->with_subselect), + with_subselect(item->has_subquery()), cmp_context(item->cmp_context) { next= thd->free_list; // Put in free list |