diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-06-23 19:37:24 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-06-23 19:37:24 -0600 |
commit | bcc51cb0a3d9fcf4e02ac2201a0a0a5a5538f17f (patch) | |
tree | d6cc479d4e3c59cd207caf465ed545d6dd6e1cc2 /sql/slave.h | |
parent | a697e30a3aa928d6896a45af4b762737d6906022 (diff) | |
download | mariadb-git-bcc51cb0a3d9fcf4e02ac2201a0a0a5a5538f17f.tar.gz |
show master forced rotate info in SHOW BINLOG EVENTS
mark a master-forced rotate with a special flag
mysql-test/r/rpl000014.result:
updated result
mysql-test/r/rpl000015.result:
updated result
mysql-test/r/rpl000016.result:
updated result
mysql-test/r/rpl_log.result:
updated result
mysql-test/t/rpl000017-slave.sh:
fix for change in master.info format
mysql-test/t/rpl_log.test:
test for correct last_log_seq in show slave status
sql/log.cc:
mark a master-forced rotate with a special flag
sql/log_event.cc:
show master forced rotate info in SHOW BINLOG EVENTS
sql/log_event.h:
master forced rotation flag
sql/slave.cc:
keep trace of last log sequences in MASTER_INFO
do not rotate on slave, if the rotation on master was forced by its master
sql/slave.h:
keep track of last log sequence number in MASTER_INFO
Diffstat (limited to 'sql/slave.h')
-rw-r--r-- | sql/slave.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index f4696a18a56..d9131bb53be 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -15,11 +15,12 @@ typedef struct st_master_info char password[HASH_PASSWORD_LENGTH+1]; uint port; uint connect_retry; + uint32 last_log_seq; // log sequence number of last processed event pthread_mutex_t lock; pthread_cond_t cond; bool inited; - st_master_info():pending(0),fd(-1),inited(0) + st_master_info():pending(0),fd(-1),last_log_seq(0),inited(0) { host[0] = 0; user[0] = 0; password[0] = 0; pthread_mutex_init(&lock, MY_MUTEX_INIT_FAST); |