Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions mysql-test/include/wait_show_condition.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# USAGE
#
# All rows of the result must fulfil the condition if $all_rows_fulfil is 1
# All rows of the result must fulfil the condition if $wait_for_all is 1
# else at least one of the result must fulfil the condition.
# let $wait_for_all= 1;
# let $show_statement= SHOW PROCESSLIST;
Expand All @@ -25,7 +25,7 @@
# let $condition= = 'Updating';
# --source include/wait_show_condition.inc
#
# Please do not use this use routine if you can replace the SHOW statement
# Please do not use this routine if you can replace the SHOW statement
# with a select. In such a case include/wait_condition.inc is recommended.
#
# Created: 2009-02-18 mleich
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/main/grant_master_admin.result
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ GRANT REPLICATION MASTER ADMIN ON *.* TO `user1`@`localhost`
connect con1,localhost,user1,,;
connection con1;
SHOW SLAVE HOSTS;
Server_id Host Port Master_id
Server_id Host Port Master_id Gtid_State_Sent Gtid_State_Ack Sync_Status
connection default;
DROP USER user1@localhost;
#
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/rpl/r/rpl_fail_register.result
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set global debug_dbug=@old_dbug;
connection master;
kill DUMP_THREAD;
show slave hosts;
Server_id Host Port Master_id
Server_id Host Port Master_id Gtid_State_Sent Gtid_State_Ack Sync_Status
connection slave;
start slave;
include/rpl_end.inc
4 changes: 2 additions & 2 deletions mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ n
2002
connection master;
show slave hosts;
Server_id Host Port Master_id
2 127.0.0.1 9999 1
Server_id Host Port Master_id Gtid_State_Sent Gtid_State_Ack Sync_Status
2 127.0.0.1 9999 1 asynchronous
drop table t1;
connection slave;
stop slave;
Expand Down
Loading