From 65f85264a4c5319ee161545f60de99468b2382e5 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 8 Jul 2014 19:38:08 +0200 Subject: cleanup, unused error mesages --- sql/share/errmsg-utf8.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'sql/share') diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index c36bdf3869f..259c0c5e1ed 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -3962,7 +3962,7 @@ ER_NEW_ABORTING_CONNECTION 08S01 spa "Abortada conexión %ld para db: '%-.192s' usuario: '%-.48s' servidor: '%-.64s' (%-.64s)" swe "Avbröt länken för tråd %ld till db '%-.192s', användare '%-.48s', host '%-.64s' (%-.64s)" ukr "Перервано з'єднання %ld до бази данних: '%-.192s' користувач: '%-.48s' хост: '%-.64s' (%-.64s)" -ER_unused_2 +ER_UNUSED_10 eng "You should never see it" ER_FLUSH_MASTER_BINLOG_CLOSED eng "Binlog closed, cannot RESET MASTER" @@ -5879,10 +5879,9 @@ ER_EVENT_NEITHER_M_EXPR_NOR_M_AT ger "Kein DATETIME-Ausdruck angegeben" ER_UNUSED_2 - eng "" - + eng "You should never see it" ER_UNUSED_3 - eng "" + eng "You should never see it" ER_EVENT_CANNOT_DELETE eng "Failed to delete the event from mysql.event" ger "Löschen des Events aus mysql.event fehlgeschlagen" @@ -5910,7 +5909,7 @@ ER_CANT_LOCK_LOG_TABLE eng "You can't use locks with log tables." ger "Log-Tabellen können nicht gesperrt werden." ER_UNUSED_4 - eng "" + eng "You should never see it" ER_COL_COUNT_DOESNT_MATCH_PLEASE_UPDATE eng "Column count of mysql.%s is wrong. Expected %d, found %d. Created with MariaDB %d, now running %d. Please use mysql_upgrade to fix this error." ger "Spaltenanzahl von mysql.%s falsch. %d erwartet, aber %d erhalten. Erzeugt mit MariaDB %d, jetzt unter %d. Bitte benutzen Sie mysql_upgrade, um den Fehler zu beheben" @@ -6090,8 +6089,8 @@ ER_TRG_CANT_OPEN_TABLE ER_CANT_CREATE_SROUTINE eng "Cannot create stored routine `%-.64s`. Check warnings" ger "Kann gespeicherte Routine `%-.64s` nicht erzeugen. Beachten Sie die Warnungen" -ER_UNUSED - eng "" +ER_UNUSED_11 + eng "You should never see it" ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT eng "The BINLOG statement of type `%s` was not preceded by a format description BINLOG statement." ger "Der BINLOG-Anweisung vom Typ `%s` ging keine BINLOG-Anweisung zur Formatbeschreibung voran." @@ -6459,7 +6458,7 @@ ER_BINLOG_UNSAFE_INSERT_TWO_KEYS ER_TABLE_IN_FK_CHECK eng "Table is being used in foreign key check." -ER_unused_1 +ER_UNUSED_1 eng "You should never see it" ER_BINLOG_UNSAFE_AUTOINC_NOT_FIRST @@ -6529,7 +6528,7 @@ ER_ROW_DOES_NOT_MATCH_GIVEN_PARTITION_SET swe "Hittade en rad som inte passar i någon given partition" ER_UNUSED_5 - eng "" + eng "You should never see it" ER_CHANGE_RPL_INFO_REPOSITORY_FAILURE eng "Failure while changing the type of replication repository: %s." @@ -6995,11 +6994,11 @@ ER_UNKNOWN_OPTION ER_BAD_OPTION_VALUE eng "Incorrect value '%-.64s' for option '%-.64s'" ER_UNUSED_6 - eng "" + eng "You should never see it" ER_UNUSED_7 - eng "" + eng "You should never see it" ER_UNUSED_8 - eng "" + eng "You should never see it" ER_DATA_OVERFLOW 22003 eng "Got overflow when converting '%-.128s' to %-.32s. Value truncated." ER_DATA_TRUNCATED 22003 @@ -7024,8 +7023,8 @@ ER_VIEW_ORDERBY_IGNORED eng "View '%-.192s'.'%-.192s' ORDER BY clause ignored because there is other ORDER BY clause already." ER_CONNECTION_KILLED 70100 eng "Connection was killed" -ER_UNSED - eng "Internal error: '%-.192s'" +ER_UNUSED_12 + eng "You should never see it" ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_SKIP_REPLICATION eng "Cannot modify @@session.skip_replication inside a transaction" ER_STORED_FUNCTION_PREVENTS_SWITCH_SKIP_REPLICATION -- cgit v1.2.1 From ca2ba2291af7e93893febed414e2ae98a5abd543 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Tue, 8 Jul 2014 19:38:26 +0200 Subject: MDEV-6224 Incorrect information in file when *.frm is > 256K Reject huge frms at CREATE TABLE, not when it - successfully written - is being opened. Also raise the frm size limit from 256K to 512K --- sql/share/errmsg-utf8.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sql/share') diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 259c0c5e1ed..76cf33c231f 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7109,3 +7109,5 @@ ER_IT_IS_A_VIEW 42S02 eng "'%-.192s' is a view" ER_SLAVE_SKIP_NOT_IN_GTID eng "When using GTID, @@sql_slave_skip_counter can not be used. Instead, setting @@gtid_slave_pos explicitly can be used to skip to after a given GTID position." +ER_TABLE_DEFINITION_TOO_BIG + eng "The definition for table %`s is too big" -- cgit v1.2.1