database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix buildbot failures:

Browse Source 
- MYSQL_MULTI_DELETE_DONE probe compile failure
- show_explain_non_select.test
This commit is contained in:
Sergey Petrunya
2013-10-15 16:39:54 +04:00
parent 7be365ea9c
commit c0a741f005
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@ -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