Skip to content

M
mariadb
Commit 1752b140 authored by msvensson@pilot.mysql.com's avatar msvensson@pilot.mysql.com
Browse files
Options

Bug #34654 RESET SLAVE and STOP SLAVE/START SLAVE does not clear Last_XYZ_Errno

parent d8a6ff5d
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
View file @ 1752b140
...@@ -122,7 +122,7 @@ INSERT INTO t1_nodef VALUES (1,2); ...@@ -122,7 +122,7 @@ INSERT INTO t1_nodef VALUES (1,2);
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 # 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>
--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;
...@@ -142,7 +142,7 @@ sync_slave_with_master; ...@@ -142,7 +142,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 # 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>
--query_vertical SHOW SLAVE STATUS --query_vertical SHOW SLAVE STATUS
connection master; connection master;
...@@ -154,7 +154,7 @@ INSERT INTO t4 VALUES (4); ...@@ -154,7 +154,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 # 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>
--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;
...@@ -168,7 +168,7 @@ INSERT INTO t5 VALUES (5,10,25); ...@@ -168,7 +168,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 # 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>
--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;
...@@ -182,7 +182,7 @@ INSERT INTO t6 VALUES (6,12,36); ...@@ -182,7 +182,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 # 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>
--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;
...@@ -191,7 +191,7 @@ connection master; ...@@ -191,7 +191,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 # 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>
--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/suite/rpl/r/rpl_row_tabledefs_2myisam.result
View file @ 1752b140
...@@ -140,7 +140,7 @@ Master_SSL_Cipher ...@@ -140,7 +140,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1364 Last_SQL_Errno 1364
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -191,7 +191,7 @@ Master_SSL_Cipher ...@@ -191,7 +191,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0 Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -232,7 +232,7 @@ Master_SSL_Cipher ...@@ -232,7 +232,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535 Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -275,7 +275,7 @@ Master_SSL_Cipher ...@@ -275,7 +275,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535 Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -318,7 +318,7 @@ Master_SSL_Cipher ...@@ -318,7 +318,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535 Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -360,7 +360,7 @@ Master_SSL_Cipher ...@@ -360,7 +360,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0 Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
......
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
View file @ 1752b140
...@@ -140,7 +140,7 @@ Master_SSL_Cipher ...@@ -140,7 +140,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1364 Last_SQL_Errno 1364
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -191,7 +191,7 @@ Master_SSL_Cipher ...@@ -191,7 +191,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0 Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -232,7 +232,7 @@ Master_SSL_Cipher ...@@ -232,7 +232,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535 Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -275,7 +275,7 @@ Master_SSL_Cipher ...@@ -275,7 +275,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535 Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -318,7 +318,7 @@ Master_SSL_Cipher ...@@ -318,7 +318,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 1535 Last_SQL_Errno 1535
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
...@@ -360,7 +360,7 @@ Master_SSL_Cipher ...@@ -360,7 +360,7 @@ Master_SSL_Cipher
Master_SSL_Key Master_SSL_Key
Seconds_Behind_Master # Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No Master_SSL_Verify_Server_Cert No
Last_IO_Errno 0 Last_IO_Errno <Last_IO_Errno>
Last_IO_Error <Last_IO_Error> Last_IO_Error <Last_IO_Error>
Last_SQL_Errno 0 Last_SQL_Errno 0
Last_SQL_Error <Last_SQL_Error> Last_SQL_Error <Last_SQL_Error>
......
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