diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-06-26 17:02:33 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-06-26 17:02:33 -0600 |
| commit | d2a5fab24def903a681b0534ac30ef9c525d4670 (patch) | |
| tree | 68843be68cdb392645cde55e6ce4669ce7b98c67 /mysql-test/r/rpl_log.result | |
| parent | f246b619153704f78ecc60361470f3f664fc6493 (diff) | |
| download | mariadb-git-d2a5fab24def903a681b0534ac30ef9c525d4670.tar.gz | |
--do-test option in mysql-test-run - will do only tests that match the pattern
updated rotate event to set new position along with the new log
mysql-test/mysql-test-run.sh:
added --do-test
mysql-test/r/rpl_log.result:
update for new rotate event format
sql/log_event.cc:
rotate event now supports forcing a new position, not just the log
sql/log_event.h:
clean-up of rotate event, support for position force with rotate event
sql/slave.cc:
accept position setting from rotate event
sql/sql_repl.cc:
updates to fake_rotate_event() for the new format
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 0ccc948de89..32f90f0711a 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -23,8 +23,8 @@ master-bin.001 263 Query 1 5 use test; drop table t1 master-bin.001 311 Query 1 6 use test; create table t1 (word char(20) not null) master-bin.001 386 Load 1 7 use test; LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1 FIELDS TERMINATED BY '\t' ESCAPED BY '\\' LINES TERMINATED BY '\n' (word) master-bin.001 468 Query 1 8 use test; drop table t1 -master-bin.001 516 Rotate 1 9 master-bin.002 -master-bin.001 549 Stop 1 10 +master-bin.001 516 Rotate 1 9 master-bin.002;pos=4 +master-bin.001 557 Stop 1 10 Log_name Pos Event_type Server_id Log_seq Info master-bin.002 4 Start 1 1 Server ver: 4.0.0-debug-log, Binlog ver: 2 master-bin.002 79 Query 1 2 use test; create table t1 (n int) @@ -45,8 +45,8 @@ slave-bin.001 253 Query 1 4 use test; insert into t1 values (NULL) slave-bin.001 316 Query 1 5 use test; drop table t1 slave-bin.001 364 Query 1 6 use test; create table t1 (word char(20) not null) slave-bin.001 439 Query 1 8 use test; drop table t1 -slave-bin.001 487 Rotate 2 3 slave-bin.002; forced by master -slave-bin.001 519 Stop 2 4 +slave-bin.001 487 Rotate 2 3 slave-bin.002;pos=4; forced by master +slave-bin.001 527 Stop 2 4 Log_name Pos Event_type Server_id Log_seq Info slave-bin.002 4 Start 2 1 Server ver: 4.0.0-debug-log, Binlog ver: 2 slave-bin.002 79 Slave 2 2 host=127.0.0.1,port=9306,log=master-bin.002,pos=4 |