diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-25 16:32:47 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-06-25 16:32:47 +0300 |
| commit | dbd40508f0983677bff6d65c6428a50758b23eeb (patch) | |
| tree | 45ae72f4a1e319c48f0c80ac2781c4246338f0c1 /sql/sql_select.cc | |
| parent | 68c5b5445e9dd2b3cc92ca139a622347e78b2db6 (diff) | |
| parent | 8fc01031bfbb5618a9168bd7629e577b4866ede9 (diff) | |
| download | mariadb-git-dbd40508f0983677bff6d65c6428a50758b23eeb.tar.gz | |
merge
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 3e03920980f..211119de6f1 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -7358,7 +7358,8 @@ 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]->with_subselect && + !(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())); continue; // skip const item |