database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merged BUG#49978 from 5.1-bugteam to 5.5-bugteam.

Browse Source
This commit is contained in:
Sven Sandberg
2010-12-19 18:15:12 +01:00
parent 7d5df40277 09c80e12c5
commit e37c86de18
831 changed files with 7924 additions and 6322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/suite/rpl/t/rpl_ip_mix.test
View File

@@ -35,7 +35,6 @@ connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT);
connection master;
reset master;
source include/show_master_status.inc;
save_master_pos;
--echo connection slave;
connection slave;
reset slave;
@@ -50,10 +49,6 @@ let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
eval change master to master_host='0:0:0:0:0:0:0:1';
let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1);
--echo Master-Host: $master_host
--echo disconnect slave;
disconnect slave;
--echo disconnect master;
disconnect master;
--echo connection default;
connection default;
# clean up
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root';