diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-23 23:55:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-23 23:55:29 +0200 |
| commit | 06d65521923841999c6a9522af924b08476ef2e9 (patch) | |
| tree | f26966e0d3aedc3a535ecf69390809b428824e33 /sql/slave.h | |
| parent | a3bd38d66dd144ec42d842fb2655e94238d50496 (diff) | |
| parent | 53a44915c53a16f4c52c98227b71f44ae421025c (diff) | |
| download | mariadb-git-06d65521923841999c6a9522af924b08476ef2e9.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/slave.h')
| -rw-r--r-- | sql/slave.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/slave.h b/sql/slave.h index 4b5bc1686fb..e65b4a589a1 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -240,25 +240,19 @@ pthread_handler_t handle_slave_sql(void *arg); bool net_request_file(NET* net, const char* fname); extern bool volatile abort_loop; -extern Master_info main_mi, *active_mi; /* active_mi for multi-master */ +extern Master_info *active_mi; /* active_mi for multi-master */ extern Master_info *default_master_info; /* To replace active_mi */ extern Master_info_index *master_info_index; extern LEX_STRING default_master_connection_name; -extern LIST master_list; extern my_bool replicate_same_server_id; extern int disconnect_slave_event_count, abort_slave_event_count ; /* the master variables are defaults read from my.cnf or command line */ -extern uint master_port, master_connect_retry, report_port; -extern char * master_user, *master_password, *master_host; +extern uint report_port; extern char *master_info_file, *report_user; extern char *report_host, *report_password; -extern my_bool master_ssl; -extern char *master_ssl_ca, *master_ssl_capath, *master_ssl_cert; -extern char *master_ssl_cipher, *master_ssl_key; - extern I_List<THD> threads; #else |