From abf95afa2a1c23f3c7aa42f44fc665450ebeeea1 Mon Sep 17 00:00:00 2001 From: halfspawn Date: Fri, 7 Jul 2017 17:50:09 +0200 Subject: MDEV-12137 DELETE statement with the same source and target single-table deletes only --- sql/sql_delete.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/sql_delete.h') diff --git a/sql/sql_delete.h b/sql/sql_delete.h index 9cd09dc5722..d49b0114c52 100644 --- a/sql/sql_delete.h +++ b/sql/sql_delete.h @@ -27,7 +27,8 @@ typedef class Item COND; template class SQL_I_List; int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, - uint wild_num, List &field_list, Item **conds); + uint wild_num, List &field_list, Item **conds, + uint &delete_while_scanning); bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_I_List *order, ha_rows rows, ulonglong options, select_result *result); -- cgit v1.2.1 From c65cce3698edde272b8452c1fecec3d9522cea6e Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 7 Jul 2017 19:55:31 +0200 Subject: MDEV-12137 DELETE statement with the same source and target * various cleanups (mostly cosmetic) * remove useless tests (that were tesing the error condition) * optimize delete_use_source test (from 6 mins to 50 seconds, mainly by removing two huge rollbacks at the end). --- sql/sql_delete.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/sql_delete.h') diff --git a/sql/sql_delete.h b/sql/sql_delete.h index d49b0114c52..54d6cf146b5 100644 --- a/sql/sql_delete.h +++ b/sql/sql_delete.h @@ -28,7 +28,7 @@ template class SQL_I_List; int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, uint wild_num, List &field_list, Item **conds, - uint &delete_while_scanning); + bool *delete_while_scanning); bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_I_List *order, ha_rows rows, ulonglong options, select_result *result); -- cgit v1.2.1