mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-35773 ER_PSEUDO_THREAD_ID_OVERWRITE in 11.4 shifts error messages

Browse source 
Copy error messages from 11.7 down to 11.4 (they are unused) to preserve their order
This commit is contained in:
Dave Gosselin 2025-01-06 12:13:33 -05:00 committed by Dave Gosselin
parent 7fcaab7aaa
commit 437550b7cf
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/rpl/r/rpl_xa.result
View file

@ -30,7 +30,7 @@ insert into t2 values (0);
xa end 's';
xa prepare 's';
Warnings:
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten
include/save_master_gtid.inc
connection slave;
include/sync_with_master_gtid.inc

2
mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result
View file

@ -36,7 +36,7 @@ insert into t2 values (0);
xa end 's';
xa prepare 's';
Warnings:
Warning 4196 Pseudo thread id should not be modified by the client as it will be overwritten
Warning 4205 Pseudo thread id should not be modified by the client as it will be overwritten
include/save_master_gtid.inc
connection slave;
include/sync_with_master_gtid.inc

28
sql/share/errmsg-utf8.txt
View file

@ -11872,10 +11872,8 @@ ER_VERS_ENGINE_UNSUPPORTED
spa "No se soporta versionado de sistema de transacción precisa para %`s"
sw "Toleo la mfumo wa muamala kamili kwa %`s halitumiki"
ER_UNUSED_23
eng "You should never see it"
spa "Nunca debería vd de ver esto"
sw "Hupaswi kuiona kamwe"
ER_WRONG_VERSIONING_RANGE
eng "Incorrect system-version range '%-.32s' value: '%-.128T' and '%-.32s' value: '%-.128T'"
ER_PARTITION_WRONG_TYPE
chi "错误分区类型%`s，应当是%`s"
@ -12270,5 +12268,27 @@ ER_JSON_SCHEMA_KEYWORD_UNSUPPORTED
sw "%s neno kuu halitumiki"
ER_JSON_NO_VARIABLE_SCHEMA
eng "Variable schema is not supported."
ER_SEQUENCE_TABLE_HAS_WRONG_NUMBER_OF_COLUMNS
eng "Wrong number of columns"
ER_SEQUENCE_TABLE_CANNOT_HAVE_ANY_KEYS
eng "Sequence tables cannot have any keys"
ER_SEQUENCE_TABLE_CANNOT_HAVE_ANY_CONSTRAINTS
eng "Sequence tables cannot have any constraints"
ER_SEQUENCE_TABLE_ORDER_BY
eng "ORDER BY"
ER_VARIABLE_IGNORED
eng "The variable '%s' is ignored. It only exists for compatibility with old installations and will be removed in a future release"
ER_INCORRECT_COLUMN_NAME_COUNT
eng "Incorrect column name count for derived table"
chi "派生表的列名计数不正确"
WARN_SORTING_ON_TRUNCATED_LENGTH
eng "%llu values were longer than max_sort_length. Sorting used only the first %lu bytes"
ger "%llu Werte waren länger als max_sort_length. Sie wurden anhand der ersten %lu Bytes verglichen"
rus "%llu значений были длиннее, чем max_sort_length. Их сортировка проведена по первым %lu байтам"
swe "%llu värden var längre än max_sort_length=%lu"
ER_VECTOR_BINARY_FORMAT_INVALID
eng "Invalid binary vector format. Must use IEEE standard float representation in little-endian format. Use VEC_FromText() to generate it."
ER_VECTOR_FORMAT_INVALID
eng "Invalid vector format at offset: %d for '%-.100s'. Must be a valid JSON array of numbers."
ER_PSEUDO_THREAD_ID_OVERWRITE
eng "Pseudo thread id should not be modified by the client as it will be overwritten"