From 4abb8216a054e14afbeb81e8529e02bab6fa14ac Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sat, 24 Nov 2018 14:13:41 +0100 Subject: MDEV-17658 change the structure of mysql.user table Implement User_table_json. Fix scripts to use mysql.global_priv. Fix tests. --- client/mysql_upgrade.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'client') diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 2a3f0527d3c..ee10996d678 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -878,10 +878,14 @@ static int run_mysqlcheck_fixnames(void) static const char *expected_errors[]= { + "ERROR 1051", /* Unknown table */ "ERROR 1060", /* Duplicate column name */ "ERROR 1061", /* Duplicate key name */ "ERROR 1054", /* Unknown column */ + "ERROR 1146", /* Table does not exist */ "ERROR 1290", /* RR_OPTION_PREVENTS_STATEMENT */ + "ERROR 1347", /* 'mysql.user' is not of type 'BASE TABLE' */ + "ERROR 1348", /* Column 'Show_db_priv' is not updatable */ 0 }; -- cgit v1.2.1