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 | 4743ba00bbe8e314230a98fba153271816459ba4 (patch) | |
| tree | 988c67022a5a8af1b1136f0071a5bd19314a3a73 /sql/sql_select.cc | |
| parent | f57cba0ca0431edc9af7931d39067ed2c55572c2 (diff) | |
| parent | 2993c299d7b65beec7d4fbeec8b981c6a4795694 (diff) | |
| download | mariadb-git-4743ba00bbe8e314230a98fba153271816459ba4.tar.gz | |
Bug #11827369: ASSERTION FAILED: !THD->LEX->CONTEXT_ANALYSIS_ONLY
Manual up-merge from 5.1 to 5.5.
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 7ffba371b53..02444c239ec 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7449,7 +7449,7 @@ remove_const(JOIN *join,ORDER *first_order, COND *cond, *simple_order=0; // Must do a temp table to sort else if (!(order_tables & not_const_tables)) { - if (order->item[0]->with_subselect && + if (order->item[0]->has_subquery() && !(join->select_lex->options & SELECT_DESCRIBE)) order->item[0]->val_str(&order->item[0]->str_value); DBUG_PRINT("info",("removing: %s", order->item[0]->full_name())); |