diff --git a/mysql-test/main/alter_table_online_debug.result b/mysql-test/main/alter_table_online_debug.result index 16e9fd190be..fcb665817ea 100644 --- a/mysql-test/main/alter_table_online_debug.result +++ b/mysql-test/main/alter_table_online_debug.result @@ -412,29 +412,29 @@ update t1 set b= 666 where a = 6; set debug_sync= 'now SIGNAL start_replication'; # First signal is for log description event. set debug_sync= 'now WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -3 53.390 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +3 53.390 0 set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -3 63.559 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +3 63.559 1 set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -3 71.610 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +3 71.610 2 set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -3 81.780 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +3 81.780 3 set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -3 89.831 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +3 89.831 4 set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -3 100.000 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +3 100.000 5 set debug_sync= 'now SIGNAL proceed WAIT_FOR locking'; begin; update t1 set b= 222 where a = 2; @@ -442,17 +442,17 @@ update t1 set b= 333 where a = 3; update t1 set b= 444 where a = 4; commit; set debug_sync= 'now SIGNAL end WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -4 33.333 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +4 33.333 6 set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -4 66.667 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +4 66.667 7 set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; -stage progress -4 100.000 +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +stage progress examined_rows +4 100.000 8 set debug_sync= 'now SIGNAL proceed'; connection default; select * from t1; diff --git a/mysql-test/main/alter_table_online_debug.test b/mysql-test/main/alter_table_online_debug.test index a45226b277a..c1e829392fc 100644 --- a/mysql-test/main/alter_table_online_debug.test +++ b/mysql-test/main/alter_table_online_debug.test @@ -510,22 +510,22 @@ eval set @con= $con; --echo # First signal is for log description event. set debug_sync= 'now WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR locking'; begin; @@ -537,13 +537,13 @@ update t1 set b= 444 where a = 4; commit; set debug_sync= 'now SIGNAL end WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed WAIT_FOR applied'; -select stage, progress from INFORMATION_SCHEMA.PROCESSLIST where id = @con; +select stage, progress, examined_rows from INFORMATION_SCHEMA.PROCESSLIST where id = @con; set debug_sync= 'now SIGNAL proceed'; --connection default diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc index ddf31877a57..138f04033c9 100644 --- a/sql/log_event_server.cc +++ b/sql/log_event_server.cc @@ -5202,6 +5202,8 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi) } // row processing loop while (error == 0 && (m_curr_row != m_rows_end)); + thd->inc_examined_row_count(m_row_count); + /* Restore the sql_mode after the rows event is processed. */