database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +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

8
sql/sql_update.cc
View File

@@ -526,6 +526,9 @@ int mysql_update(THD *thd,
DBUG_EXECUTE_IF("show_explain_probe_update_exec_start",
dbug_serve_apcs(thd, 1););
if (!(select && select->quick))
status_var_increment(thd->status_var.update_scan_count);
if (query_plan.using_filesort || query_plan.using_io_buffer)
{
/*
@@ -583,6 +586,7 @@ int mysql_update(THD *thd,
close_cached_file(&tempfile);
goto err;
}
table->file->try_semi_consistent_read(1);
/*
@@ -621,7 +625,7 @@ int mysql_update(THD *thd,
thd->inc_examined_row_count(1);
if (!select || (error= select->skip_record(thd)) > 0)
{
if (table->file->was_semi_consistent_read())
if (table->file->ha_was_semi_consistent_read())
continue; /* repeat the read of the same row if it still exists */
explain->buf_tracker.on_record_after_where();
@@ -740,7 +744,7 @@ int mysql_update(THD *thd,
thd->inc_examined_row_count(1);
if (!select || select->skip_record(thd) > 0)
{
if (table->file->was_semi_consistent_read())
if (table->file->ha_was_semi_consistent_read())
continue; /* repeat the read of the same row if it still exists */
explain->tracker.on_record_after_where();