diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-11-24 14:13:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-12 00:31:44 +0100 |
| commit | 4abb8216a054e14afbeb81e8529e02bab6fa14ac (patch) | |
| tree | a2e0d28a19ab222edf6bf2e68c26a6df14db05a6 /client | |
| parent | d68d7e50f928f7966f21524b4247a0a54d09a6d1 (diff) | |
| download | mariadb-git-4abb8216a054e14afbeb81e8529e02bab6fa14ac.tar.gz | |
MDEV-17658 change the structure of mysql.user table
Implement User_table_json.
Fix scripts to use mysql.global_priv.
Fix tests.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql_upgrade.c | 4 |
1 files changed, 4 insertions, 0 deletions
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 }; |