diff options
| author | unknown <sasha@mysql.sashanet.com> | 2001-10-03 15:19:58 -0600 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2001-10-03 15:19:58 -0600 |
| commit | 6dcd03d76c5eb67a4d6ef8d01393789e45ab1864 (patch) | |
| tree | 8565f1027a2bc60cd641c7447414822be4d1ba6b /mysql-test/r/rpl_log.result | |
| parent | 7968bc7f66bf7a641fdda4493252bc8e7c571374 (diff) | |
| download | mariadb-git-6dcd03d76c5eb67a4d6ef8d01393789e45ab1864.tar.gz | |
post-merge fixes
mysql-test/fix-result:
version update
mysql-test/r/bigint.result:
post-merge fix
mysql-test/r/join.result:
post-merge fix
mysql-test/r/merge.result:
post-merge fix
mysql-test/r/null_key.result:
post-merge fix
mysql-test/r/rpl000002.result:
post-merge fix
mysql-test/r/rpl000015.result:
post-merge fix
mysql-test/r/rpl000016.result:
post-merge fix
mysql-test/r/rpl_log.result:
post-merge fix
mysql-test/r/show_check.result:
post-merge fix
mysql-test/t/rpl000002.test:
post-merge fix
mysql-test/t/rpl000015.test:
post-merge fix
mysql-test/t/rpl000016.test:
post-merge fix
Diffstat (limited to 'mysql-test/r/rpl_log.result')
| -rw-r--r-- | mysql-test/r/rpl_log.result | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/r/rpl_log.result b/mysql-test/r/rpl_log.result index 3cee343d989..37b2474f9e6 100644 --- a/mysql-test/r/rpl_log.result +++ b/mysql-test/r/rpl_log.result @@ -16,7 +16,7 @@ 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: 4.0.0-alpha-debug-log, Binlog ver: 2 +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) @@ -41,7 +41,7 @@ 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: 4.0.0-alpha-debug-log, Binlog ver: 2 +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) @@ -54,7 +54,7 @@ master-bin.001 627 Rotate 1 10 master-bin.002;pos=4 master-bin.001 668 Stop 1 11 show binlog events in 'master-bin.002'; Log_name Pos Event_type Server_id Log_seq Info -master-bin.002 4 Start 1 1 Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2 +master-bin.002 4 Start 1 1 Server ver: $VERSION, Binlog ver: 2 master-bin.002 79 Query 1 2 use test; create table t1 (n int) master-bin.002 137 Query 1 3 use test; insert into t1 values (1) master-bin.002 197 Query 1 4 use test; drop table t1 @@ -69,8 +69,8 @@ slave-bin.001 slave-bin.002 show binlog events in 'slave-bin.001' from 4; Log_name Pos Event_type Server_id Log_seq Info -slave-bin.001 4 Start 2 1 Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2 -slave-bin.001 79 Slave 2 3 host=127.0.0.1,port=9306,log=master-bin.001,pos=4 +slave-bin.001 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2 +slave-bin.001 79 Slave 2 3 host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.001,pos=4 slave-bin.001 132 Query 1 2 use test; create table t1(n int not null auto_increment primary key) slave-bin.001 225 Intvar 1 3 INSERT_ID=1 slave-bin.001 253 Query 1 4 use test; insert into t1 values (NULL) @@ -83,14 +83,14 @@ slave-bin.001 689 Rotate 1 4 slave-bin.002;pos=4; forced by master slave-bin.001 729 Stop 2 5 show binlog events in 'slave-bin.002' from 4; Log_name Pos Event_type Server_id Log_seq Info -slave-bin.002 4 Start 2 1 Server ver: 4.0.0-alpha-debug-log, Binlog ver: 2 -slave-bin.002 79 Slave 2 10 host=127.0.0.1,port=9306,log=master-bin.002,pos=4 +slave-bin.002 4 Start 2 1 Server ver: $VERSION, Binlog ver: 2 +slave-bin.002 79 Slave 2 10 host=127.0.0.1,port=$MASTER_MYPORT,log=master-bin.002,pos=4 slave-bin.002 132 Query 1 2 use test; create table t1 (n int) slave-bin.002 190 Query 1 3 use test; insert into t1 values (1) slave-bin.002 250 Query 1 4 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 9306 1 master-bin.002 245 Yes 0 0 4 +127.0.0.1 root $MASTER_MYPORT 1 master-bin.002 245 Yes 0 0 4 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; Log_name Log_pos |