diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-14 16:29:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-14 16:29:23 +0200 |
| commit | dd13db6f4ae70f45038c1d000cb1439e17170d98 (patch) | |
| tree | 54f4631095339c004a572909a9909c291e16528d /mysql-test/suite/rpl/t/rpl_000011.test | |
| parent | bde11c1ab59c40be6043e156b0427e1d7105ec85 (diff) | |
| download | mariadb-git-dd13db6f4ae70f45038c1d000cb1439e17170d98.tar.gz | |
MDEV-5829: STOP SLAVE resets global status variables
Reason for the bug was an optimization for higher connect speed where we moved when global status was updated,
but forgot to update states when slave thread dies.
Fixed by adding thd->add_status_to_global() before deleting slave thread's thd.
mysys/my_delete.c:
Added missing newline
sql/mysqld.cc:
Use add_status_to_global()
sql/slave.cc:
Added missing add_status_to_global()
sql/sql_class.cc:
Use add_status_to_global()
sql/sql_class.h:
Simplify adding local status to global by adding add_status_to_global()
Diffstat (limited to 'mysql-test/suite/rpl/t/rpl_000011.test')
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_000011.test | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_000011.test b/mysql-test/suite/rpl/t/rpl_000011.test index 625b0c22c62..faad2242235 100644 --- a/mysql-test/suite/rpl/t/rpl_000011.test +++ b/mysql-test/suite/rpl/t/rpl_000011.test @@ -1,9 +1,17 @@ +# +# Test very simply slave replication (to ensure it works at all) +# In addition, test also: +# MDEV-5829 STOP SLAVE resets global status variables +# + source include/master-slave.inc; create table t1 (n int); insert into t1 values(1); sync_slave_with_master; +show global status like 'com_insert'; stop slave; +show global status like 'com_insert'; --source include/wait_for_slave_to_stop.inc start slave; --source include/wait_for_slave_to_start.inc |