Skip to content

Commit 4492758

Browse files
committed
WL#15814 - Resolving merge issue
While merging back from mysql-8.4 to mysql-trunk, the order of error codes should be maintained. New error codes must be appended. Change-Id: I2318cb5ceedb37013cc5fb93825d9b7ed6b0164f
1 parent 4812645 commit 4492758

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

share/messages_to_clients.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10394,6 +10394,12 @@ ER_ACCESS_DENIED_NO_PROXY
1039410394
ER_LH_USER_DATA_ACCESS_FAILED
1039510395
eng "Unable to access the following data locations: %s"
1039610396

10397+
ER_BULK_READER_ZSTD_ERROR
10398+
eng "ZSTD decompression failed: %s"
10399+
10400+
ER_BULK_PARSER_ERROR
10401+
eng "%s"
10402+
1039710403
ER_NON_SCALAR_USED_AS_KEY
1039810404
eng "Non-scalar (e.g., vector) column '%.64s' cannot be used as key."
1039910405

@@ -10409,12 +10415,6 @@ ER_EXCEEDS_VECTOR_MAX_DIMENSIONS
1040910415
ER_TO_VECTOR_CONVERSION
1041010416
eng "Data cannot be converted to a valid vector: '%.*s'"
1041110417

10412-
ER_BULK_READER_ZSTD_ERROR
10413-
eng "ZSTD decompression failed: %s"
10414-
10415-
ER_BULK_PARSER_ERROR
10416-
eng "%s"
10417-
1041810418
#
1041910419
# End of 8.1+ error messages (server-to-client).
1042010420
# Do NOT add messages intended for the error log above!

0 commit comments

Comments
 (0)