diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 13:00:09 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-06 13:00:09 +0300 |
commit | 2d8e38bc9477aa00b371ed14d95390bede70c5cb (patch) | |
tree | 7d4e4e22138572b769263994697d69bd141c5bf3 /client/mysql_upgrade.c | |
parent | b249abde57f1788a8085f45cc6252ee70ece3354 (diff) | |
parent | 4e1ca388381eea27a9275571744ad17ce317b273 (diff) | |
download | mariadb-git-2d8e38bc9477aa00b371ed14d95390bede70c5cb.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'client/mysql_upgrade.c')
-rw-r--r-- | client/mysql_upgrade.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index 99296c03a49..7777f4ca1dc 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1047,6 +1047,7 @@ static const char *expected_errors[]= "ERROR 1347", /* 'mysql.user' is not of type 'BASE TABLE' */ "ERROR 1348", /* Column 'Show_db_priv' is not updatable */ "ERROR 1356", /* definer of view lack rights (UPDATE) */ + "ERROR 1449", /* definer ('mariadb.sys'@'localhost') of mysql.user does not exist */ 0 }; |