diff options
author | Monty <monty@mariadb.org> | 2016-01-03 13:20:07 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2016-01-03 13:20:07 +0200 |
commit | 661a6d89065390ca1e9b4be05219b75f850ed290 (patch) | |
tree | 5e58bf86d9880d4cfc23eb71e074135b9e3ed45a /sql/rpl_mi.h | |
parent | 4b4777ab63522b2bdd1f98ad03558a5b1da53dc0 (diff) | |
download | mariadb-git-661a6d89065390ca1e9b4be05219b75f850ed290.tar.gz |
Cleanup of slave code:
- Added testing if connection is killed to shortcut reading of connection data
This will allow us later in 10.2 to do a cleaner shutdown of slaves (less errors in the log)
- Add new status variables: Slaves_connected, Slaves_running and Slave_connections.
- Use MYSQL_SLAVE_NOT_RUN instead of 0 with slave_running.
- Don't print obvious extra warnings to the error log when slave is shut down normally.
Diffstat (limited to 'sql/rpl_mi.h')
-rw-r--r-- | sql/rpl_mi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index 2b0b40feb3d..a27672e4c90 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -218,7 +218,7 @@ public: Master_info *get_master_info(LEX_STRING *connection_name, Sql_condition::enum_warning_level warning); bool give_error_if_slave_running(); - bool any_slave_sql_running(); + uint any_slave_sql_running(); bool start_all_slaves(THD *thd); bool stop_all_slaves(THD *thd); }; |