mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch back to master before cleanup of the created tables

Browse source 
That causes test case for bug#6880 to be run on the master
instead of the slave and thus the result files need to be updated
This commit is contained in:
msvensson@pilot.blaudden 2007-03-01 15:25:42 +01:00
parent 51a71fb667
commit 4367b151c2
5 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql-test/extra/rpl_tests/rpl_log.test
View file

@ -125,6 +125,8 @@ show slave status;
--error 1220
show binlog events in 'slave-bin.000005' from 4;
connection master;
# The table drops caused Cluster Replication wrapper to fail as event ID would never be the same.# Moving drops here.
DROP TABLE t1;
@ -149,3 +151,5 @@ drop table t1;
# End of 4.1 tests
sync_with_master;

6
mysql-test/r/rpl_ndb_log.result
View file

@ -139,9 +139,9 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Table_map 2 # table_id: # (test.t1)
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
select * from t1;
a b
1 1

6
mysql-test/r/rpl_row_log.result
View file

@ -107,9 +107,9 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Table_map 2 # table_id: # (test.t1)
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
select * from t1;
a b
1 1

6
mysql-test/r/rpl_row_log_innodb.result
View file

@ -115,9 +115,9 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Table_map 2 # table_id: # (test.t1)
slave-bin.000001 # Write_rows 2 # table_id: # flags: STMT_END_F
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Table_map 1 # table_id: # (test.t1)
master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F
select * from t1;
a b
1 1

8
mysql-test/r/rpl_stm_log.result
View file

@ -105,10 +105,10 @@ set insert_id=5;
insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Intvar 2 # LAST_INSERT_ID=1
slave-bin.000001 # Intvar 2 # INSERT_ID=5
slave-bin.000001 # Query 2 # use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Intvar 1 # LAST_INSERT_ID=1
master-bin.000001 # Intvar 1 # INSERT_ID=5
master-bin.000001 # Query 1 # use `test`; insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id())
select * from t1;
a b
1 1