Skip to content

Commit b54aeeb

Browse files
committed
never add new error messages to old GA releases!
this fixes aae4932
1 parent 685db2c commit b54aeeb

File tree

3 files changed

+9
-11
lines changed

3 files changed

+9
-11
lines changed

mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Non-existed domain is warned, the command completes without rotation
99
but with a warning
1010
FLUSH BINARY LOGS DELETE_DOMAIN_ID = (99);
1111
Warnings:
12-
Warning1982The gtid domain being deleted ('99') is not in the current binlog state
12+
Warning1076The gtid domain being deleted ('99') is not in the current binlog state
1313
show binary logs;
1414
Log_name File_size
1515
master-bin.000001 #
@@ -36,15 +36,15 @@ Already deleted domain in Gtid_list of the earliest log is benign
3636
but may cause a warning
3737
FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1);
3838
Warnings:
39-
Warning1982The current gtid binlog state is incompatible with a former one missing gtids from the '1-1' domain-server pair which is referred to in the gtid list describing an earlier state. Ignore if the domain ('1') was already explicitly deleted.
40-
Warning1982The gtid domain being deleted ('1') is not in the current binlog state
39+
Warning1076The current gtid binlog state is incompatible with a former one missing gtids from the '1-1' domain-server pair which is referred to in the gtid list describing an earlier state. Ignore if the domain ('1') was already explicitly deleted.
40+
Warning1076The gtid domain being deleted ('1') is not in the current binlog state
4141
FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 0);
4242
ERROR HY000: Could not delete gtid domain. Reason: binlog files may contain gtids from the domain ('1') being deleted. Make sure to first purge those files.
4343
FLUSH BINARY LOGS;
4444
PURGE BINARY LOGS TO 'master-bin.000005';
4545
FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 0);
4646
Warnings:
47-
Warning1982The gtid domain being deleted ('0') is not in the current binlog state
47+
Warning1076The gtid domain being deleted ('0') is not in the current binlog state
4848
Gtid_list of the current binlog does not contain 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 0:
4949
show binlog events in 'master-bin.000006' limit 1,1;
5050
Log_name Pos Event_type Server_id End_log_pos Info
@@ -73,6 +73,6 @@ PURGE BINARY LOGS TO 'master-bin.000007';
7373
the following command succeeds with warnings
7474
FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1);
7575
Warnings:
76-
Warning1982The current gtid binlog state is incompatible with a former one having a gtid '11-11-1' which is less than the '11-11-11' of the gtid list describing an earlier state. The state may have been affected by manually injecting a lower sequence number gtid or via replication.
76+
Warning1076The current gtid binlog state is incompatible with a former one having a gtid '11-11-1' which is less than the '11-11-11' of the gtid list describing an earlier state. The state may have been affected by manually injecting a lower sequence number gtid or via replication.
7777
DROP TABLE t;
7878
RESET MASTER;

mysql-test/suite/binlog/r/binlog_gtid_delete_domain_debug.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ FLUSH BINARY LOGS DELETE_DOMAIN_ID = (99);
33
ERROR HY000: Could not delete gtid domain. Reason: injected error.
44
SHOW WARNINGS;
55
Level Code Message
6-
Error1982Could not delete gtid domain. Reason: injected error.
6+
Error1076Could not delete gtid domain. Reason: injected error.

sql/share/errmsg-utf8.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1732,8 +1732,8 @@ ER_WRONG_AUTO_KEY 42000 S1009
17321732
spa "Puede ser solamente un campo automatico y este debe ser definido como una clave"
17331733
swe "Det får finnas endast ett AUTO_INCREMENT-fält och detta måste vara en nyckel"
17341734
ukr "Невірне визначення таблиці; Може бути лише один автоматичний стовбець, що повинен бути визначений як ключ"
1735-
ER_UNUSED_9
1736-
eng "You should never see it"
1735+
ER_BINLOG_CANT_DELETE_GTID_DOMAIN
1736+
eng "Could not delete gtid domain. Reason: %s."
17371737
ER_NORMAL_SHUTDOWN
17381738
cze "%s: normální ukončení\n"
17391739
dan "%s: Normal nedlukning\n"
@@ -7118,7 +7118,7 @@ ER_SUBQUERIES_NOT_SUPPORTED 42000
71187118
eng "%s does not support subqueries or stored functions."
71197119
ER_SET_STATEMENT_NOT_SUPPORTED 42000
71207120
eng "The system variable %.200s cannot be set in SET STATEMENT."
7121-
ER_UNUSED_17
7121+
ER_UNUSED_9
71227122
eng "You should never see it"
71237123
ER_USER_CREATE_EXISTS
71247124
eng "Can't create user '%-.64s'@'%-.64s'; it already exists"
@@ -7142,5 +7142,3 @@ ER_NO_EIS_FOR_FIELD
71427142
ER_WARN_AGGFUNC_DEPENDENCE
71437143
eng "Aggregate function '%-.192s)' of SELECT #%d belongs to SELECT #%d"
71447144
ukr "Агрегатна функція '%-.192s)' з SELECTу #%d належить до SELECTу #%d"
7145-
ER_BINLOG_CANT_DELETE_GTID_DOMAIN
7146-
eng "Could not delete gtid domain. Reason: %s."

0 commit comments

Comments
 (0)