Skip to content

Commit 437550b

Browse files
MDEV-35773 ER_PSEUDO_THREAD_ID_OVERWRITE in 11.4 shifts error messages
Copy error messages from 11.7 down to 11.4 (they are unused) to preserve their order
1 parent 7fcaab7 commit 437550b

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

mysql-test/suite/rpl/r/rpl_xa.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ insert into t2 values (0);
3030
xa end 's';
3131
xa prepare 's';
3232
Warnings:
33-
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
33+
Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten
3434
include/save_master_gtid.inc
3535
connection slave;
3636
include/sync_with_master_gtid.inc

mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ insert into t2 values (0);
3636
xa end 's';
3737
xa prepare 's';
3838
Warnings:
39-
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
39+
Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten
4040
include/save_master_gtid.inc
4141
connection slave;
4242
include/sync_with_master_gtid.inc

sql/share/errmsg-utf8.txt

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11872,10 +11872,8 @@ ER_VERS_ENGINE_UNSUPPORTED
1187211872
spa "No se soporta versionado de sistema de transacción precisa para %`s"
1187311873
sw "Toleo la mfumo wa muamala kamili kwa %`s halitumiki"
1187411874

11875-
ER_UNUSED_23
11876-
eng "You should never see it"
11877-
spa "Nunca debería vd de ver esto"
11878-
sw "Hupaswi kuiona kamwe"
11875+
ER_WRONG_VERSIONING_RANGE
11876+
eng "Incorrect system-version range '%-.32s' value: '%-.128T' and '%-.32s' value: '%-.128T'"
1187911877

1188011878
ER_PARTITION_WRONG_TYPE
1188111879
chi "错误分区类型%`s,应当是%`s"
@@ -12270,5 +12268,27 @@ ER_JSON_SCHEMA_KEYWORD_UNSUPPORTED
1227012268
sw "%s neno kuu halitumiki"
1227112269
ER_JSON_NO_VARIABLE_SCHEMA
1227212270
eng "Variable schema is not supported."
12271+
ER_SEQUENCE_TABLE_HAS_WRONG_NUMBER_OF_COLUMNS
12272+
eng "Wrong number of columns"
12273+
ER_SEQUENCE_TABLE_CANNOT_HAVE_ANY_KEYS
12274+
eng "Sequence tables cannot have any keys"
12275+
ER_SEQUENCE_TABLE_CANNOT_HAVE_ANY_CONSTRAINTS
12276+
eng "Sequence tables cannot have any constraints"
12277+
ER_SEQUENCE_TABLE_ORDER_BY
12278+
eng "ORDER BY"
12279+
ER_VARIABLE_IGNORED
12280+
eng "The variable '%s' is ignored. It only exists for compatibility with old installations and will be removed in a future release"
12281+
ER_INCORRECT_COLUMN_NAME_COUNT
12282+
eng "Incorrect column name count for derived table"
12283+
chi "派生表的列名计数不正确"
12284+
WARN_SORTING_ON_TRUNCATED_LENGTH
12285+
eng "%llu values were longer than max_sort_length. Sorting used only the first %lu bytes"
12286+
ger "%llu Werte waren länger als max_sort_length. Sie wurden anhand der ersten %lu Bytes verglichen"
12287+
rus "%llu значений были длиннее, чем max_sort_length. Их сортировка проведена по первым %lu байтам"
12288+
swe "%llu värden var längre än max_sort_length=%lu"
12289+
ER_VECTOR_BINARY_FORMAT_INVALID
12290+
eng "Invalid binary vector format. Must use IEEE standard float representation in little-endian format. Use VEC_FromText() to generate it."
12291+
ER_VECTOR_FORMAT_INVALID
12292+
eng "Invalid vector format at offset: %d for '%-.100s'. Must be a valid JSON array of numbers."
1227312293
ER_PSEUDO_THREAD_ID_OVERWRITE
1227412294
eng "Pseudo thread id should not be modified by the client as it will be overwritten"

0 commit comments

Comments
 (0)