From 4fb78ee4c36b5c6bdec8f49d879a397aa656e639 Mon Sep 17 00:00:00 2001 From: Mattias Jonsson Date: Tue, 2 Jun 2009 11:07:17 +0200 Subject: Bug#32430:'show innodb status' causes errors Invalid (old?) table or database name in logs Problem was that InnoDB used filenam_to_tablename, which do not handle partitions (due to the '#' in the filename). Solution is to add a new function for explaining what the filename means: explain_filename. It expands the database, table, partition and subpartition parts and uses errmsg.txt for localization. It also converts from my_charset_filename to system_charset_info (i.e. human readable form for non ascii characters). http://lists.mysql.com/commits/70370 2773 Mattias Jonsson 2009-03-25 It has three different output styles. NOTE: This is the server side ONLY part (introducing the explain_filename function). There will be a patch for InnoDB using this function to solve the bug. sql/mysql_priv.h: Bug#32430:'show innodb status' causes errors Invalid (old?) table or database name in logs Added EXPLAIN_FILENAME_MAX_EXTRA_LENGTH, enum_explain_filename_mode and explain_filename. sql/share/errmsg.txt: Bug#32430:'show innodb status' causes errors Invalid (old?) table or database name in logs Added localization names for Database, Table, Partition, Subpartition Temporary and Renamed. sql/sql_table.cc: Bug#32430:'show innodb status' causes errors Invalid (old?) table or database name in logs Added explain_filename function for giving better information to the user about a specific table/partitions file. --- sql/share/errmsg.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'sql/share') diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt index 7c92c827c87..42bca02984d 100644 --- a/sql/share/errmsg.txt +++ b/sql/share/errmsg.txt @@ -6180,3 +6180,24 @@ ER_TOO_LONG_FIELD_COMMENT ER_FUNC_INEXISTENT_NAME_COLLISION 42000 eng "FUNCTION %s does not exist. Check the 'Function Name Parsing and Resolution' section in the Reference Manual" + +# When updating these, please update EXPLAIN_FILENAME_MAX_EXTRA_LENGTH in +# mysql_priv.h with the new maximal additional length for explain_filename. +ER_DATABASE_NAME + eng "Database `%s`" + swe "Databas `%s`" +ER_TABLE_NAME + eng "Table `%s`" + swe "Tabell `%s`" +ER_PARTITION_NAME + eng "Partition `%s`" + swe "Partition `%s`" +ER_SUBPARTITION_NAME + eng "Subpartition `%s`" + swe "Subpartition `%s`" +ER_TEMPORARY_NAME + eng "Temporary" + swe "Temporär" +ER_RENAMED_NAME + eng "Renamed" + swe "Namnändrad" -- cgit v1.2.1