diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-17 15:18:44 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-17 15:18:44 +0200 |
| commit | 167332597f03f73057fbb4684687a013596181bd (patch) | |
| tree | 1256610eb3a54a2e6f847badea452e3fc274a5c0 /sql/rpl_mi.h | |
| parent | 8125db1d9ae489162f08560f42c60c10a316afbc (diff) | |
| parent | 702fdc52fa02c5f20004d169ad48494122d8ffed (diff) | |
| download | mariadb-git-167332597f03f73057fbb4684687a013596181bd.tar.gz | |
Merge 10.0 -> 10.1.
Conflicts:
mysql-test/suite/multi_source/multisource.result
sql/sql_base.cc
Diffstat (limited to 'sql/rpl_mi.h')
| -rw-r--r-- | sql/rpl_mi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h index b74b9cb42b3..7ba64a9dc92 100644 --- a/sql/rpl_mi.h +++ b/sql/rpl_mi.h @@ -345,6 +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(); bool start_all_slaves(THD *thd); bool stop_all_slaves(THD *thd); }; |