Commit 41bb6f98 authored by hezx@mail.hezx.com's avatar hezx@mail.hezx.com
Browse files

Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rpl 

into  mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/merge-51
parents 940c3ef6 2720b76c

mysql-test/extra/rpl_tests/rpl_max_relay_size.test

+7 −8
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ set global max_relay_log_size=8192-1; # mapped to 4096 
select @@global.max_relay_log_size;

start slave;

sync_with_master;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



--echo #

--echo # Test 2
@@ -55,7 +55,7 @@ set global max_relay_log_size=(5*4096); 
query_vertical select @@global.max_relay_log_size;

start slave;

sync_with_master;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



--echo #

--echo # Test 3: max_relay_log_size = 0
@@ -67,7 +67,7 @@ set global max_relay_log_size=0; 
query_vertical select @@global.max_relay_log_size;

start slave;

sync_with_master;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



--echo #

--echo # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
@@ -78,7 +78,7 @@ reset slave; 
# test of relay log rotation when the slave is stopped

# (to make sure it does not crash).

flush logs;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



--echo #

--echo # Test 5
@@ -96,7 +96,7 @@ create table t1 (a int); 
save_master_pos;

connection slave;

sync_with_master;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



--echo #

--echo # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
@@ -108,13 +108,12 @@ drop table t1; 
save_master_pos;

connection slave;

sync_with_master;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



connection master;

# test that the absence of relay logs does not make a master crash

flush logs;

-- replace_column 3 <Binlog_Ignore_DB>

query_vertical show master status;

source include/show_master_status.inc;



# Restore max_binlog_size

connection slave;

mysql-test/extra/rpl_tests/rpl_reset_slave.test

+4 −4
Original line number Diff line number Diff line
@@ -13,18 +13,18 @@ connection master; 
save_master_pos;

connection slave;

sync_with_master;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



stop slave;

change master to master_user='test';

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



reset slave;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



start slave;

sync_with_master;

source include/show_slave_status.inc;

source include/show_slave_status2.inc;



# test of crash with temp tables & RESET SLAVE

# (test to see if RESET SLAVE clears temp tables in memory and disk)

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

+6 −6
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ INSERT INTO t1_nodef VALUES (1,2); 
connection slave;

--source include/wait_for_slave_sql_to_stop.inc

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #

--replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -142,7 +142,7 @@ sync_slave_with_master; 
--echo **** On Slave ****

SELECT * FROM t2;

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #

--replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #

--query_vertical SHOW SLAVE STATUS



connection master;
@@ -154,7 +154,7 @@ INSERT INTO t4 VALUES (4); 
connection slave;

--source include/wait_for_slave_sql_to_stop.inc

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #

--replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -168,7 +168,7 @@ INSERT INTO t5 VALUES (5,10,25); 
connection slave;

--source include/wait_for_slave_sql_to_stop.inc

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #

--replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -182,7 +182,7 @@ INSERT INTO t6 VALUES (6,12,36); 
connection slave;

--source include/wait_for_slave_sql_to_stop.inc

--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #

--replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #

--query_vertical SHOW SLAVE STATUS

SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;

START SLAVE;
@@ -191,7 +191,7 @@ connection master; 
INSERT INTO t9 VALUES (6);

sync_slave_with_master;

--replace_result $SLAVE_MYPORT SLAVE_PORT

--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #

--replace_column 1 # 4 # 7 # 8 # 9 # 20 # 22 # 23 # 33 # 40 #

--query_vertical SHOW SLAVE STATUS



# Testing some tables extra field that can be null and cannot be null

mysql-test/include/show_binary_logs.inc

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# show binary logs



# mask out the binlog position

-- replace_column 2 #

show binary logs;

mysql-test/include/show_master_logs.inc

0 → 100644
+5 −0
Original line number Diff line number Diff line 
# show master logs



# mask out the binlog position

-- replace_column 2 #

query_vertical show master logs;