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

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-09 08:33:08 +02:00
parent 1f2ff25eba 8494039757
commit 06b7fce9f2
579 changed files with 9031 additions and 4828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_delete.cc
View File

@ -27,7 +27,6 @@
#include "sql_delete.h"
#include "sql_cache.h" // query_cache_*
#include "sql_base.h" // open_temprary_table
#include "sql_table.h" // build_table_filename
#include "lock.h" // unlock_table_name
#include "sql_view.h" // check_key_in_view, mysql_frm_type
#include "sql_parse.h" // mysql_init_select
@ -488,6 +487,9 @@ bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds,
DBUG_EXECUTE_IF("show_explain_probe_delete_exec_start",
dbug_serve_apcs(thd, 1););
if (!(select && select->quick))
status_var_increment(thd->status_var.delete_scan_count);
if (query_plan.using_filesort)
{