BUG #31418476 - UNEXPECTED CHANGES TO ERROR CODE NUMBERING IN 8.0.21

Description:
-----------
The numbers associated with certain error codes seems to have changed between
8.0.20 and 8.0.21:

Fix:
-----------
Rearrange error messages so that they have a number between the versions.

Change-Id: I2fb004c8df9a66c2d46bff8f13c882e1047a6d9a

Author: jensevenb

share/messages_to_clients.txt

@@ -9298,12 +9298,6 @@ ER_WARN_DEPRECATED_INNER_INTO
 ER_WARN_DEPRECATED_VALUES_FUNCTION_ALWAYS_NULL
   eng "The VALUES function is deprecated and will be removed in a future release. It always returns NULL in this context. If you meant to access a value from the VALUES clause of the INSERT statement, consider using an alias (INSERT INTO ... VALUES (...) AS alias) and reference alias.col instead of VALUES(col) in the ON DUPLICATE KEY UPDATE clause."
 
-ER_MISSING_JSON_VALUE 22035
-  eng "No value was found by '%.192s' on the specified path."
-
-ER_MULTIPLE_JSON_VALUES 22034
-  eng "More than one value was found by '%.192s' on the specified path."
-
 # When using this error message, use the ER_WARN_DEPRECATED_SYNTAX error
 # code.
 ER_WARN_DEPRECATED_SQL_CALC_FOUND_ROWS
@@ -9314,6 +9308,12 @@ ER_WARN_DEPRECATED_SQL_CALC_FOUND_ROWS
 ER_WARN_DEPRECATED_FOUND_ROWS
   eng "FOUND_ROWS() is deprecated and will be removed in a future release. Consider using COUNT(*) instead."
 
+ER_MISSING_JSON_VALUE 22035
+  eng "No value was found by '%.192s' on the specified path."
+
+ER_MULTIPLE_JSON_VALUES 22034
+  eng "More than one value was found by '%.192s' on the specified path."
+
 ER_HOSTNAME_TOO_LONG
   eng "Hostname cannot be longer than %d characters."
 

share/messages_to_error_log.txt

@@ -10806,12 +10806,6 @@ ER_IB_MSG_INNODB_START_INITIALIZE
 ER_IB_MSG_INNODB_END_INITIALIZE
   eng "InnoDB initialization has ended."
 
-ER_WARN_LOG_DEPRECATED_PARTITION_PREFIX_KEY
-  eng "Column '%.64s.%.64s.%.64s' having prefix key part '%.64s(%u)' is ignored by the partitioning function. Use of prefixed columns in the PARTITION BY KEY() clause is deprecated and will be removed in a future release."
-
-ER_INNODB_UNABLE_TO_ACQUIRE_DD_OBJECT
-  eng "%s"
-
 ER_IB_MSG_PAGE_ARCH_NO_RESET_POINTS
   eng "Could not find appropriate reset points."
 
@@ -10827,12 +10821,18 @@ ER_IB_ERR_PAGE_ARCH_RECOVERY_FAILED
 ER_IB_ERR_PAGE_ARCH_INVALID_FORMAT
   eng "Invalid archived file name format. The archived file is supposed to have the format %s + [0-9]*."
 
-ER_IB_MSG_UNDO_TRUNCATE_TOO_OFTEN
-  eng "Undo Truncation is occurring too often. Consider increasing --innodb-max-undo-log-size."
-
 ER_INVALID_XPLUGIN_SOCKET_SAME_AS_SERVER
   eng "X Plugins UNIX socket must use different file than MySQL server. X Plugin won't be accessible through UNIX socket"
 
+ER_INNODB_UNABLE_TO_ACQUIRE_DD_OBJECT
+  eng "%s"
+
+ER_WARN_LOG_DEPRECATED_PARTITION_PREFIX_KEY
+  eng "Column '%.64s.%.64s.%.64s' having prefix key part '%.64s(%u)' is ignored by the partitioning function. Use of prefixed columns in the PARTITION BY KEY() clause is deprecated and will be removed in a future release."
+
+ER_IB_MSG_UNDO_TRUNCATE_TOO_OFTEN
+  eng "Undo Truncation is occurring too often. Consider increasing --innodb-max-undo-log-size."
+
 ER_GRP_RPL_IS_STARTING
   eng "Plugin 'group_replication' is starting."