Skip to content

M
MariaDB
Commit 2c966ddd authored by Andrei Elkin's avatar Andrei Elkin
Browse files
Options

merging bug#50316 fixes

parents 5d3833f5 f7e999ed
Show whitespace changes
Inline Side-by-side
Showing with 185 additions and 52 deletions
mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
View file @ 2c966ddd
...@@ -149,7 +149,7 @@ SELECT * FROM t1 ORDER BY f3 LIMIT 20; ...@@ -149,7 +149,7 @@ SELECT * FROM t1 ORDER BY f3 LIMIT 20;
--echo --echo
--echo * Show Slave Status * --echo * Show Slave Status *
--echo --echo
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical show slave status; --query_vertical show slave status;
--echo --echo
...@@ -439,7 +439,7 @@ connection master; ...@@ -439,7 +439,7 @@ connection master;
select * from t31; select * from t31;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical show slave status; --query_vertical show slave status;
#### Clean Up #### #### Clean Up ####
...@@ -499,7 +499,7 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT), ...@@ -499,7 +499,7 @@ INSERT INTO t10 () VALUES(1,@b1,DEFAULT,'Kyle',DEFAULT),
connection slave; connection slave;
source include/wait_for_slave_sql_to_stop.inc; source include/wait_for_slave_sql_to_stop.inc;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -556,7 +556,7 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT), ...@@ -556,7 +556,7 @@ INSERT INTO t11 () VALUES(1,@b1,'Testing is fun','Kyle',DEFAULT),
connection slave; connection slave;
source include/wait_for_slave_sql_to_stop.inc; source include/wait_for_slave_sql_to_stop.inc;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -699,7 +699,7 @@ SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1; ...@@ -699,7 +699,7 @@ SELECT c1,c3,hex(c4),c5,c6 FROM t14 ORDER BY c1;
connection slave; connection slave;
source include/wait_for_slave_sql_to_stop.inc; source include/wait_for_slave_sql_to_stop.inc;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
#*************************** #***************************
...@@ -765,7 +765,7 @@ SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1; ...@@ -765,7 +765,7 @@ SELECT c1,hex(c4),c5,c6,c7,c2 FROM t15 ORDER BY c1;
connection slave; connection slave;
source include/wait_for_slave_sql_to_stop.inc; source include/wait_for_slave_sql_to_stop.inc;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
...@@ -842,7 +842,7 @@ SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1; ...@@ -842,7 +842,7 @@ SELECT c1,hex(c4),c5,c6,c7 FROM t16 ORDER BY c1;
connection slave; connection slave;
source include/wait_for_slave_sql_to_stop.inc; source include/wait_for_slave_sql_to_stop.inc;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
......
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
View file @ 2c966ddd
...@@ -139,7 +139,7 @@ sync_slave_with_master; ...@@ -139,7 +139,7 @@ sync_slave_with_master;
--echo **** On Slave **** --echo **** On Slave ****
SELECT * FROM t2; SELECT * FROM t2;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> --replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> 41 <Master-Info-File>
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
connection master; connection master;
...@@ -151,7 +151,7 @@ INSERT INTO t4 VALUES (4); ...@@ -151,7 +151,7 @@ INSERT INTO t4 VALUES (4);
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> --replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> 41 <Master-Info-File>
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -165,7 +165,7 @@ INSERT INTO t5 VALUES (5,10,25); ...@@ -165,7 +165,7 @@ INSERT INTO t5 VALUES (5,10,25);
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> --replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> 41 <Master-Info-File>
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -179,7 +179,7 @@ INSERT INTO t6 VALUES (6,12,36); ...@@ -179,7 +179,7 @@ INSERT INTO t6 VALUES (6,12,36);
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> --replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> 41 <Master-Info-File>
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -188,7 +188,7 @@ connection master; ...@@ -188,7 +188,7 @@ connection master;
INSERT INTO t9 VALUES (6); INSERT INTO t9 VALUES (6);
sync_slave_with_master; sync_slave_with_master;
--replace_result $SLAVE_MYPORT SLAVE_PORT --replace_result $SLAVE_MYPORT SLAVE_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> --replace_column 1 # 4 # 7 # 8 # 9 # 20 <Last_Error> 22 # 23 # 33 # 35 <Last_IO_Errno> 36 <Last_IO_Error> 38 <Last_SQL_Error> 41 <Master-Info-File>
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
# Testing some tables extra field that can be null and cannot be null # Testing some tables extra field that can be null and cannot be null
......
mysql-test/include/show_slave_status.inc
View file @ 2c966ddd
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
# that varies depending on where the test is executed. # that varies depending on where the test is executed.
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # --replace_column 1 # 8 # 9 # 16 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
mysql-test/include/show_slave_status2.inc
View file @ 2c966ddd
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
# masked out log positions # masked out log positions
--replace_result $MASTER_MYPORT MASTER_PORT $DEFAULT_MASTER_PORT 3306 --replace_result $MASTER_MYPORT MASTER_PORT $DEFAULT_MASTER_PORT 3306
--replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # 41 #
query_vertical SHOW SLAVE STATUS; query_vertical SHOW SLAVE STATUS;
mysql-test/include/test_fieldsize.inc
View file @ 2c966ddd
...@@ -24,7 +24,7 @@ connection slave; ...@@ -24,7 +24,7 @@ connection slave;
START SLAVE; START SLAVE;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # --replace_column 1 # 4 # 7 # 8 # 9 # 16 # 22 # 23 # 33 # 35 # 36 # 41 #
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
# The following should be 0 # The following should be 0
......
mysql-test/suite/rpl/r/rpl_000015.result
View file @ 2c966ddd
...@@ -47,6 +47,7 @@ Last_SQL_Errno 0 ...@@ -47,6 +47,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 0 Master_Server_Id 0
Master_Info_File #
start slave; start slave;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
...@@ -89,6 +90,7 @@ Last_SQL_Errno 0 ...@@ -89,6 +90,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
drop table if exists t1; drop table if exists t1;
create table t1 (n int, PRIMARY KEY(n)); create table t1 (n int, PRIMARY KEY(n));
insert into t1 values (10),(45),(90); insert into t1 values (10),(45),(90);
......
mysql-test/suite/rpl/r/rpl_bug33931.result
View file @ 2c966ddd
...@@ -44,4 +44,5 @@ Last_SQL_Errno # ...@@ -44,4 +44,5 @@ Last_SQL_Errno #
Last_SQL_Error Failed during slave thread initialization Last_SQL_Error Failed during slave thread initialization
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 0 Master_Server_Id 0
Master_Info_File #
SET GLOBAL debug=""; SET GLOBAL debug="";
mysql-test/suite/rpl/r/rpl_change_master.result
View file @ 2c966ddd
...@@ -52,6 +52,7 @@ Last_SQL_Errno 0 ...@@ -52,6 +52,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
change master to master_user='root'; change master to master_user='root';
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
...@@ -94,6 +95,7 @@ Last_SQL_Errno 0 ...@@ -94,6 +95,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
start slave; start slave;
select * from t1; select * from t1;
n n
......
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
View file @ 2c966ddd
...@@ -91,6 +91,7 @@ Last_SQL_Errno 0 ...@@ -91,6 +91,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
*** Test lock wait timeout *** *** Test lock wait timeout ***
include/stop_slave.inc include/stop_slave.inc
...@@ -155,6 +156,7 @@ Last_SQL_Errno 0 ...@@ -155,6 +156,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
*** Test lock wait timeout and purged relay logs *** *** Test lock wait timeout and purged relay logs ***
SET @my_max_relay_log_size= @@global.max_relay_log_size; SET @my_max_relay_log_size= @@global.max_relay_log_size;
...@@ -224,6 +226,7 @@ Last_SQL_Errno 0 ...@@ -224,6 +226,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
*** Clean up *** *** Clean up ***
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
......
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
View file @ 2c966ddd
...@@ -134,6 +134,7 @@ Last_SQL_Errno 0 ...@@ -134,6 +134,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
***** Testing Altering table def scenario ***** ***** Testing Altering table def scenario *****
...@@ -512,6 +513,7 @@ Last_SQL_Errno 0 ...@@ -512,6 +513,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
**************************************** ****************************************
* columns in master at middle of table * * columns in master at middle of table *
...@@ -588,6 +590,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -665,6 +668,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -818,6 +822,7 @@ Last_SQL_Errno 1091 ...@@ -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' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
...@@ -906,6 +911,7 @@ Last_SQL_Errno 1054 ...@@ -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' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
...@@ -994,6 +1000,7 @@ Last_SQL_Errno 1072 ...@@ -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)' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
......
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
View file @ 2c966ddd
...@@ -134,6 +134,7 @@ Last_SQL_Errno 0 ...@@ -134,6 +134,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
***** Testing Altering table def scenario ***** ***** Testing Altering table def scenario *****
...@@ -512,6 +513,7 @@ Last_SQL_Errno 0 ...@@ -512,6 +513,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
**************************************** ****************************************
* columns in master at middle of table * * columns in master at middle of table *
...@@ -588,6 +590,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 2 of table 'test.t10' cannot be converted from type 'double' to type 'char(5)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -665,6 +668,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 2 of table 'test.t11' cannot be converted from type 'tinyblob' to type 'varchar(254)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
...@@ -818,6 +822,7 @@ Last_SQL_Errno 1091 ...@@ -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' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
...@@ -906,6 +911,7 @@ Last_SQL_Errno 1054 ...@@ -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' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
...@@ -994,6 +1000,7 @@ Last_SQL_Errno 1072 ...@@ -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)' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
STOP SLAVE; STOP SLAVE;
RESET SLAVE; RESET SLAVE;
......
mysql-test/suite/rpl/r/rpl_flushlog_loop.result
View file @ 2c966ddd
...@@ -62,3 +62,4 @@ Last_SQL_Errno 0 ...@@ -62,3 +62,4 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 2 Master_Server_Id 2
Master_Info_File #
mysql-test/suite/rpl/r/rpl_grant.result
View file @ 2c966ddd
...@@ -82,3 +82,4 @@ Last_SQL_Errno 0 ...@@ -82,3 +82,4 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
mysql-test/suite/rpl/r/rpl_heartbeat.result
View file @ 2c966ddd
...@@ -93,6 +93,7 @@ Last_SQL_Errno 0 ...@@ -93,6 +93,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
Master_Host 127.0.0.1 Master_Host 127.0.0.1
...@@ -134,6 +135,7 @@ Last_SQL_Errno 0 ...@@ -134,6 +135,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
show status like 'Slave_heartbeat_period';; show status like 'Slave_heartbeat_period';;
Variable_name Slave_heartbeat_period Variable_name Slave_heartbeat_period
Value 0.500 Value 0.500
......
mysql-test/suite/rpl/r/rpl_incident.result
View file @ 2c966ddd
...@@ -66,6 +66,7 @@ Last_SQL_Errno 1590 ...@@ -66,6 +66,7 @@ Last_SQL_Errno 1590
Last_SQL_Error The incident LOST_EVENTS occured on the master. Message: <none> Last_SQL_Error The incident LOST_EVENTS occured on the master. Message: <none>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE; START SLAVE;
SELECT * FROM t1; SELECT * FROM t1;
...@@ -115,4 +116,5 @@ Last_SQL_Errno 0 ...@@ -115,4 +116,5 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
View file @ 2c966ddd
...@@ -52,6 +52,7 @@ Last_SQL_Errno 1105 ...@@ -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' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT * FROM t1; SELECT * FROM t1;
a b a b
stop slave; stop slave;
...@@ -145,6 +146,7 @@ ON DUPLICATE KEY UPDATE ...@@ -145,6 +146,7 @@ ON DUPLICATE KEY UPDATE
t1.field_3 = t2.field_c' t1.field_3 = t2.field_c'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT * FROM t1; SELECT * FROM t1;
id field_1 field_2 field_3 id field_1 field_2 field_3
drop table t1, t2; drop table t1, t2;
......
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
View file @ 2c966ddd
...@@ -47,6 +47,7 @@ Last_SQL_Errno 0 ...@@ -47,6 +47,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1; LOAD DATA INFILE '../../std_data/rpl_loaddata.dat' INTO TABLE t1;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
...@@ -89,6 +90,7 @@ Last_SQL_Errno 1593 ...@@ -89,6 +90,7 @@ Last_SQL_Errno 1593
Last_SQL_Error Fatal error: Not enough memory Last_SQL_Error Fatal error: Not enough memory
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE; START SLAVE;
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/rpl/r/rpl_log_pos.result
View file @ 2c966ddd
...@@ -51,6 +51,7 @@ Last_SQL_Errno 0 ...@@ -51,6 +51,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
start slave; start slave;
include/stop_slave.inc include/stop_slave.inc
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -94,6 +95,7 @@ Last_SQL_Errno 0 ...@@ -94,6 +95,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB> master-bin.000001 # <Binlog_Do_DB> <Binlog_Ignore_DB>
......
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
View file @ 2c966ddd
...@@ -61,6 +61,7 @@ Last_SQL_Errno 0 ...@@ -61,6 +61,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SHOW BINLOG EVENTS; SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info 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 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
......
mysql-test/suite/rpl/r/rpl_replicate_do.result
View file @ 2c966ddd
...@@ -67,6 +67,7 @@ Last_SQL_Errno 0 ...@@ -67,6 +67,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
create table t1 (ts timestamp); create table t1 (ts timestamp);
set one_shot time_zone='met'; set one_shot time_zone='met';
insert into t1 values('2005-08-12 00:00:00'); insert into t1 values('2005-08-12 00:00:00');
......
mysql-test/suite/rpl/r/rpl_rotate_logs.result
View file @ 2c966ddd
...@@ -55,6 +55,7 @@ Last_SQL_Errno 0 ...@@ -55,6 +55,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
select * from t1; select * from t1;
s s
Could not break slave Could not break slave
...@@ -136,6 +137,7 @@ Last_SQL_Errno 0 ...@@ -136,6 +137,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
select * from t2; select * from t2;
m m
34 34
...@@ -205,6 +207,7 @@ Last_SQL_Errno 0 ...@@ -205,6 +207,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
lock tables t3 read; lock tables t3 read;
select count(*) from t3 where n >= 4; select count(*) from t3 where n >= 4;
count(*) count(*)
......
mysql-test/suite/rpl/r/rpl_row_colSize.result
View file @ 2c966ddd
...@@ -59,6 +59,7 @@ Last_SQL_Errno 1677 ...@@ -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)' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -115,6 +116,7 @@ Last_SQL_Errno 1677 ...@@ -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)' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -171,6 +173,7 @@ Last_SQL_Errno 1677 ...@@ -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)' 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 Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -228,6 +231,7 @@ Last_SQL_Errno 1677 ...@@ -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' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'double' to type 'float'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -285,6 +289,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'bit(64)' to type 'bit(5)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -341,6 +346,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'bit(12)' to type 'bit(11)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -398,6 +404,7 @@ Last_SQL_Errno 1677 ...@@ -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')' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'set' to type 'set('4')'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -455,6 +462,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'char(20)' to type 'char(10)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -543,6 +551,7 @@ Last_SQL_Errno 1677 ...@@ -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')' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'enum' to type 'enum('44','54')'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -600,6 +609,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(100)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -656,6 +666,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'varchar(200)' to type 'varchar(10)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -712,6 +723,7 @@ Last_SQL_Errno 1677 ...@@ -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)' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'varchar(2000)' to type 'varchar(1000)'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
...@@ -769,6 +781,7 @@ Last_SQL_Errno 1677 ...@@ -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' Last_SQL_Error Column 0 of table 'test.t1' cannot be converted from type 'tinyblob' to type 'tinyblob'
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SELECT COUNT(*) FROM t1; SELECT COUNT(*) FROM t1;
COUNT(*) COUNT(*)
0 0
......
mysql-test/suite/rpl/r/rpl_row_log.result
View file @ 2c966ddd
...@@ -288,6 +288,7 @@ Last_SQL_Errno 0 ...@@ -288,6 +288,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
show binlog events in 'slave-bin.000005' from 4; show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1; DROP TABLE t1;
......
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
View file @ 2c966ddd
...@@ -288,6 +288,7 @@ Last_SQL_Errno 0 ...@@ -288,6 +288,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
show binlog events in 'slave-bin.000005' from 4; show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1; DROP TABLE t1;
......
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
View file @ 2c966ddd
...@@ -64,6 +64,7 @@ Last_SQL_Errno 0 ...@@ -64,6 +64,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 2 # Test 2
# #
...@@ -114,6 +115,7 @@ Last_SQL_Errno 0 ...@@ -114,6 +115,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 3: max_relay_log_size = 0 # Test 3: max_relay_log_size = 0
# #
...@@ -164,6 +166,7 @@ Last_SQL_Errno 0 ...@@ -164,6 +166,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
# #
...@@ -211,6 +214,7 @@ Last_SQL_Errno 0 ...@@ -211,6 +214,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 5 # Test 5
# #
...@@ -259,6 +263,7 @@ Last_SQL_Errno 0 ...@@ -259,6 +263,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
# #
...@@ -305,6 +310,7 @@ Last_SQL_Errno 0 ...@@ -305,6 +310,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
flush logs; flush logs;
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
......
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
View file @ 2c966ddd
...@@ -45,6 +45,7 @@ Last_SQL_Errno 0 ...@@ -45,6 +45,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
stop slave; stop slave;
change master to master_user='test'; change master to master_user='test';
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -88,6 +89,7 @@ Last_SQL_Errno 0 ...@@ -88,6 +89,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
reset slave; reset slave;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
...@@ -130,6 +132,7 @@ Last_SQL_Errno 0 ...@@ -130,6 +132,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
change master to master_user='root'; change master to master_user='root';
start slave; start slave;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -173,6 +176,7 @@ Last_SQL_Errno 0 ...@@ -173,6 +176,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
stop slave; stop slave;
reset slave; reset slave;
start slave; start slave;
......
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
View file @ 2c966ddd
...@@ -159,6 +159,7 @@ Last_SQL_Errno 0 ...@@ -159,6 +159,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t9 VALUES (4); INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4); INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -202,6 +203,7 @@ Last_SQL_Errno 1677 ...@@ -202,6 +203,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
INSERT INTO t9 VALUES (5); INSERT INTO t9 VALUES (5);
...@@ -247,6 +249,7 @@ Last_SQL_Errno 1677 ...@@ -247,6 +249,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
INSERT INTO t9 VALUES (6); INSERT INTO t9 VALUES (6);
...@@ -292,6 +295,7 @@ Last_SQL_Errno 1677 ...@@ -292,6 +295,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
INSERT INTO t9 VALUES (6); INSERT INTO t9 VALUES (6);
...@@ -336,6 +340,7 @@ Last_SQL_Errno 0 ...@@ -336,6 +340,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t7 VALUES (1),(2),(3); INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3); INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a; SELECT * FROM t7 ORDER BY a;
......
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
View file @ 2c966ddd
...@@ -159,6 +159,7 @@ Last_SQL_Errno 0 ...@@ -159,6 +159,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t9 VALUES (4); INSERT INTO t9 VALUES (4);
INSERT INTO t4 VALUES (4); INSERT INTO t4 VALUES (4);
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -202,6 +203,7 @@ Last_SQL_Errno 1677 ...@@ -202,6 +203,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
INSERT INTO t9 VALUES (5); INSERT INTO t9 VALUES (5);
...@@ -247,6 +249,7 @@ Last_SQL_Errno 1677 ...@@ -247,6 +249,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
INSERT INTO t9 VALUES (6); INSERT INTO t9 VALUES (6);
...@@ -292,6 +295,7 @@ Last_SQL_Errno 1677 ...@@ -292,6 +295,7 @@ Last_SQL_Errno 1677
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=2;
START SLAVE; START SLAVE;
INSERT INTO t9 VALUES (6); INSERT INTO t9 VALUES (6);
...@@ -336,6 +340,7 @@ Last_SQL_Errno 0 ...@@ -336,6 +340,7 @@ Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File <Master-Info-File>
INSERT INTO t7 VALUES (1),(2),(3); INSERT INTO t7 VALUES (1),(2),(3);
INSERT INTO t8 VALUES (1),(2),(3); INSERT INTO t8 VALUES (1),(2),(3);
SELECT * FROM t7 ORDER BY a; SELECT * FROM t7 ORDER BY a;
......
mysql-test/suite/rpl/r/rpl_row_until.result
View file @ 2c966ddd
...@@ -61,6 +61,7 @@ Last_SQL_Errno 0 ...@@ -61,6 +61,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=291; START SLAVE UNTIL MASTER_LOG_FILE='master-no-such-bin.000001', MASTER_LOG_POS=291;
SELECT * FROM t1; SELECT * FROM t1;
n n
...@@ -109,6 +110,7 @@ Last_SQL_Errno 0 ...@@ -109,6 +110,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=relay_pos_insert1_t2 START SLAVE UNTIL RELAY_LOG_FILE='slave-relay-bin.000002', RELAY_LOG_POS=relay_pos_insert1_t2
SELECT * FROM t2; SELECT * FROM t2;
n n
...@@ -155,6 +157,7 @@ Last_SQL_Errno 0 ...@@ -155,6 +157,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
START SLAVE; START SLAVE;
include/stop_slave.inc include/stop_slave.inc
START SLAVE SQL_THREAD UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=master_pos_create_t2 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 ...@@ -199,6 +202,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
START SLAVE UNTIL MASTER_LOG_FILE='master-bin', MASTER_LOG_POS=561; START SLAVE UNTIL MASTER_LOG_FILE='master-bin', MASTER_LOG_POS=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL 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; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=561, RELAY_LOG_POS=12;
......
mysql-test/suite/rpl/r/rpl_show_master_info_file.result 0 → 100644
View file @ 2c966ddd
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
mysql-test/suite/rpl/r/rpl_skip_error.result
View file @ 2c966ddd
...@@ -72,6 +72,7 @@ Last_SQL_Errno 0 ...@@ -72,6 +72,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
==== Clean Up ==== ==== Clean Up ====
drop table t1; drop table t1;
create table t1(a int primary key); create table t1(a int primary key);
...@@ -127,6 +128,7 @@ Last_SQL_Errno 0 ...@@ -127,6 +128,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
==== Clean Up ==== ==== Clean Up ====
drop table t1; drop table t1;
==== Using Innodb ==== ==== Using Innodb ====
......
mysql-test/suite/rpl/r/rpl_slave_skip.result
View file @ 2c966ddd
...@@ -84,6 +84,7 @@ Last_SQL_Errno 0 ...@@ -84,6 +84,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE; START SLAVE;
SELECT * FROM t1; SELECT * FROM t1;
...@@ -152,6 +153,7 @@ Last_SQL_Errno 0 ...@@ -152,6 +153,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
**** On Master **** **** On Master ****
DROP TABLE t1, t2; DROP TABLE t1, t2;
SET SESSION BINLOG_FORMAT=ROW; SET SESSION BINLOG_FORMAT=ROW;
......
mysql-test/suite/rpl/r/rpl_ssl.result
View file @ 2c966ddd
...@@ -60,6 +60,7 @@ Last_SQL_Errno 0 ...@@ -60,6 +60,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
STOP SLAVE; STOP SLAVE;
select * from t1; select * from t1;
t t
...@@ -106,6 +107,7 @@ Last_SQL_Errno 0 ...@@ -106,6 +107,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
drop user replssl@localhost; drop user replssl@localhost;
drop table t1; drop table t1;
End of 5.0 tests End of 5.0 tests
mysql-test/suite/rpl/r/rpl_ssl1.result
View file @ 2c966ddd
...@@ -59,6 +59,7 @@ Last_SQL_Errno 0 ...@@ -59,6 +59,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
stop slave; stop slave;
change master to master_user='root',master_password='', master_ssl=0; change master to master_user='root',master_password='', master_ssl=0;
start slave; start slave;
...@@ -105,6 +106,7 @@ Last_SQL_Errno 0 ...@@ -105,6 +106,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
stop slave; stop slave;
change master to change master to
master_host="localhost", master_host="localhost",
...@@ -161,4 +163,5 @@ Last_SQL_Errno 0 ...@@ -161,4 +163,5 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
drop table t1; drop table t1;
mysql-test/suite/rpl/r/rpl_stm_log.result
View file @ 2c966ddd
...@@ -286,6 +286,7 @@ Last_SQL_Errno 0 ...@@ -286,6 +286,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
show binlog events in 'slave-bin.000005' from 4; show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
DROP TABLE t1; DROP TABLE t1;
......
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
View file @ 2c966ddd
...@@ -64,6 +64,7 @@ Last_SQL_Errno 0 ...@@ -64,6 +64,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 2 # Test 2
# #
...@@ -114,6 +115,7 @@ Last_SQL_Errno 0 ...@@ -114,6 +115,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 3: max_relay_log_size = 0 # Test 3: max_relay_log_size = 0
# #
...@@ -164,6 +166,7 @@ Last_SQL_Errno 0 ...@@ -164,6 +166,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions # Test 4: Tests below are mainly to ensure that we have not coded with wrong assumptions
# #
...@@ -211,6 +214,7 @@ Last_SQL_Errno 0 ...@@ -211,6 +214,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 5 # Test 5
# #
...@@ -259,6 +263,7 @@ Last_SQL_Errno 0 ...@@ -259,6 +263,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
# #
# Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated # Test 6: one more rotation, to be sure Relay_Log_Space is correctly updated
# #
...@@ -305,6 +310,7 @@ Last_SQL_Errno 0 ...@@ -305,6 +310,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
flush logs; flush logs;
show master status; show master status;
File Position Binlog_Do_DB Binlog_Ignore_DB File Position Binlog_Do_DB Binlog_Ignore_DB
......
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
View file @ 2c966ddd
...@@ -45,6 +45,7 @@ Last_SQL_Errno 0 ...@@ -45,6 +45,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
stop slave; stop slave;
change master to master_user='test'; change master to master_user='test';
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -88,6 +89,7 @@ Last_SQL_Errno 0 ...@@ -88,6 +89,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
reset slave; reset slave;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
Slave_IO_State # Slave_IO_State #
...@@ -130,6 +132,7 @@ Last_SQL_Errno 0 ...@@ -130,6 +132,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
change master to master_user='root'; change master to master_user='root';
start slave; start slave;
SHOW SLAVE STATUS; SHOW SLAVE STATUS;
...@@ -173,6 +176,7 @@ Last_SQL_Errno 0 ...@@ -173,6 +176,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
stop slave; stop slave;
reset slave; reset slave;
start slave; start slave;
......
mysql-test/suite/rpl/r/rpl_stm_until.result
View file @ 2c966ddd
...@@ -65,6 +65,7 @@ Last_SQL_Errno 0 ...@@ -65,6 +65,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291; start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;
select * from t1; select * from t1;
n n
...@@ -113,6 +114,7 @@ Last_SQL_Errno 0 ...@@ -113,6 +114,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=891; start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=891;
select * from t2; select * from t2;
n n
...@@ -159,6 +161,7 @@ Last_SQL_Errno 0 ...@@ -159,6 +161,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
start slave; start slave;
[on master] [on master]
[on slave] [on slave]
...@@ -205,6 +208,7 @@ Last_SQL_Errno 0 ...@@ -205,6 +208,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
==== Test various error conditions ==== ==== Test various error conditions ====
start slave until master_log_file='master-bin', master_log_pos=561; start slave until master_log_file='master-bin', master_log_pos=561;
ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL ERROR HY000: Incorrect parameter or combination of parameters for START SLAVE UNTIL
......
mysql-test/suite/rpl/r/rpl_temporary_errors.result
View file @ 2c966ddd
...@@ -80,6 +80,7 @@ Last_SQL_Errno 0 ...@@ -80,6 +80,7 @@ Last_SQL_Errno 0
Last_SQL_Error Last_SQL_Error
Replicate_Ignore_Server_Ids Replicate_Ignore_Server_Ids
Master_Server_Id 1 Master_Server_Id 1
Master_Info_File #
DROP TABLE t1; DROP TABLE t1;
**** On Master **** **** On Master ****
DROP TABLE t1; DROP TABLE t1;
mysql-test/suite/rpl/t/disabled.def
View file @ 2c966ddd
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
# #
############################################################################## ##############################################################################
rpl_row_create_table : Bug#45576 2009-12-01 joro rpl_row_create_table fails on PB2
rpl_row_create_table : Bug#51574 Feb 27 2010 andrei failed different way than earlier with bug#45576 rpl_row_create_table : Bug#51574 Feb 27 2010 andrei failed different way than earlier with bug#45576
rpl_spec_variables : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux rpl_spec_variables : BUG#47661 2009-10-27 jasonh rpl_spec_variables fails on PB2 hpux
rpl_failed_optimize : WL#4284: Can't optimize table used by a pending transaction (there is metadata lock on the table). rpl_failed_optimize : WL#4284: Can't optimize table used by a pending transaction (there is metadata lock on the table).
......
mysql-test/suite/rpl/t/rpl_bug33931.test
View file @ 2c966ddd
...@@ -40,7 +40,7 @@ connection slave; ...@@ -40,7 +40,7 @@ connection slave;
source include/wait_for_slave_to_stop.inc; source include/wait_for_slave_to_stop.inc;
--replace_result $MASTER_MYPORT MASTER_PORT --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; query_vertical show slave status;
# #
......
mysql-test/suite/rpl/t/rpl_flushlog_loop.test
View file @ 2c966ddd
...@@ -71,7 +71,7 @@ source include/wait_for_slave_param.inc; ...@@ -71,7 +71,7 @@ source include/wait_for_slave_param.inc;
# Show status of slave # Show status of slave
# #
--replace_result $SLAVE_MYPORT SLAVE_PORT $slave_param_value POSITION --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 --query_vertical SHOW SLAVE STATUS
--disable_query_log --disable_query_log
......
mysql-test/suite/rpl/t/rpl_incident.test
View file @ 2c966ddd
...@@ -24,7 +24,7 @@ source include/wait_for_slave_sql_error.inc; ...@@ -24,7 +24,7 @@ source include/wait_for_slave_sql_error.inc;
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT --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 --query_vertical SHOW SLAVE STATUS
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1; SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
...@@ -36,7 +36,7 @@ START SLAVE; ...@@ -36,7 +36,7 @@ START SLAVE;
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT --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 --query_vertical SHOW SLAVE STATUS
connection master; connection master;
......
mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
View file @ 2c966ddd
...@@ -27,7 +27,7 @@ SELECT * FROM t1; ...@@ -27,7 +27,7 @@ SELECT * FROM t1;
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
# show the error message # 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; --query_vertical show slave status;
# show that it was not replicated # show that it was not replicated
SELECT * FROM t1; SELECT * FROM t1;
...@@ -83,7 +83,7 @@ SELECT * FROM t1; ...@@ -83,7 +83,7 @@ SELECT * FROM t1;
connection slave; connection slave;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
# show the error message # 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; --query_vertical show slave status;
# show that it was not replicated # show that it was not replicated
SELECT * FROM t1; SELECT * FROM t1;
......
mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
View file @ 2c966ddd
...@@ -17,7 +17,7 @@ SHOW BINLOG EVENTS; ...@@ -17,7 +17,7 @@ SHOW BINLOG EVENTS;
sync_slave_with_master; sync_slave_with_master;
--echo **** On Slave **** --echo **** On Slave ****
--replace_result $MASTER_MYPORT MASTER_PORT --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 --query_vertical SHOW SLAVE STATUS
--replace_result $VERSION VERSION --replace_result $VERSION VERSION
--replace_column 2 # 5 # --replace_column 2 # 5 #
......
mysql-test/suite/rpl/t/rpl_replicate_do.test
View file @ 2c966ddd
...@@ -28,7 +28,7 @@ drop table if exists t1,t2,t11; ...@@ -28,7 +28,7 @@ drop table if exists t1,t2,t11;
sync_slave_with_master; sync_slave_with_master;
# show slave status, just to see of it prints replicate-do-table # show slave status, just to see of it prints replicate-do-table
--replace_result $MASTER_MYPORT MASTER_PORT --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; query_vertical SHOW SLAVE STATUS;
# #
......
mysql-test/suite/rpl/t/rpl_row_until.test
View file @ 2c966ddd
...@@ -57,7 +57,7 @@ eval START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=$mast ...@@ -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 # Here table should be still not deleted
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $master_pos_drop_t1 MASTER_POS_DROP_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; query_vertical SHOW SLAVE STATUS;
# This should fail right after start # 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 ...@@ -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 # again this table should be still not deleted
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $master_pos_drop_t1 MASTER_POS_DROP_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; query_vertical SHOW SLAVE STATUS;
# Try replicate all up to and not including the second insert to t2; # 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 ...@@ -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 --source include/wait_for_slave_sql_to_stop.inc
SELECT * FROM t2; SELECT * FROM t2;
--replace_result $relay_pos_insert1_t2 RELAY_POS_INSERT1_T2 $master_pos_insert1_t2 MASTER_POS_INSERT1_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; query_vertical SHOW SLAVE STATUS;
# clean up # clean up
...@@ -99,7 +99,7 @@ let $slave_param_value= $master_pos_create_t2; ...@@ -99,7 +99,7 @@ let $slave_param_value= $master_pos_create_t2;
# here the sql slave thread should be stopped # here the sql slave thread should be stopped
--replace_result bin.000005 bin.000004 bin.000006 bin.000004 bin.000007 bin.000004 --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_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; query_vertical SHOW SLAVE STATUS;
#testing various error conditions #testing various error conditions
......
mysql-test/suite/rpl/t/rpl_show_master_info_file-master.opt 0 → 100644
View file @ 2c966ddd
--master-info-file=$MYSQLTEST_VARDIR/master.info
mysql-test/suite/rpl/t/rpl_show_master_info_file.test 0 → 100644
View file @ 2c966ddd
#
# 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
mysql-test/suite/rpl/t/rpl_slave_skip.test
View file @ 2c966ddd
...@@ -36,7 +36,7 @@ connection slave; ...@@ -36,7 +36,7 @@ connection slave;
START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762; START SLAVE UNTIL MASTER_LOG_FILE='master-bin.000001', MASTER_LOG_POS=762;
--source include/wait_for_slave_sql_to_stop.inc --source include/wait_for_slave_sql_to_stop.inc
--replace_result $MASTER_MYPORT MASTER_PORT --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; query_vertical SHOW SLAVE STATUS;
# Now we skip *one* table map event. If the execution starts right # Now we skip *one* table map event. If the execution starts right
...@@ -74,7 +74,7 @@ START SLAVE; ...@@ -74,7 +74,7 @@ START SLAVE;
--source include/wait_for_slave_to_start.inc --source include/wait_for_slave_to_start.inc
sync_with_master; sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT --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; query_vertical SHOW SLAVE STATUS;
--echo **** On Master **** --echo **** On Master ****
......
mysql-test/suite/rpl/t/rpl_ssl.test
View file @ 2c966ddd
...@@ -31,7 +31,7 @@ select * from t1; ...@@ -31,7 +31,7 @@ select * from t1;
# The slave is synced and waiting/reading from master # The slave is synced and waiting/reading from master
# SHOW SLAVE STATUS will show "Waiting for master to send event" # SHOW SLAVE STATUS will show "Waiting for master to send event"
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT --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; query_vertical show slave status;
# Stop the slave, as reported in bug#21871 it would hang # Stop the slave, as reported in bug#21871 it would hang
...@@ -71,7 +71,7 @@ let $master_count= `select count(*) from t1`; ...@@ -71,7 +71,7 @@ let $master_count= `select count(*) from t1`;
sync_slave_with_master; sync_slave_with_master;
--source include/wait_for_slave_to_start.inc --source include/wait_for_slave_to_start.inc
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT --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; query_vertical show slave status;
let $slave_count= `select count(*) from t1`; let $slave_count= `select count(*) from t1`;
......
mysql-test/suite/rpl/t/rpl_ssl1.test
View file @ 2c966ddd
...@@ -45,7 +45,7 @@ select * from t1; ...@@ -45,7 +45,7 @@ select * from t1;
#checking show slave status #checking show slave status
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT --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; query_vertical show slave status;
#checking if replication works without ssl also performing clean up #checking if replication works without ssl also performing clean up
...@@ -59,7 +59,7 @@ drop user replssl@localhost; ...@@ -59,7 +59,7 @@ drop user replssl@localhost;
drop table t1; drop table t1;
sync_slave_with_master; sync_slave_with_master;
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT --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; query_vertical show slave status;
# End of 4.1 tests # End of 4.1 tests
...@@ -91,7 +91,7 @@ select * from t1; ...@@ -91,7 +91,7 @@ select * from t1;
#checking show slave status #checking show slave status
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR $MASTER_MYPORT MASTER_MYPORT --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; query_vertical show slave status;
connection master; connection master;
......
mysql-test/suite/rpl_ndb/t/rpl_ndb_basic.test
View file @ 2c966ddd
...@@ -196,7 +196,7 @@ source include/wait_for_slave_sql_to_stop.inc; ...@@ -196,7 +196,7 @@ source include/wait_for_slave_sql_to_stop.inc;
# Replication should have stopped, since max retries were not enough. # Replication should have stopped, since max retries were not enough.
# verify with show slave status # verify with show slave status
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 19 <Last_Errno> 20 <Last_Error> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> 37 <Last_SQL_Errno> 38 <Last_SQL_Error> --replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 19 <Last_Errno> 20 <Last_Error> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> 37 <Last_SQL_Errno> 38 <Last_SQL_Error> 41 <Master-Info-File>
--query_vertical SHOW SLAVE STATUS; --query_vertical SHOW SLAVE STATUS;
# now set max retries high enough to succeed, and start slave again # now set max retries high enough to succeed, and start slave again
......
mysql-test/suite/rpl_ndb/t/rpl_ndb_idempotent.test
View file @ 2c966ddd
...@@ -43,8 +43,8 @@ SELECT * FROM t1 ORDER BY c3; ...@@ -43,8 +43,8 @@ SELECT * FROM t1 ORDER BY c3;
SELECT * FROM t1 ORDER BY c3; SELECT * FROM t1 ORDER BY c3;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> --replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 35 <Last_IO_Errno> 36 <Last_IO_Error> 41 <Master-Info-File>
SHOW SLAVE STATUS; --query_vertical SHOW SLAVE STATUS;
# stop slave and reset position to before the last changes # stop slave and reset position to before the last changes
STOP SLAVE; STOP SLAVE;
...@@ -107,8 +107,8 @@ COMMIT; ...@@ -107,8 +107,8 @@ COMMIT;
--connection slave --connection slave
SELECT * FROM t1; SELECT * FROM t1;
--replace_result $MASTER_MYPORT MASTER_PORT --replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 34 <Last_IO_Errno> 35 <Last_IO_Error> --replace_column 1 <Slave_IO_State> 7 <Read_Master_Log_Pos> 8 <Relay_Log_File> 9 <Relay_Log_Pos> 16 <Replicate_Ignore_Table> 22 <Exec_Master_Log_Pos> 23 <Relay_Log_Space> 33 <Seconds_Behind_Master> 34 <Last_IO_Errno> 35 <Last_IO_Error> 41 <Master-Info-File>
SHOW SLAVE STATUS; --query_vertical SHOW SLAVE STATUS;
connection master; connection master;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
......
sql/rpl_mi.cc
View file @ 2c966ddd
...@@ -143,7 +143,6 @@ int init_master_info(Master_info* mi, const char* master_info_fname, ...@@ -143,7 +143,6 @@ int init_master_info(Master_info* mi, const char* master_info_fname,
int thread_mask) int thread_mask)
{ {
int fd,error; int fd,error;
char fname[FN_REFLEN+128];
DBUG_ENTER("init_master_info"); DBUG_ENTER("init_master_info");
if (mi->inited) if (mi->inited)
...@@ -169,7 +168,8 @@ int init_master_info(Master_info* mi, const char* master_info_fname, ...@@ -169,7 +168,8 @@ int init_master_info(Master_info* mi, const char* master_info_fname,
mi->mysql=0; mi->mysql=0;
mi->file_id=1; mi->file_id=1;
fn_format(fname, master_info_fname, mysql_data_home, "", 4+32); fn_format(mi->info_file_name, master_info_fname, mysql_data_home, "",
MYF(MY_UNPACK_FILENAME|MY_RETURN_REAL_PATH));
/* /*
We need a mutex while we are changing master info parameters to We need a mutex while we are changing master info parameters to
...@@ -181,7 +181,7 @@ int init_master_info(Master_info* mi, const char* master_info_fname, ...@@ -181,7 +181,7 @@ int init_master_info(Master_info* mi, const char* master_info_fname,
/* does master.info exist ? */ /* does master.info exist ? */
if (access(fname,F_OK)) if (access(mi->info_file_name, F_OK))
{ {
if (abort_if_no_master_info_file) if (abort_if_no_master_info_file)
{ {
...@@ -194,18 +194,18 @@ int init_master_info(Master_info* mi, const char* master_info_fname, ...@@ -194,18 +194,18 @@ int init_master_info(Master_info* mi, const char* master_info_fname,
*/ */
if (fd >= 0) if (fd >= 0)
mysql_file_close(fd, MYF(MY_WME)); mysql_file_close(fd, MYF(MY_WME));
if ((fd= mysql_file_open(key_file_master_info, if ((fd= mysql_file_open(key_file_master_info, mi->info_file_name,
fname, O_CREAT|O_RDWR|O_BINARY, MYF(MY_WME))) < 0 ) O_CREAT|O_RDWR|O_BINARY, MYF(MY_WME))) < 0 )
{ {
sql_print_error("Failed to create a new master info file (\ sql_print_error("Failed to create a new master info file (\
file '%s', errno %d)", fname, my_errno); file '%s', errno %d)", mi->info_file_name, my_errno);
goto err; goto err;
} }
if (init_io_cache(&mi->file, fd, IO_SIZE*2, READ_CACHE, 0L,0, if (init_io_cache(&mi->file, fd, IO_SIZE*2, READ_CACHE, 0L,0,
MYF(MY_WME))) MYF(MY_WME)))
{ {
sql_print_error("Failed to create a cache on master info file (\ sql_print_error("Failed to create a cache on master info file (\
file '%s')", fname); file '%s')", mi->info_file_name);
goto err; goto err;
} }
...@@ -220,17 +220,17 @@ file '%s')", fname); ...@@ -220,17 +220,17 @@ file '%s')", fname);
else else
{ {
if ((fd= mysql_file_open(key_file_master_info, if ((fd= mysql_file_open(key_file_master_info,
fname, O_RDWR|O_BINARY, MYF(MY_WME))) < 0 ) mi->info_file_name, O_RDWR|O_BINARY, MYF(MY_WME))) < 0 )
{ {
sql_print_error("Failed to open the existing master info file (\ sql_print_error("Failed to open the existing master info file (\
file '%s', errno %d)", fname, my_errno); file '%s', errno %d)", mi->info_file_name, my_errno);
goto err; goto err;
} }
if (init_io_cache(&mi->file, fd, IO_SIZE*2, READ_CACHE, 0L, if (init_io_cache(&mi->file, fd, IO_SIZE*2, READ_CACHE, 0L,
0, MYF(MY_WME))) 0, MYF(MY_WME)))
{ {
sql_print_error("Failed to create a cache on master info file (\ sql_print_error("Failed to create a cache on master info file (\
file '%s')", fname); file '%s')", mi->info_file_name);
goto err; goto err;
} }
} }
...@@ -344,7 +344,7 @@ file '%s')", fname); ...@@ -344,7 +344,7 @@ file '%s')", fname);
if (ssl) if (ssl)
sql_print_warning("SSL information in the master info file " sql_print_warning("SSL information in the master info file "
"('%s') are ignored because this MySQL slave was " "('%s') are ignored because this MySQL slave was "
"compiled without SSL support.", fname); "compiled without SSL support.", mi->info_file_name);
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
/* /*
......
sql/rpl_mi.h
View file @ 2c966ddd
...@@ -112,6 +112,7 @@ class Master_info : public Slave_reporting_capability ...@@ -112,6 +112,7 @@ class Master_info : public Slave_reporting_capability
ulonglong received_heartbeats; // counter of received heartbeat events ulonglong received_heartbeats; // counter of received heartbeat events
DYNAMIC_ARRAY ignore_server_ids; DYNAMIC_ARRAY ignore_server_ids;
ulong master_id; ulong master_id;
char info_file_name[FN_REFLEN + 128];
}; };
void init_master_log_pos(Master_info* mi); void init_master_log_pos(Master_info* mi);
int init_master_info(Master_info* mi, const char* master_info_fname, int init_master_info(Master_info* mi, const char* master_info_fname,
......
sql/slave.cc
View file @ 2c966ddd
...@@ -1802,7 +1802,8 @@ bool show_master_info(THD* thd, Master_info* mi) ...@@ -1802,7 +1802,8 @@ bool show_master_info(THD* thd, Master_info* mi)
FN_REFLEN)); FN_REFLEN));
field_list.push_back(new Item_return_int("Master_Server_Id", sizeof(ulong), field_list.push_back(new Item_return_int("Master_Server_Id", sizeof(ulong),
MYSQL_TYPE_LONG)); MYSQL_TYPE_LONG));
field_list.push_back(new Item_empty_string("Master_Info_File",
sizeof(mi->info_file_name)));
if (protocol->send_result_set_metadata(&field_list, if (protocol->send_result_set_metadata(&field_list,
Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
...@@ -1950,6 +1951,7 @@ bool show_master_info(THD* thd, Master_info* mi) ...@@ -1950,6 +1951,7 @@ bool show_master_info(THD* thd, Master_info* mi)
} }
// Master_Server_id // Master_Server_id
protocol->store((uint32) mi->master_id); protocol->store((uint32) mi->master_id);
protocol->store(mi->info_file_name, &my_charset_bin);
mysql_mutex_unlock(&mi->rli.err_lock); mysql_mutex_unlock(&mi->rli.err_lock);
mysql_mutex_unlock(&mi->err_lock); mysql_mutex_unlock(&mi->err_lock);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7