diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c
index f81cff2797c..3afe24e2dd7 100644
--- a/client/mysql_upgrade.c
+++ b/client/mysql_upgrade.c
@@ -855,8 +855,7 @@ static int upgrade_already_done(int silent)
   s= strchr(version, '.');
   s= strchr(s + 1, '.');
 
-  if (strncmp(upgrade_from_version, version,
-              (size_t)(s - version + 1)))
+  if (strncmp(upgrade_from_version, version, (size_t)(s - version + 1)))
   {
     if (calc_server_version(upgrade_from_version) <= MYSQL_VERSION_ID)
     {
@@ -870,9 +869,14 @@ static int upgrade_already_done(int silent)
   }
   if (!silent)
   {
-    verbose("This installation of MariaDB is already upgraded to %s.\n"
-            "There is no need to run mysql_upgrade again for %s.",
-            upgrade_from_version, version);
+    if (strcmp(upgrade_from_version, version))
+      verbose("This installation of MariaDB is already upgraded to %s.\n"
+              "There is no need to run mysql_upgrade again for %s, because "
+              "they're both %.*s.",
+              upgrade_from_version, version, (int)(s - version), version);
+    else
+      verbose("This installation of MariaDB is already upgraded to %s.\n"
+              "There is no need to run mysql_upgrade again.", version);
     if (!opt_check_upgrade)
       verbose("You can use --force if you still want to run mysql_upgrade");
   }
diff --git a/mysql-test/main/mysql_upgrade.result b/mysql-test/main/mysql_upgrade.result
index 8c3d7354604..33f1df35feb 100644
--- a/mysql-test/main/mysql_upgrade.result
+++ b/mysql-test/main/mysql_upgrade.result
@@ -48,7 +48,7 @@ Phase 7/7: Running 'FLUSH PRIVILEGES'
 OK
 Run it again - should say already completed
 This installation of MariaDB is already upgraded to X.Y.Z-MariaDB.
-There is no need to run mysql_upgrade again for X.Y.Z-MariaDB.
+There is no need to run mysql_upgrade again.
 You can use --force if you still want to run mysql_upgrade
 Force should run it regardless of whether it has been run before
 Phase 1/7: Checking and upgrading mysql database
@@ -778,10 +778,10 @@ FLUSH PRIVILEGES;
 # MDEV-27279: mariadb_upgrade add --check-if-upgrade-is-needed
 #
 This installation of MariaDB is already upgraded to X.Y.Z-MariaDB.
-There is no need to run mysql_upgrade again for X.Y.Z-MariaDB.
+There is no need to run mysql_upgrade again.
 Looking for 'mariadb' as: mariadb
 This installation of MariaDB is already upgraded to X.Y.Z-MariaDB.
-There is no need to run mysql_upgrade again for X.Y.Z-MariaDB.
+There is no need to run mysql_upgrade again.
 #
 # MDEV-27279: mariadb_upgrade check-if-upgrade absence is do it
 #
@@ -792,9 +792,9 @@ Empty or non existent ...mysql_upgrade_info. Assuming mysql_upgrade has to be ru
 #
 Looking for 'mariadb' as: mariadb
 This installation of MariaDB is already upgraded to X.Y.0-MariaDB.
-There is no need to run mysql_upgrade again for X.Y.Z-MariaDB.
+There is no need to run mysql_upgrade again for X.Y.Z-MariaDB, because they're both X.Y.
 This installation of MariaDB is already upgraded to X.Y.0-MariaDB.
-There is no need to run mysql_upgrade again for X.Y.Z-MariaDB.
+There is no need to run mysql_upgrade again for X.Y.Z-MariaDB, because they're both X.Y.
 You can use --force if you still want to run mysql_upgrade
 #
 # MDEV-27279: mariadb_upgrade check-if-upgrade with major version change