diff options
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index c8a335497e9..cd6b43da21d 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -824,8 +824,8 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) if ((res= unit->prepare(derived, derived->derived_result, 0))) goto exit; if (derived->with && - (res= derived->with->rename_columns_of_derived_unit(thd, unit))) - goto exit; + (res= derived->with->process_columns_of_derived_unit(thd, unit))) + goto exit; if ((res= check_duplicate_names(thd, unit->types, 0))) goto exit; @@ -1251,13 +1251,12 @@ bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived) { SELECT_LEX *first_select= unit->first_select(); unit->set_limit(unit->global_parameters()); - if (unit->select_limit_cnt == HA_POS_ERROR) + if (unit->lim.is_unlimited()) first_select->options&= ~OPTION_FOUND_ROWS; lex->current_select= first_select; res= mysql_select(thd, first_select->table_list.first, - first_select->with_wild, first_select->item_list, first_select->where, (first_select->order_list.elements+ first_select->group_list.elements), |