summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql_upgrade.result
diff options
context:
space:
mode:
authorSujatha <sujatha.sivakumar@mariadb.com>2020-09-28 17:27:42 +0530
committerSujatha <sujatha.sivakumar@mariadb.com>2020-09-28 17:27:42 +0530
commit6cbbd6bd96a8b5c97ec4d0b687aac29fb0f63a6a (patch)
tree93d54c9fc71e2e76d1695cd5189bb8298c29d2e9 /mysql-test/main/mysql_upgrade.result
parenta6987d9fb921a6638bb1a2397b89ca606fad6f49 (diff)
parent842616532a76cd078ba1d526ae4b85d3ad4be069 (diff)
downloadmariadb-git-6cbbd6bd96a8b5c97ec4d0b687aac29fb0f63a6a.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/mysql_upgrade.result')
-rw-r--r--mysql-test/main/mysql_upgrade.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index a77a4c061a0..aa58440747a 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_upgrade' command line client
+Version check failed. Got the following error when calling the 'mysql' 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_upgrade' command line client
+Version check failed. Got the following error when calling the 'mysql' command line client
ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)
FATAL ERROR: Upgrade failed
#