database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge 10.0-base -> 10.0

Browse Source
This commit is contained in:
Sergey Petrunya
2013-10-16 13:38:42 +04:00
parent ce069b1f6b e62e1e8a3b
commit e5d13c1567
72 changed files with 8317 additions and 714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_union.cc
View File

@@ -622,6 +622,7 @@ bool st_select_lex_unit::exec()
ulonglong add_rows=0;
ha_rows examined_rows= 0;
DBUG_ENTER("st_select_lex_unit::exec");
bool was_executed= executed;
if (executed && !uncacheable && !describe)
DBUG_RETURN(FALSE);
@@ -630,6 +631,11 @@ bool st_select_lex_unit::exec()
item->make_const();
saved_error= optimize();
create_explain_query_if_not_exists(thd->lex, thd->mem_root);
if (!saved_error && !was_executed)
save_union_explain(thd->lex->explain);
if (uncacheable || !item || !item->assigned() || describe)
{
@@ -777,6 +783,9 @@ bool st_select_lex_unit::exec()
*/
if (!fake_select_lex->ref_pointer_array)
fake_select_lex->n_child_sum_items+= global_parameters->n_sum_items;
if (!was_executed)
save_union_explain_part2(thd->lex->explain);
saved_error= mysql_select(thd, &fake_select_lex->ref_pointer_array,
&result_table_list,