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/log_event.cc | |
| 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/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 94ef3736cbf..e50c650d581 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -189,7 +189,11 @@ void Load_log_event::pack_info(String* packet) void Rotate_log_event::pack_info(String* packet) { - net_store_data(packet, new_log_ident, ident_len); + String tmp; + tmp.append(new_log_ident, ident_len); + if(flags & LOG_EVENT_FORCED_ROTATE_F) + tmp.append("; forced by master"); + net_store_data(packet, tmp.ptr(), tmp.length()); } void Intvar_log_event::pack_info(String* packet) |