diff --git a/mysql-test/t/show_explain_non_select.test b/mysql-test/t/show_explain_non_select.test index f71affd8a6e..21b16739141 100644 --- a/mysql-test/t/show_explain_non_select.test +++ b/mysql-test/t/show_explain_non_select.test @@ -1,9 +1,9 @@ # # 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; diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index d7d2358e5d5..a28cafe524a 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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