diff options
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/rpl000014.result | 16 | ||||
| -rw-r--r-- | mysql-test/r/rpl000015.result | 18 | ||||
| -rw-r--r-- | mysql-test/r/rpl000016.result | 16 | ||||
| -rw-r--r-- | mysql-test/r/rpl_log.result | 103 |
4 files changed, 83 insertions, 70 deletions
diff --git a/mysql-test/r/rpl000014.result b/mysql-test/r/rpl000014.result index 4815a2fc6aa..a0646b9c39f 100644 --- a/mysql-test/r/rpl000014.result +++ b/mysql-test/r/rpl000014.result @@ -7,22 +7,22 @@ show master status; File Position Binlog_do_db Binlog_ignore_db master-bin.001 79 show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 1 master-bin.001 79 Yes 0 0 1 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 1 master-bin.001 79 mysql-relay-bin.002 120 master-bin.001 Yes Yes 0 0 79 change master to master_log_pos=73; slave stop; change master to master_log_pos=73; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 1 master-bin.001 73 No 0 0 1 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 1 master-bin.001 73 mysql-relay-bin.001 4 master-bin.001 No No 0 0 73 slave start; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 1 master-bin.001 73 Yes 0 0 1 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 1 master-bin.001 73 mysql-relay-bin.001 4 master-bin.001 Yes Yes 0 0 73 change master to master_log_pos=173; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 1 master-bin.001 173 Yes 0 0 1 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 1 master-bin.001 173 mysql-relay-bin.001 4 master-bin.001 Yes Yes 0 0 173 show master status; File Position Binlog_do_db Binlog_ignore_db master-bin.001 79 diff --git a/mysql-test/r/rpl000015.result b/mysql-test/r/rpl000015.result index 265f0569e74..571c4c0b1e3 100644 --- a/mysql-test/r/rpl000015.result +++ b/mysql-test/r/rpl000015.result @@ -4,21 +4,21 @@ File Position Binlog_do_db Binlog_ignore_db master-bin.001 79 reset slave; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq - 0 0 0 No 0 0 0 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos + 0 0 0 0 No No 0 0 0 change master to master_host='127.0.0.1'; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 test MASTER_PORT 60 4 No 0 0 0 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 test 3306 60 4 mysql-relay-bin.001 4 No No 0 0 0 change master to master_host='127.0.0.1',master_user='root', -master_password='',master_port=MASTER_PORT; +master_password='',master_port=9306; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 60 4 No 0 0 0 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 60 4 mysql-relay-bin.001 4 No No 0 0 0 slave start; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 60 master-bin.001 79 Yes 0 0 1 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 60 master-bin.001 79 mysql-relay-bin.001 120 master-bin.001 Yes Yes 0 0 79 drop table if exists t1; create table t1 (n int); insert into t1 values (10),(45),(90); diff --git a/mysql-test/r/rpl000016.result b/mysql-test/r/rpl000016.result index b5b0ad45903..e3510ec2d94 100644 --- a/mysql-test/r/rpl000016.result +++ b/mysql-test/r/rpl000016.result @@ -2,11 +2,11 @@ slave start; Could not initialize master info structure, check permisions on master.info slave start; Could not initialize master info structure, check permisions on master.info -change master to master_host='127.0.0.1',master_port=MASTER_PORT, +change master to master_host='127.0.0.1',master_port=9306, master_user='root'; Could not initialize master info reset slave; -change master to master_host='127.0.0.1',master_port=MASTER_PORT, +change master to master_host='127.0.0.1',master_port=9306, master_user='root'; reset master; slave start; @@ -14,8 +14,8 @@ drop table if exists t1; create table t1 (s text); insert into t1 values('Could not break slave'),('Tried hard'); show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 60 master-bin.001 234 Yes 0 0 3 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 60 master-bin.001 234 mysql-relay-bin.001 275 master-bin.001 Yes Yes 0 0 234 select * from t1; s Could not break slave @@ -42,8 +42,8 @@ Log_name master-bin.003 insert into t2 values (65); show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 60 master-bin.003 155 Yes 0 0 3 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 60 master-bin.003 155 mysql-relay-bin.001 793 master-bin.003 Yes Yes 0 0 155 select * from t2; m 34 @@ -65,8 +65,8 @@ master-bin.006 445 slave stop; slave start; show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 60 master-bin.006 445 Yes 0 0 7 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 60 master-bin.006 445 mysql-relay-bin.004 1376 master-bin.006 Yes Yes 0 0 445 lock tables t3 read; select count(*) from t3 where n >= 4; count(*) diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index aabfb8252e6..4e6588d39f2 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -15,48 +15,48 @@ create table t1 (word char(20) not null); load data infile '../../std_data/words.dat' into table t1; drop table t1; show binlog events; -Log_name Pos Event_type Server_id Log_seq Info -master-bin.001 4 Start 1 1 Server ver: VERSION, Binlog ver: 2 -master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) -master-bin.001 172 Intvar 1 3 INSERT_ID=1 -master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL) -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 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81 -master-bin.001 556 Exec_load 1 8 ;file_id=1 -master-bin.001 579 Query 1 9 use test; drop table t1 +Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.001 4 Start 1 4 Server ver: 4.0.1-alpha-debug-log, Binlog ver: 3 +master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +master-bin.001 172 Intvar 1 172 INSERT_ID=1 +master-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) +master-bin.001 263 Query 1 263 use test; drop table t1 +master-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) +master-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81 +master-bin.001 556 Exec_load 1 556 ;file_id=1 +master-bin.001 579 Query 1 579 use test; drop table t1 show binlog events from 79 limit 1; -Log_name Pos Event_type Server_id Log_seq Info -master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) +Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) show binlog events from 79 limit 2; -Log_name Pos Event_type Server_id Log_seq Info -master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) -master-bin.001 172 Intvar 1 3 INSERT_ID=1 +Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +master-bin.001 172 Intvar 1 172 INSERT_ID=1 show binlog events from 79 limit 2,1; -Log_name Pos Event_type Server_id Log_seq Info -master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL) +Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) flush logs; create table t1 (n int); insert into t1 values (1); drop table t1; show binlog events; -Log_name Pos Event_type Server_id Log_seq Info -master-bin.001 4 Start 1 1 Server ver: VERSION, Binlog ver: 2 -master-bin.001 79 Query 1 2 use test; create table t1(n int not null auto_increment primary key) -master-bin.001 172 Intvar 1 3 INSERT_ID=1 -master-bin.001 200 Query 1 4 use test; insert into t1 values (NULL) -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 Create_file 1 7 db=test;table=t1;file_id=1;block_len=81 -master-bin.001 556 Exec_load 1 8 ;file_id=1 -master-bin.001 579 Query 1 9 use test; drop table t1 -master-bin.001 627 Rotate 1 10 master-bin.002;pos=4 -master-bin.001 668 Stop 1 11 +Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.001 4 Start 1 4 Server ver: 4.0.1-alpha-debug-log, Binlog ver: 3 +master-bin.001 79 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +master-bin.001 172 Intvar 1 172 INSERT_ID=1 +master-bin.001 200 Query 1 200 use test; insert into t1 values (NULL) +master-bin.001 263 Query 1 263 use test; drop table t1 +master-bin.001 311 Query 1 311 use test; create table t1 (word char(20) not null) +master-bin.001 386 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81 +master-bin.001 556 Exec_load 1 556 ;file_id=1 +master-bin.001 579 Query 1 579 use test; drop table t1 +master-bin.001 627 Rotate 1 627 master-bin.002;pos=4 +master-bin.001 668 Stop 1 668 show binlog events in 'master-bin.002'; -Log_name Pos Event_type Server_id Log_seq Info -master-bin.002 4 Query 1 1 use test; create table t1 (n int) -master-bin.002 62 Query 1 2 use test; insert into t1 values (1) -master-bin.002 122 Query 1 3 use test; drop table t1 +Log_name Pos Event_type Server_id Orig_log_pos Info +master-bin.002 4 Query 1 4 use test; create table t1 (n int) +master-bin.002 62 Query 1 62 use test; insert into t1 values (1) +master-bin.002 122 Query 1 122 use test; drop table t1 show master logs; Log_name master-bin.001 @@ -67,32 +67,45 @@ Log_name slave-bin.001 slave-bin.002 show binlog events in 'slave-bin.001' from 4; +Log_name Pos Event_type Server_id Orig_log_pos Info +slave-bin.001 4 Start 2 4 Server ver: 4.0.1-alpha-debug-log, Binlog ver: 3 +slave-bin.001 79 Slave 2 79 host=127.0.0.1,port=9306,log=master-bin.001,pos=4 +slave-bin.001 132 Query 1 79 use test; create table t1(n int not null auto_increment primary key) +slave-bin.001 225 Intvar 1 200 INSERT_ID=1 +slave-bin.001 253 Query 1 200 use test; insert into t1 values (NULL) +slave-bin.001 316 Query 1 263 use test; drop table t1 +slave-bin.001 364 Query 1 311 use test; create table t1 (word char(20) not null) +slave-bin.001 439 Create_file 1 386 db=test;table=t1;file_id=1;block_len=81 +slave-bin.001 618 Exec_load 1 556 ;file_id=1 +slave-bin.001 641 Query 1 579 use test; drop table t1 +slave-bin.001 689 Rotate 1 627 slave-bin.002;pos=4; forced by master +slave-bin.001 729 Stop 2 729 show binlog events in 'slave-bin.002' from 4; -Log_name Pos Event_type Server_id Log_seq Info -slave-bin.002 4 Slave 2 10 host=127.0.0.1,port=MASTER_PORT,log=master-bin.002,pos=4 -slave-bin.002 57 Query 1 1 use test; create table t1 (n int) -slave-bin.002 115 Query 1 2 use test; insert into t1 values (1) -slave-bin.002 175 Query 1 3 use test; drop table t1 +Log_name Pos Event_type Server_id Orig_log_pos Info +slave-bin.002 4 Slave 2 627 host=127.0.0.1,port=9306,log=master-bin.002,pos=4 +slave-bin.002 57 Query 1 4 use test; create table t1 (n int) +slave-bin.002 115 Query 1 62 use test; insert into t1 values (1) +slave-bin.002 175 Query 1 122 use test; drop table t1 show slave status; -Master_Host Master_User Master_Port Connect_retry Log_File Pos Slave_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Last_log_seq -127.0.0.1 root MASTER_PORT 1 master-bin.002 170 Yes 0 0 3 +Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos +127.0.0.1 root 9306 1 master-bin.002 170 mysql-relay-bin.002 935 master-bin.002 Yes Yes 0 0 170 show new master for slave with master_log_file='master-bin.001' and -master_log_pos=4 and master_log_seq=1 and master_server_id=1; +master_log_pos=4 and master_server_id=1; Log_name Log_pos slave-bin.001 132 show new master for slave with master_log_file='master-bin.001' and -master_log_pos=79 and master_log_seq=2 and master_server_id=1; +master_log_pos=79 and master_server_id=1; Log_name Log_pos slave-bin.001 225 show new master for slave with master_log_file='master-bin.001' and -master_log_pos=311 and master_log_seq=6 and master_server_id=1; +master_log_pos=311 and master_server_id=1; Log_name Log_pos slave-bin.001 439 show new master for slave with master_log_file='master-bin.002' and -master_log_pos=4 and master_log_seq=1 and master_server_id=1; +master_log_pos=4 and master_server_id=1; Log_name Log_pos slave-bin.002 57 show new master for slave with master_log_file='master-bin.002' and -master_log_pos=137 and master_log_seq=3 and master_server_id=1; +master_log_pos=122 and master_server_id=1; Log_name Log_pos slave-bin.002 223 |