diff --git a/share/messages_to_error_log.txt b/share/messages_to_error_log.txt
index cc66ef2e27b..b58edbd0a43 100644
--- a/share/messages_to_error_log.txt
+++ b/share/messages_to_error_log.txt
@@ -3300,8 +3300,8 @@ ER_EXPIRE_LOGS_DAYS_IGNORED
 ER_BINLOG_MALFORMED_OR_OLD_RELAY_LOG
   eng "malformed or very old relay log which does not have FormatDescriptor."
 
-ER_DD_UPGRADE_VIEW_COLUMN_NAME_TOO_LONG
-  eng "Upgrade of view '%s.%s' failed. Re-create the view with the explicit column name lesser than 64 characters."
+ER_DD_UPGRADE_VIEW_COLUMN_NAME_WRONG
+  eng "Upgrade of view '%s.%s' failed. Re-create the view with the explicit column name lesser than 64 characters or not end with space."
 
 ER_TABLE_NEEDS_DUMP_UPGRADE
   eng "Table upgrade required for `%-.64s`.`%-.64s`. Please dump/reload table to fix it!"
diff --git a/sql/dd/upgrade_57/table.cc b/sql/dd/upgrade_57/table.cc
index bcba95ac771..b034a05e689 100644
--- a/sql/dd/upgrade_57/table.cc
+++ b/sql/dd/upgrade_57/table.cc
@@ -905,7 +905,7 @@ static bool fix_view_cols_and_deps(THD *thd, Table_ref *view_ref,
     if (db_name != "sys") {
       if (dd::upgrade::Bootstrap_error_handler::abort_on_error) {
         // Exit the upgrade process by reporting an error.
-        LogErr(ERROR_LEVEL, ER_DD_UPGRADE_VIEW_COLUMN_NAME_TOO_LONG,
+        LogErr(ERROR_LEVEL, ER_DD_UPGRADE_VIEW_COLUMN_NAME_WRONG,
                db_name.c_str(), view_name.c_str());
         error = true;
       } else if (dd::upgrade::Syntax_error_handler::is_parse_error) {