diff options
Diffstat (limited to 'mysql-test/suite/engines/funcs/r/rpl_row_USER.result')
| -rw-r--r-- | mysql-test/suite/engines/funcs/r/rpl_row_USER.result | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/mysql-test/suite/engines/funcs/r/rpl_row_USER.result b/mysql-test/suite/engines/funcs/r/rpl_row_USER.result index c4774665307..2771c674f44 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_row_USER.result +++ b/mysql-test/suite/engines/funcs/r/rpl_row_USER.result @@ -1,15 +1,15 @@ -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; +include/master-slave.inc +[connection master] +set local sql_mode=""; +connection master; DROP DATABASE IF EXISTS mysqltest1; CREATE DATABASE mysqltest1; CREATE USER tester IDENTIFIED BY 'test'; GRANT ALL ON mysqltest1.* TO 'tester'@'%' IDENTIFIED BY 'test'; GRANT ALL ON mysqltest1.* TO ''@'localhost%'; FLUSH PRIVILEGES; +connect m_1,localhost,tester,,mysqltest1; +connection m_1; CREATE TABLE mysqltest1.t1 (a INT, users VARCHAR(255), PRIMARY KEY(a)); INSERT INTO mysqltest1.t1 VALUES(1,USER()); INSERT INTO mysqltest1.t1 VALUES(2,CURRENT_USER()); @@ -19,21 +19,26 @@ INSERT INTO mysqltest1.t1 VALUES(3,USER()); INSERT INTO mysqltest1.t1 VALUES(4,CURRENT_USER()); end| CALL mysqltest1.p1(); +connection master; SELECT * FROM mysqltest1.t1 ORDER BY a; a users 1 tester@localhost 2 @localhost% 3 tester@localhost 4 @localhost% +connection slave; SELECT * FROM mysqltest1.t1 ORDER BY a; a users 1 tester@localhost 2 @localhost% 3 tester@localhost 4 @localhost% +connection master; +DROP DATABASE mysqltest1; REVOKE ALL ON mysqltest1.* FROM 'tester'@'%'; REVOKE ALL ON mysqltest1.* FROM ''@'localhost%'; -DROP DATABASE mysqltest1; -DROP USER 'tester'; +DROP USER tester@'%'; DROP USER ''@'localhost%'; FLUSH PRIVILEGES; +connection slave; +include/rpl_end.inc |