diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-05-24 00:41:18 +0400 |
| commit | 598cf5aec7c7cf4dbb158c87d80916b6e58e7ae6 (patch) | |
| tree | f4f37b22f4271c44aa03c55abe609a058828bedc /sql/sql_update.cc | |
| parent | dabd4a1c55cabbe73350c7c9b4c2bd6ab2db2b5c (diff) | |
| parent | d72a4710aaad2f1e76ac20d50793f13f941ef899 (diff) | |
| download | mariadb-git-598cf5aec7c7cf4dbb158c87d80916b6e58e7ae6.tar.gz | |
Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.
Conflicts:
conflict Makefile.am
conflict mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
conflict mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
conflict sql/opt_sum.cc
conflict sql/set_var.cc
conflict sql/sql_base.cc
conflict sql/sql_priv.h
conflict sql/sql_show.cc
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 2abd307deba..2a017a4a64c 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -436,6 +436,7 @@ int mysql_update(THD *thd, { goto err; } + thd->examined_row_count+= examined_rows; /* Filesort has already found and selected the rows we want to update, so we don't need the where clause @@ -482,6 +483,7 @@ int mysql_update(THD *thd, while (!(error=info.read_record(&info)) && !thd->killed) { + thd->examined_row_count++; if (!(select && select->skip_record())) { if (table->file->was_semi_consistent_read()) @@ -588,6 +590,7 @@ int mysql_update(THD *thd, while (!(error=info.read_record(&info)) && !thd->killed) { + thd->examined_row_count++; if (!(select && select->skip_record())) { if (table->file->was_semi_consistent_read()) |