diff --git a/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result b/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result index daf2f4d6490..99f2a57835f 100644 --- a/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result +++ b/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result @@ -9,7 +9,7 @@ Non-existed domain is warned, the command completes without rotation but with a warning FLUSH BINARY LOGS DELETE_DOMAIN_ID = (99); Warnings: -Warning 1982 The gtid domain being deleted ('99') is not in the current binlog state +Warning 1076 The gtid domain being deleted ('99') is not in the current binlog state show binary logs; Log_name File_size master-bin.000001 # @@ -36,15 +36,15 @@ Already deleted domain in Gtid_list of the earliest log is benign but may cause a warning FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1); Warnings: -Warning 1982 The 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. -Warning 1982 The gtid domain being deleted ('1') is not in the current binlog state +Warning 1076 The 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. +Warning 1076 The gtid domain being deleted ('1') is not in the current binlog state FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 0); 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. FLUSH BINARY LOGS; PURGE BINARY LOGS TO 'master-bin.000005'; FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 0); Warnings: -Warning 1982 The gtid domain being deleted ('0') is not in the current binlog state +Warning 1076 The gtid domain being deleted ('0') is not in the current binlog state 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: show binlog events in 'master-bin.000006' limit 1,1; Log_name Pos Event_type Server_id End_log_pos Info @@ -73,6 +73,6 @@ PURGE BINARY LOGS TO 'master-bin.000007'; the following command succeeds with warnings FLUSH BINARY LOGS DELETE_DOMAIN_ID = (1); Warnings: -Warning 1982 The 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. +Warning 1076 The 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. DROP TABLE t; RESET MASTER; diff --git a/mysql-test/suite/binlog/r/binlog_gtid_delete_domain_debug.result b/mysql-test/suite/binlog/r/binlog_gtid_delete_domain_debug.result index 5193267e2f2..b4627caceb2 100644 --- a/mysql-test/suite/binlog/r/binlog_gtid_delete_domain_debug.result +++ b/mysql-test/suite/binlog/r/binlog_gtid_delete_domain_debug.result @@ -3,4 +3,4 @@ FLUSH BINARY LOGS DELETE_DOMAIN_ID = (99); ERROR HY000: Could not delete gtid domain. Reason: injected error. SHOW WARNINGS; Level Code Message -Error 1982 Could not delete gtid domain. Reason: injected error. +Error 1076 Could not delete gtid domain. Reason: injected error. diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 15ec98045ea..0a2d704a94d 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -1732,8 +1732,8 @@ ER_WRONG_AUTO_KEY 42000 S1009 spa "Puede ser solamente un campo automatico y este debe ser definido como una clave" swe "Det får finnas endast ett AUTO_INCREMENT-fält och detta måste vara en nyckel" ukr "Невірне визначення таблиці; Може бути лише один автоматичний стовбець, що повинен бути визначений як ключ" -ER_UNUSED_9 - eng "You should never see it" +ER_BINLOG_CANT_DELETE_GTID_DOMAIN + eng "Could not delete gtid domain. Reason: %s." ER_NORMAL_SHUTDOWN cze "%s: normální ukončení\n" dan "%s: Normal nedlukning\n" @@ -7118,7 +7118,7 @@ ER_SUBQUERIES_NOT_SUPPORTED 42000 eng "%s does not support subqueries or stored functions." ER_SET_STATEMENT_NOT_SUPPORTED 42000 eng "The system variable %.200s cannot be set in SET STATEMENT." -ER_UNUSED_17 +ER_UNUSED_9 eng "You should never see it" ER_USER_CREATE_EXISTS eng "Can't create user '%-.64s'@'%-.64s'; it already exists" @@ -7142,5 +7142,3 @@ ER_NO_EIS_FOR_FIELD ER_WARN_AGGFUNC_DEPENDENCE eng "Aggregate function '%-.192s)' of SELECT #%d belongs to SELECT #%d" ukr "Агрегатна функція '%-.192s)' з SELECTу #%d належить до SELECTу #%d" -ER_BINLOG_CANT_DELETE_GTID_DOMAIN - eng "Could not delete gtid domain. Reason: %s."