diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 11:32:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 11:32:43 +0300 |
| commit | 882ce206dbf06b771ffe4cbce2e3e4214982f302 (patch) | |
| tree | 63b3d1314bf9ab4d8c7fe314818c6349c127f877 /mysql-test/main/mysql_upgrade.result | |
| parent | 6ab6b1510ed0851bda335a8919047c02860fe2e8 (diff) | |
| parent | d7c82610c14f5102258640c73c1d78ea22f942c3 (diff) | |
| download | mariadb-git-882ce206dbf06b771ffe4cbce2e3e4214982f302.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/mysql_upgrade.result')
| -rw-r--r-- | mysql-test/main/mysql_upgrade.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result index f6b9770a190..d41df55b113 100644 --- a/mysql-test/main/mysql_upgrade.result +++ b/mysql-test/main/mysql_upgrade.result @@ -145,7 +145,7 @@ test Phase 7/7: Running 'FLUSH PRIVILEGES' OK DROP USER mysqltest1@'%'; -Version check failed. Got the following error when calling the 'mysql' command line client +Version check failed. Got the following error when calling the 'mysql_upgrade' command line client ERROR 1045 (28000): Access denied for user 'mysqltest1'@'localhost' (using password: YES) FATAL ERROR: Upgrade failed Run mysql_upgrade with a non existing server socket @@ -412,7 +412,7 @@ OK # Bug #21489398: MYSQL_UPGRADE: FATAL ERROR: UPGRADE FAILED - IMPROVE ERROR # Run mysql_upgrade with unauthorized access -Version check failed. Got the following error when calling the 'mysql' command line client +Version check failed. Got the following error when calling the 'mysql_upgrade' command line client ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES) FATAL ERROR: Upgrade failed # |