summaryrefslogtreecommitdiff
path: root/mysql-test/suite/roles/flush_roles-17898.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-12-07 15:13:39 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2018-12-07 15:13:39 +0200
commit52778e2e3e69b8e0d1397ca34694e192c8e0f88c (patch)
tree723a00f0400cb5a2b39fbacc88a79da03a1fc78f /mysql-test/suite/roles/flush_roles-17898.result
parent5e5deabdbcbd189f1242c493f0e1d534d8acbdb0 (diff)
downloadmariadb-git-52778e2e3e69b8e0d1397ca34694e192c8e0f88c.tar.gz
After-merge fix
Diffstat (limited to 'mysql-test/suite/roles/flush_roles-17898.result')
-rw-r--r--mysql-test/suite/roles/flush_roles-17898.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/roles/flush_roles-17898.result b/mysql-test/suite/roles/flush_roles-17898.result
index c09fa166dc0..dbe6ea24afd 100644
--- a/mysql-test/suite/roles/flush_roles-17898.result
+++ b/mysql-test/suite/roles/flush_roles-17898.result
@@ -1,7 +1,7 @@
use mysql;
insert db (db,user,select_priv) values ('foo','dwr_foo','Y'), ('bar','dwr_bar','Y');
insert roles_mapping (user,role) values ('dwr_qux_dev','dwr_foo'),('dwr_qux_dev','dwr_bar');
-insert user (user,show_db_priv,is_role) values ('dwr_foo','N','Y'), ('dwr_bar','N','Y'), ('dwr_qux_dev','Y','Y');
+insert ignore user (user,show_db_priv,is_role) values ('dwr_foo','N','Y'), ('dwr_bar','N','Y'), ('dwr_qux_dev','Y','Y');
Warnings:
Warning 1364 Field 'ssl_cipher' doesn't have a default value
Warning 1364 Field 'x509_issuer' doesn't have a default value