Commit fdedc069 authored by unknown's avatar unknown

Updated to fix bug in AIX


mysql-test/extra/rpl_tests/rpl_log.test:
  Remove disable log per lars
mysql-test/r/rpl_stm_log.result:
  New results file
mysql-test/r/rpl_row_log.result:
  New results file
mysql-test/r/rpl_row_log_innodb.result:
  New results file
parent c3e4f43d
...@@ -77,12 +77,8 @@ connection slave; ...@@ -77,12 +77,8 @@ connection slave;
# to go into the relay log (the master always sends a fake one when replication # to go into the relay log (the master always sends a fake one when replication
# starts). # starts).
start slave; start slave;
--disable_query_log
--disable_result_log
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%'; let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%';
--source include/wait_slave_status.inc --source include/wait_slave_status.inc
--enable_query_log
--enable_result_log
sync_with_master; sync_with_master;
flush logs; flush logs;
stop slave; stop slave;
......
...@@ -39,6 +39,10 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F ...@@ -39,6 +39,10 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
flush logs; flush logs;
create table t3 (a int)ENGINE=MyISAM; create table t3 (a int)ENGINE=MyISAM;
start slave; start slave;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
--source include/wait_slave_status.inc
flush logs; flush logs;
stop slave; stop slave;
create table t2 (n int)ENGINE=MyISAM; create table t2 (n int)ENGINE=MyISAM;
......
...@@ -41,6 +41,10 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F ...@@ -41,6 +41,10 @@ master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
flush logs; flush logs;
create table t3 (a int)ENGINE=InnoDB; create table t3 (a int)ENGINE=InnoDB;
start slave; start slave;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
--source include/wait_slave_status.inc
flush logs; flush logs;
stop slave; stop slave;
create table t2 (n int)ENGINE=InnoDB; create table t2 (n int)ENGINE=InnoDB;
......
...@@ -39,6 +39,10 @@ master-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL) ...@@ -39,6 +39,10 @@ master-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL)
flush logs; flush logs;
create table t3 (a int)ENGINE=MyISAM; create table t3 (a int)ENGINE=MyISAM;
start slave; start slave;
let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ;
--source include/wait_slave_status.inc
flush logs; flush logs;
stop slave; stop slave;
create table t2 (n int)ENGINE=MyISAM; create table t2 (n int)ENGINE=MyISAM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment