database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.0 -> 10.1.

Browse Source 
Conflicts:
	mysql-test/suite/multi_source/multisource.result
	sql/sql_base.cc
This commit is contained in:
Kristian Nielsen
2015-04-17 15:18:44 +02:00
parent 8125db1d9a 702fdc52fa
commit 167332597f
32 changed files with 506 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/rpl_mi.h
View File

@ -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);
};