summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl/r/rpl_row_001.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-07-26 08:54:44 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-07-26 09:19:52 +0300
commit93b6552182740d1a66cf41c30811e7275d31b07f (patch)
tree96341a5a841bfd6b53981b9b96b1cd5ef6e7f3d5 /mysql-test/suite/rpl/r/rpl_row_001.result
parent294a426088bd7167f42388e7e76ff8d42df7d6be (diff)
parent0f90728bc0f8bc946a61500801b23f8a316e73d5 (diff)
downloadmariadb-git-93b6552182740d1a66cf41c30811e7275d31b07f.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_row_001.result')
-rw-r--r--mysql-test/suite/rpl/r/rpl_row_001.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_001.result b/mysql-test/suite/rpl/r/rpl_row_001.result
index b5b2b370e61..f7684d5ad97 100644
--- a/mysql-test/suite/rpl/r/rpl_row_001.result
+++ b/mysql-test/suite/rpl/r/rpl_row_001.result
@@ -19,11 +19,11 @@ create temporary table tmp select * from mysql.user where host="localhost" and u
connection slave;
STOP SLAVE;
connection master;
-SET PASSWORD FOR root@"localhost" = PASSWORD('foo');
+UPDATE mysql.user SET password=password('foo') WHERE host='localhost' AND user='root';
connection slave;
START SLAVE;
connection master;
-SET PASSWORD FOR root@"localhost" = PASSWORD('');
+UPDATE mysql.user SET password=password('') WHERE host='localhost' AND user='root';
CREATE TABLE t3(n INT);
INSERT INTO t3 VALUES(1),(2);
connection slave;