Browse Source
Merge mail.hezx.com:/media/sda3/work/mysql/bkwork/versional/mysql-5.1-new-rpl
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 mysql-test/suite/rpl/r/rpl_create_database.result: Auto merged mysql-test/suite/rpl/r/rpl_load_from_master.result: Auto merged mysql-test/suite/rpl/t/rpl_create_database.test: Auto merged mysql-test/suite/rpl/t/rpl_load_from_master.test: Auto merged mysql-test/suite/rpl/r/rpl_init_slave.result: SCCS merged mysql-test/suite/rpl/t/rpl_init_slave.test: SCCS mergedpull/374/head
29 changed files with 225 additions and 173 deletions
-
15mysql-test/extra/rpl_tests/rpl_max_relay_size.test
-
8mysql-test/extra/rpl_tests/rpl_reset_slave.test
-
12mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
-
5mysql-test/include/show_binary_logs.inc
-
5mysql-test/include/show_master_logs.inc
-
5mysql-test/include/show_master_status.inc
-
8mysql-test/include/show_slave_status2.inc
-
14mysql-test/suite/rpl/r/rpl_000015.result
-
4mysql-test/suite/rpl/r/rpl_change_master.result
-
34mysql-test/suite/rpl/r/rpl_grant.result
-
1mysql-test/suite/rpl/r/rpl_init_slave.result
-
10mysql-test/suite/rpl/r/rpl_log_pos.result
-
39mysql-test/suite/rpl/r/rpl_rotate_logs.result
-
30mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
-
16mysql-test/suite/rpl/r/rpl_row_reset_slave.result
-
42mysql-test/suite/rpl/r/rpl_skip_error.result
-
30mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
-
16mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
-
16mysql-test/suite/rpl/r/rpl_stm_until.result
-
4mysql-test/suite/rpl/r/rpl_temporary_errors.result
-
10mysql-test/suite/rpl/t/rpl_000015.test
-
8mysql-test/suite/rpl/t/rpl_change_master.test
-
4mysql-test/suite/rpl/t/rpl_colSize.test
-
20mysql-test/suite/rpl/t/rpl_grant.test
-
2mysql-test/suite/rpl/t/rpl_init_slave.test
-
10mysql-test/suite/rpl/t/rpl_log_pos.test
-
18mysql-test/suite/rpl/t/rpl_rotate_logs.test
-
4mysql-test/suite/rpl/t/rpl_skip_error.test
-
8mysql-test/suite/rpl/t/rpl_stm_until.test
@ -0,0 +1,5 @@ |
|||
# show binary logs |
|||
|
|||
# mask out the binlog position |
|||
-- replace_column 2 # |
|||
show binary logs; |
|||
@ -0,0 +1,5 @@ |
|||
# show master logs |
|||
|
|||
# mask out the binlog position |
|||
-- replace_column 2 # |
|||
query_vertical show master logs; |
|||
@ -0,0 +1,5 @@ |
|||
# show master status |
|||
|
|||
# mask out the binlog position |
|||
-- replace_column 2 # 3 <Binlog_Do_DB> 4 <Binlog_Ignore_DB> |
|||
show master status; |
|||
@ -0,0 +1,8 @@ |
|||
# Include file to show the slave status, masking out some information |
|||
# that varies depending on where the test is executed. |
|||
|
|||
# masked out log positions |
|||
|
|||
--replace_result $MASTER_MYPORT MASTER_PORT |
|||
--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # |
|||
query_vertical SHOW SLAVE STATUS; |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue