removed fake description (EXPLAIN) of first table for last SELECT_LEX with global parameters, because now it is absent
This commit is contained in:
parent
f0503007f8
commit
510a4d1da1
@ -35,7 +35,6 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
|
|||||||
int res;
|
int res;
|
||||||
bool found_rows_for_union=false;
|
bool found_rows_for_union=false;
|
||||||
TABLE_LIST result_table_list;
|
TABLE_LIST result_table_list;
|
||||||
TABLE_LIST *first_table=(TABLE_LIST *)lex->select_lex.table_list.first;
|
|
||||||
TMP_TABLE_PARAM tmp_table_param;
|
TMP_TABLE_PARAM tmp_table_param;
|
||||||
select_union *union_result;
|
select_union *union_result;
|
||||||
DBUG_ENTER("mysql_union");
|
DBUG_ENTER("mysql_union");
|
||||||
@ -127,8 +126,7 @@ int mysql_union(THD *thd, LEX *lex,select_result *result)
|
|||||||
sl->options&= ~OPTION_FOUND_ROWS;
|
sl->options&= ~OPTION_FOUND_ROWS;
|
||||||
|
|
||||||
res= mysql_select(thd,
|
res= mysql_select(thd,
|
||||||
(describe && sl->linkage==GLOBAL_OPTIONS_TYPE) ?
|
(TABLE_LIST*) sl->table_list.first,
|
||||||
first_table : (TABLE_LIST*) sl->table_list.first,
|
|
||||||
sl->item_list,
|
sl->item_list,
|
||||||
sl->where,
|
sl->where,
|
||||||
(sl->braces) ?
|
(sl->braces) ?
|
||||||
|
Loading…
x
Reference in New Issue
Block a user