database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

bug#50316 Add Master_info_file to SHOW SLAVE STATUS

Browse Source 
pushing to next-mr-bugfixing from working branch
This commit is contained in:
Andrei Elkin
2010-05-16 21:40:56 +03:00
parent 6facd4cb13
commit 05ec67c87e
56 changed files with 185 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_000015.result
View File

@ -47,6 +47,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 0
Master_Info_File #
start slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -89,6 +90,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
drop table if exists t1;
create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90);

1
mysql-test/suite/rpl/r/rpl_bug33931.result
View File

@ -44,4 +44,5 @@ Last_SQL_Errno #
Last_SQL_Error Failed during slave thread initialization
Replicate_Ignore_Server_Ids
Master_Server_Id 0
Master_Info_File #
SET GLOBAL debug="";

2
mysql-test/suite/rpl/r/rpl_change_master.result
View File

@ -52,6 +52,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
change master to master_user='root';
SHOW SLAVE STATUS;
Slave_IO_State #
@ -94,6 +95,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
start slave;
select * from t1;
n

3
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
View File

@ -91,6 +91,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
*** Test lock wait timeout ***
include/stop_slave.inc
@ -155,6 +156,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
*** Test lock wait timeout and purged relay logs ***
SET @my_max_relay_log_size= @@global.max_relay_log_size;
@ -224,6 +226,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
*** Clean up ***
DROP TABLE t1,t2,t3;

7
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
View File

@ -134,6 +134,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
***** Testing Altering table def scenario *****
@ -512,6 +513,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
****************************************
* columns in master at middle of table *
@ -588,6 +590,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -665,6 +668,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -818,6 +822,7 @@ Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
STOP SLAVE;
RESET SLAVE;
@ -906,6 +911,7 @@ Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
STOP SLAVE;
RESET SLAVE;
@ -994,6 +1000,7 @@ Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
STOP SLAVE;
RESET SLAVE;

7
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
View File

@ -134,6 +134,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
***** Testing Altering table def scenario *****
@ -512,6 +513,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
****************************************
* columns in master at middle of table *
@ -588,6 +590,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -665,6 +668,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
@ -818,6 +822,7 @@ Last_SQL_Errno 1091
Last_SQL_Error Error 'Can't DROP 'c7'; check that column/key exists' on query. Default database: 'test'. Query: 'ALTER TABLE t14 DROP COLUMN c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
STOP SLAVE;
RESET SLAVE;
@ -906,6 +911,7 @@ Last_SQL_Errno 1054
Last_SQL_Error Error 'Unknown column 'c7' in 't15'' on query. Default database: 'test'. Query: 'ALTER TABLE t15 ADD COLUMN c2 DECIMAL(8,2) AFTER c7'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
STOP SLAVE;
RESET SLAVE;
@ -994,6 +1000,7 @@ Last_SQL_Errno 1072
Last_SQL_Error Error 'Key column 'c6' doesn't exist in table' on query. Default database: 'test'. Query: 'CREATE INDEX part_of_c6 ON t16 (c6)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
STOP SLAVE;
RESET SLAVE;

1
mysql-test/suite/rpl/r/rpl_flushlog_loop.result
View File

@ -62,3 +62,4 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 2
Master_Info_File #

1
mysql-test/suite/rpl/r/rpl_grant.result
View File

@ -82,3 +82,4 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #

2
mysql-test/suite/rpl/r/rpl_heartbeat.result
View File

@ -93,6 +93,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SHOW SLAVE STATUS;
Slave_IO_State #
Master_Host 127.0.0.1
@ -134,6 +135,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
show status like 'Slave_heartbeat_period';;
Variable_name Slave_heartbeat_period
Value 0.500

2
mysql-test/suite/rpl/r/rpl_incident.result
View File

@ -66,6 +66,7 @@ Last_SQL_Errno 1590
Last_SQL_Error The incident LOST_EVENTS occured on the master. Message: <none>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@ -115,4 +116,5 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
DROP TABLE t1;

2
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
View File

@ -52,6 +52,7 @@ Last_SQL_Errno 1105
Last_SQL_Error Error 'master may suffer from http://bugs.mysql.com/bug.php?id=24432 so slave stops; check error log on slave for more info' on query. Default database: 'test'. Query: 'INSERT INTO t1(b) VALUES(1),(1),(2) ON DUPLICATE KEY UPDATE t1.b=10'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT * FROM t1;
a b
stop slave;
@ -145,6 +146,7 @@ ON DUPLICATE KEY UPDATE
t1.field_3 = t2.field_c'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT * FROM t1;
id field_1 field_2 field_3
drop table t1, t2;

2
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
View File

@ -47,6 +47,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -89,6 +90,7 @@ Last_SQL_Errno 1593
Last_SQL_Error Fatal error: Not enough memory
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
DROP TABLE t1;

2
mysql-test/suite/rpl/r/rpl_log_pos.result
View File

@ -51,6 +51,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
start slave;
include/stop_slave.inc
SHOW SLAVE STATUS;
@ -94,6 +95,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>

1
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
View File

@ -61,6 +61,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
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

1
mysql-test/suite/rpl/r/rpl_replicate_do.result
View File

@ -67,6 +67,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
create table t1 (ts timestamp);
set one_shot time_zone='met';
insert into t1 values('2005-08-12 00:00:00');

3
mysql-test/suite/rpl/r/rpl_rotate_logs.result
View File

@ -55,6 +55,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
select * from t1;
s
Could not break slave
@ -136,6 +137,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
select * from t2;
m
34
@ -205,6 +207,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
lock tables t3 read;
select count(*) from t3 where n >= 4;
count(*)

13
mysql-test/suite/rpl/r/rpl_row_colSize.result
View File

@ -59,6 +59,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -115,6 +116,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'decimal(27,18)' to type 'decimal(27,9)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -171,6 +173,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'decimal(20,10)' to type 'decimal(5,2)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -228,6 +231,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -285,6 +289,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -341,6 +346,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -398,6 +404,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -455,6 +462,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -543,6 +551,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -600,6 +609,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -656,6 +666,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -712,6 +723,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0
@ -769,6 +781,7 @@ Last_SQL_Errno 1677
Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob'
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1;
COUNT(*)
0

1
mysql-test/suite/rpl/r/rpl_row_log.result
View File

@ -288,6 +288,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;

1
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
View File

@ -288,6 +288,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;

6
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
View File

@ -64,6 +64,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 2
#
@ -114,6 +115,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 3: max_relay_log_size = 0
#
@ -164,6 +166,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@ -211,6 +214,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 5
#
@ -259,6 +263,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@ -305,6 +310,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB

4
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
View File

@ -45,6 +45,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
stop slave;
change master to master_user='test';
SHOW SLAVE STATUS;
@ -88,6 +89,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
reset slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -130,6 +132,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
change master to master_user='root';
start slave;
SHOW SLAVE STATUS;
@ -173,6 +176,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
stop slave;
reset slave;
start slave;

5
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
View File

@ -159,6 +159,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@ -202,6 +203,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@ -247,6 +249,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -292,6 +295,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -336,6 +340,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;

5
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
View File

@ -159,6 +159,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS;
@ -202,6 +203,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (5);
@ -247,6 +249,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -292,6 +295,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE;
INSERT INTO t9 VALUES (6);
@ -336,6 +340,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a;

4
mysql-test/suite/rpl/r/rpl_row_until.result
View File

@ -61,6 +61,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=291;
SELECT * FROM t1;
n
@ -109,6 +110,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=relay_pos_insert1_t2
SELECT * FROM t2;
n
@ -155,6 +157,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
START SLAVE;
include/stop_slave.inc
START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_create_t2
@ -199,6 +202,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
START SLAVE UNTIL MASTER_LOG_FILE='master-bin', MASTER_LOG_POS=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=561, RELAY_LOG_POS=12;

9
mysql-test/suite/rpl/r/rpl_show_master_info_file.result Normal file
View File

@ -0,0 +1,9 @@
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
SELECT "MYSQLTEST_VARDIR/mysqld.2/data/master.info" as Master_Info_File;
Master_Info_File
MYSQLTEST_VARDIR/mysqld.2/data/master.info

2
mysql-test/suite/rpl/r/rpl_skip_error.result
View File

@ -72,6 +72,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
==== Clean Up ====
drop table t1;
create table t1(a int primary key);
@ -127,6 +128,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
==== Clean Up ====
drop table t1;
==== Using Innodb ====

2
mysql-test/suite/rpl/r/rpl_slave_skip.result
View File

@ -84,6 +84,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;
SELECT * FROM t1;
@ -152,6 +153,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
**** On Master ****
DROP TABLE t1, t2;
SET SESSION BINLOG_FORMAT=ROW;

2
mysql-test/suite/rpl/r/rpl_ssl.result
View File

@ -60,6 +60,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
STOP SLAVE;
select * from t1;
t
@ -106,6 +107,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
drop user replssl@localhost;
drop table t1;
End of 5.0 tests

3
mysql-test/suite/rpl/r/rpl_ssl1.result
View File

@ -59,6 +59,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
stop slave;
change master to master_user='root',master_password='', master_ssl=0;
start slave;
@ -105,6 +106,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
stop slave;
change master to
master_host="localhost",
@ -161,4 +163,5 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
drop table t1;

1
mysql-test/suite/rpl/r/rpl_stm_log.result
View File

@ -286,6 +286,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1;

6
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
View File

@ -64,6 +64,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 2
#
@ -114,6 +115,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 3: max_relay_log_size = 0
#
@ -164,6 +166,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
#
@ -211,6 +214,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 5
#
@ -259,6 +263,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
#
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
#
@ -305,6 +310,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
flush logs;
show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB

4
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
View File

@ -45,6 +45,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
stop slave;
change master to master_user='test';
SHOW SLAVE STATUS;
@ -88,6 +89,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
reset slave;
SHOW SLAVE STATUS;
Slave_IO_State #
@ -130,6 +132,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
change master to master_user='root';
start slave;
SHOW SLAVE STATUS;
@ -173,6 +176,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
stop slave;
reset slave;
start slave;

4
mysql-test/suite/rpl/r/rpl_stm_until.result
View File

@ -65,6 +65,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
select * from t1;
n
@ -113,6 +114,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=891;
select * from t2;
n
@ -159,6 +161,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
start slave;
[on master]
[on slave]
@ -205,6 +208,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
==== Test various error conditions ====
start slave until master_log_file='master-bin', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL

1
mysql-test/suite/rpl/r/rpl_temporary_errors.result
View File

@ -80,6 +80,7 @@ Last_SQL_Errno 0
Last_SQL_Error
Replicate_Ignore_Server_Ids
Master_Server_Id 1
Master_Info_File #
DROP TABLE t1;
**** On Master ****
DROP TABLE t1;

2
mysql-test/suite/rpl/t/rpl_bug33931.test
View File

@ -40,7 +40,7 @@ connection slave;
source include/wait_for_slave_to_stop.inc;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 19 # 23 # 33 # 37 #
--replace_column 1 # 8 # 9 # 19 # 23 # 33 # 37 # 41 #
query_vertical show slave status;
#

2
mysql-test/suite/rpl/t/rpl_flushlog_loop.test
View File

@ -71,7 +71,7 @@ source include/wait_for_slave_param.inc;
# Show status of slave
#
--replace_result $SLAVE_MYPORT SLAVE_PORT $slave_param_value POSITION
--replace_column 1 # 8 # 9 # 16 # 23 # 33 # 34 # 35 #
--replace_column 1 # 8 # 9 # 16 # 23 # 33 # 34 # 35 # 41 #
--query_vertical SHOW SLAVE STATUS
--disable_query_log

4
mysql-test/suite/rpl/t/rpl_incident.test
View File

@ -24,7 +24,7 @@ source include/wait_for_slave_sql_error.inc;
SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
--replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 # 41 #
--query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
@ -36,7 +36,7 @@ START SLAVE;
SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 #
--replace_column 1 # 6 # 7 # 8 # 9 # 22 # 23 # 33 # 41 #
--query_vertical SHOW SLAVE STATUS
connection master;

4
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
View File

@ -27,7 +27,7 @@ SELECT * FROM t1;
connection slave;
--source include/wait_for_slave_sql_to_stop.inc
# show the error message
--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #
--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 # 41 #
--query_vertical show slave status;
# show that it was not replicated
SELECT * FROM t1;
@ -83,7 +83,7 @@ SELECT * FROM t1;
connection slave;
--source include/wait_for_slave_sql_to_stop.inc
# show the error message
--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 #
--replace_column 1 # 4 # 7 # 8 # 9 # 23 # 33 # 41 #
--query_vertical show slave status;
# show that it was not replicated
SELECT * FROM t1;

2
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
View File

@ -17,7 +17,7 @@ SHOW BINLOG EVENTS;
sync_slave_with_master;
--echo **** On Slave ****
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 34 # 35 #
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 34 # 35 # 41 #
--query_vertical SHOW SLAVE STATUS
--replace_result $VERSION VERSION
--replace_column 2 # 5 #

2
mysql-test/suite/rpl/t/rpl_replicate_do.test
View File

@ -28,7 +28,7 @@ drop table if exists t1,t2,t11;
sync_slave_with_master;
# show slave status, just to see of it prints replicate-do-table
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS;
#

8
mysql-test/suite/rpl/t/rpl_row_until.test
View File

@ -57,7 +57,7 @@ eval START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=$mast
# Here table should be still not deleted
SELECT * FROM t1;
--replace_result $master_pos_drop_t1 MASTER_POS_DROP_T1
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 #
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS;
# This should fail right after start
@ -66,7 +66,7 @@ START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=29
# again this table should be still not deleted
SELECT * FROM t1;
--replace_result $master_pos_drop_t1 MASTER_POS_DROP_T1
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 #
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS;
# Try replicate all up to and not including the second insert to t2;
@ -77,7 +77,7 @@ eval START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=$r
--source include/wait_for_slave_sql_to_stop.inc
SELECT * FROM t2;
--replace_result $relay_pos_insert1_t2 RELAY_POS_INSERT1_T2 $master_pos_insert1_t2 MASTER_POS_INSERT1_T2
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 #
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS;
# clean up
@ -99,7 +99,7 @@ let $slave_param_value= $master_pos_create_t2;
# here the sql slave thread should be stopped
--replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004
--replace_result $master_pos_create_t2 MASTER_POS_CREATE_T2 $master_pos_drop_t2 MASTER_POS_DROP_T2
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 #
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS;
#testing various error conditions

1
mysql-test/suite/rpl/t/rpl_show_master_info_file-master.opt Normal file
View File

@ -0,0 +1 @@
--master-info-file=$MYSQLTEST_VARDIR/master.info

18
mysql-test/suite/rpl/t/rpl_show_master_info_file.test Normal file
View File

@ -0,0 +1,18 @@
#
# Bug #50316 Add Master_info_file to SHOW SLAVE STATUS
# Testing of matching --master-info-file value to the value of the
# new added SSS' field
#
source include/master-slave.inc;
source include/have_binlog_format_mixed.inc;
# test reveals different path separator on windows.
# Leaving out windows because there is nothing more platform specific.
source include/not_windows.inc;
connection slave;
--let $master_info_file= query_get_value(SHOW SLAVE STATUS, Master_Info_File, 1)
--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
--eval SELECT "$master_info_file" as Master_Info_File

4
mysql-test/suite/rpl/t/rpl_slave_skip.test
View File

@ -36,7 +36,7 @@ connection slave;
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762;
--source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 #
--replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS;
# Now we skip *one* table map event. If the execution starts right
@ -74,7 +74,7 @@ START SLAVE;
--source include/wait_for_slave_to_start.inc
sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 #
--replace_column 1 # 8 # 9 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS;
--echo **** On Master ****

4
mysql-test/suite/rpl/t/rpl_ssl.test
View File

@ -31,7 +31,7 @@ select * from t1;
# The slave is synced and waiting/reading from master
# SHOW SLAVE STATUS will show "Waiting for master to send event"
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical show slave status;
# Stop the slave, as reported in bug#21871 it would hang
@ -71,7 +71,7 @@ let $master_count= `select count(*) from t1`;
sync_slave_with_master;
--source include/wait_for_slave_to_start.inc
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical show slave status;
let $slave_count= `select count(*) from t1`;

6
mysql-test/suite/rpl/t/rpl_ssl1.test
View File

@ -45,7 +45,7 @@ select * from t1;
#checking show slave status
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 11 # 16 # 22 # 23 # 33 # 35 # 36 #
--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 11 # 16 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical show slave status;
#checking if replication works without ssl also performing clean up
@ -59,7 +59,7 @@ drop user replssl@localhost;
drop table t1;
sync_slave_with_master;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 11 # 16 # 22 # 23 # 33 # 35 # 36 #
--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 11 # 16 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical show slave status;
# End of 4.1 tests
@ -91,7 +91,7 @@ select * from t1;
#checking show slave status
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT
--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 11 # 16 # 22 # 23 # 33 # 35 # 36 #
--replace_column 1 # 6 # 7 # 8 # 9 # 10 # 11 # 16 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical show slave status;
connection master;