Commit fcd859ac authored by lars/lthalmann@mysql.com/dl145k.mysql.com's avatar lars/lthalmann@mysql.com/dl145k.mysql.com
Browse files

Test fix

parent 6f9f5b01

mysql-test/r/rpl_grant.result

+16 −16
Original line number Diff line number Diff line
@@ -7,40 +7,40 @@ start slave; 
**** On Master ****

CREATE USER dummy@localhost;

CREATE USER dummy1@localhost, dummy2@localhost;

SELECT user, host FROM mysql.user;

SELECT user, host FROM mysql.user WHERE user != 'root';

user	host

root	127.0.0.1

dummy	localhost

dummy1	localhost

dummy2	localhost

root	localhost

root	romeo.kindahl.net

SELECT COUNT(*) FROM mysql.user;

COUNT(*)

6

**** On Slave ****

SELECT user,host FROM mysql.user;

SELECT user,host FROM mysql.user WHERE user != 'root';

user	host

root	127.0.0.1

dummy	localhost

dummy1	localhost

dummy2	localhost

root	localhost

root	romeo.kindahl.net

SELECT COUNT(*) FROM mysql.user;

COUNT(*)

6

**** On Master ****

DROP USER nonexisting@localhost;

ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost'

DROP USER nonexisting@localhost, dummy@localhost;

ERROR HY000: Operation DROP USER failed for 'nonexisting'@'localhost'

DROP USER dummy1@localhost, dummy2@localhost;

SELECT user, host FROM mysql.user;

SELECT user, host FROM mysql.user WHERE user != 'root';

user	host

root	127.0.0.1

root	localhost

root	romeo.kindahl.net

SELECT COUNT(*) FROM mysql.user;

COUNT(*)

3

**** On Slave ****

SELECT user,host FROM mysql.user;

SELECT user,host FROM mysql.user WHERE user != 'root';

user	host

root	127.0.0.1

root	localhost

root	romeo.kindahl.net

SELECT COUNT(*) FROM mysql.user;

COUNT(*)

3

SHOW SLAVE STATUS;

Slave_IO_State	#

Master_Host	127.0.0.1

mysql-test/t/rpl_grant.test

+8 −4
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ connection master; 
CREATE USER dummy@localhost;

CREATE USER dummy1@localhost, dummy2@localhost;



SELECT user, host FROM mysql.user;

SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ

SELECT COUNT(*) FROM mysql.user;

sync_slave_with_master;

--echo **** On Slave ****

SELECT user,host FROM mysql.user;

SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ

SELECT COUNT(*) FROM mysql.user;



--echo **** On Master ****

connection master;
@@ -28,10 +30,12 @@ DROP USER nonexisting@localhost, dummy@localhost; 
# All users exist

DROP USER dummy1@localhost, dummy2@localhost;



SELECT user, host FROM mysql.user;

SELECT user, host FROM mysql.user WHERE user != 'root'; # root host non-determ

SELECT COUNT(*) FROM mysql.user;

sync_slave_with_master;

--echo **** On Slave ****

SELECT user,host FROM mysql.user;

SELECT user,host FROM mysql.user WHERE user != 'root'; # root host non-determ

SELECT COUNT(*) FROM mysql.user;



--replace_result $MASTER_MYPORT MASTER_PORT

--replace_column 1 # 8 # 9 # 23 # 33 #