diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 21:12:48 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-22 21:12:48 +0300 |
commit | d9d9c30b707d7634503c8d3bce7dab7f7ec3fd34 (patch) | |
tree | dd112cca32b4cbc18980788ad591a61b41add71e /mysql-test/main/mysql_upgrade.result | |
parent | fde3d895d9dca494be9fa077835fb2f606a5f3d0 (diff) | |
parent | 9d0ee2dcb72c011b4ee73c578cc32b666297ca31 (diff) | |
download | mariadb-git-d9d9c30b707d7634503c8d3bce7dab7f7ec3fd34.tar.gz |
Merge 10.2 into 10.3
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 aa58440747a..a77a4c061a0 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 @@ -413,7 +413,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 # |