Commit c0a741f0 authored by Sergey Petrunya's avatar Sergey Petrunya

Fix buildbot failures:

- MYSQL_MULTI_DELETE_DONE probe compile failure
- show_explain_non_select.test
parent 7be365ea
#
# SHOW EXPLAIN tests for non-select subqueries
#
#--source include/have_debug.inc
#--source include/have_innodb.inc
#--source include/not_embedded.inc
--source include/have_debug.inc
--source include/have_innodb.inc
--source include/not_embedded.inc
--disable_warnings
drop table if exists t0, t1;
......
......@@ -3288,7 +3288,7 @@ end_with_restore_list:
DBUG_ASSERT(first_table == all_tables && first_table != 0);
TABLE_LIST *aux_tables= thd->lex->auxiliary_table_list.first;
bool explain= test(lex->describe);
select_result *result;
multi_delete *result;
if ((res= multi_delete_precheck(thd, all_tables)))
break;
......@@ -3328,7 +3328,7 @@ end_with_restore_list:
result, unit, select_lex);
res|= thd->is_error();
MYSQL_MULTI_DELETE_DONE(res, del_result->num_deleted());
MYSQL_MULTI_DELETE_DONE(res, result->num_deleted());
if (res)
result->abort_result_set(); /* for both DELETE and EXPLAIN DELETE */
else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment