database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

backporting bug@27808 fixes

Browse Source
This commit is contained in:
Andrei Elkin
2009-10-01 19:44:53 +03:00
parent c676cebbea
commit d91aa57c38
62 changed files with 1127 additions and 513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/rpl_mi.h
View File

@@ -20,6 +20,7 @@
#include "rpl_rli.h"
#include "rpl_reporting.h"
#include "my_sys.h"
/*****************************************************************************
@@ -60,6 +61,7 @@ class Master_info : public Slave_reporting_capability
public:
Master_info();
~Master_info();
bool shall_ignore_server_id(ulong s_id);
/* the variables below are needed because we can change masters on the fly */
char master_log_name[FN_REFLEN];
@@ -83,8 +85,6 @@ class Master_info : public Slave_reporting_capability
Relay_log_info rli;
uint port;
uint connect_retry;
float heartbeat_period; // interface with CHANGE MASTER or master.info
ulonglong received_heartbeats; // counter of received heartbeat events
#ifndef DBUG_OFF
int events_till_disconnect;
#endif
@@ -102,6 +102,10 @@ class Master_info : public Slave_reporting_capability
*/
long clock_diff_with_master;
float heartbeat_period; // interface with CHANGE MASTER or master.info
ulonglong received_heartbeats; // counter of received heartbeat events
DYNAMIC_ARRAY ignore_server_ids;
ulong master_id;
};
void init_master_info_with_options(Master_info* mi);
@@ -111,6 +115,7 @@ int init_master_info(Master_info* mi, const char* master_info_fname,
int thread_mask);
void end_master_info(Master_info* mi);
int flush_master_info(Master_info* mi, bool flush_relay_log_cache);
int change_master_server_id_cmp(ulong *id1, ulong *id2);
#endif /* HAVE_REPLICATION */
#endif /* RPL_MI_H */