summaryrefslogtreecommitdiff
path: root/mysql-test/main/not_embedded_server.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-11-22 16:16:53 +0100
committerSergei Golubchik <serg@mariadb.org>2018-12-12 00:31:04 +0100
commita76aadf7bc54e750e2474a080777e346ddbffc0d (patch)
tree90b7e0a77b49a1c762bc1091a4cb0d904f65581b /mysql-test/main/not_embedded_server.result
parent9887d2e881b49dcfaea9b1af7f7ac62648032085 (diff)
downloadmariadb-git-a76aadf7bc54e750e2474a080777e346ddbffc0d.tar.gz
MDEV-17658 change the structure of mysql.user table
Introduce User_table_tabular(mysql.user) and User_table_json(mysql.global_priv). The latter is not implemented. Automatic fallback to the old implementation works. Results change because privilege tables are opened in a different order now.
Diffstat (limited to 'mysql-test/main/not_embedded_server.result')
-rw-r--r--mysql-test/main/not_embedded_server.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/not_embedded_server.result b/mysql-test/main/not_embedded_server.result
index ba68ca8619b..bc794ce48c8 100644
--- a/mysql-test/main/not_embedded_server.result
+++ b/mysql-test/main/not_embedded_server.result
@@ -1,4 +1,4 @@
-call mtr.add_suppression("Can't open and lock privilege tables: Table 'user' was not locked with LOCK TABLES");
+call mtr.add_suppression("Can't open and lock privilege tables: Table 'db' was not locked with LOCK TABLES");
SHOW VARIABLES like 'slave_skip_errors';
Variable_name Value
slave_skip_errors OFF
@@ -16,7 +16,7 @@ DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (c1 INT);
LOCK TABLES t1 READ;
FLUSH PRIVILEGES;
-ERROR HY000: Table 'user' was not locked with LOCK TABLES
+ERROR HY000: Table 'db' was not locked with LOCK TABLES
UNLOCK TABLES;
DROP TABLE t1;
#