diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-01-25 22:58:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-01-25 22:58:57 +0100 |
| commit | f4faac4d6ad31acc96b9edf8c322f3031123dfe0 (patch) | |
| tree | 8c7b112e3464149928db6b0bb7c7ddd9067f69c9 /sql/rpl_mi.h | |
| parent | 2ff65ba53190ad897fc41f546fc4a7bdc80d9054 (diff) | |
| parent | 666b9663f94c2a4f39d331b28fabd09f2dc43bf2 (diff) | |
| download | mariadb-git-f4faac4d6ad31acc96b9edf8c322f3031123dfe0.tar.gz | |
Merge branch '10.0' into 10.1
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 69d602c1dcb..9365c065ea9 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -345,7 +345,7 @@ public: Master_info *get_master_info(const 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); }; |