summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@sun.com>2009-08-07 15:08:32 +0200
committerMattias Jonsson <mattias.jonsson@sun.com>2009-08-07 15:08:32 +0200
commitf42fab1b76e8435b5de753a35e047b369e07b60a (patch)
treeca1e0c44ae66cc6d3ec0dcdba7e49efe4d5fd7a5 /sql/share
parent466847a0b840dc7db8ecd76fed92eadab0c01132 (diff)
downloadmariadb-git-f42fab1b76e8435b5de753a35e047b369e07b60a.tar.gz
Bug#32430: 'show innodb status' causes errors
Invalid (old?) table or database name in logs Post push patch. Bug was that a non partitioned table file was not converted to system_charset, (due to table_name_len was not set). Also missing DBUG_RETURN. And Innodb adds quotes after calling the function, so I added one more mode where explain_filename does not add quotes. But it still appends the [sub]partition name as a comment. Also caught a minor quoting bug, the character '`' was not quoted in the identifier. (so 'a`b' was quoted as `a`b` and not `a``b`, this is mulitbyte characters aware.) sql/mysql_priv.h: Bug#32430: 'show innodb status' causes errors Invalid (old?) table or database name in logs Added an unquoted mode sql/share/errmsg.txt: Bug#32430: 'show innodb status' causes errors Invalid (old?) table or database name in logs Removed the quoting of identifier, only leaving the translated word. sql/sql_table.cc: Bug#32430: 'show innodb status' causes errors Invalid (old?) table or database name in logs Fixed quoting of '`' Added DBUG_RETURN. Corrected table_name_len. Added unquoted mode.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 5531ee71620..3aba434b284 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -6184,17 +6184,17 @@ ER_FUNC_INEXISTENT_NAME_COLLISION 42000
# 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`"
+ eng "Database"
+ swe "Databas"
ER_TABLE_NAME
- eng "Table `%s`"
- swe "Tabell `%s`"
+ eng "Table"
+ swe "Tabell"
ER_PARTITION_NAME
- eng "Partition `%s`"
- swe "Partition `%s`"
+ eng "Partition"
+ swe "Partition"
ER_SUBPARTITION_NAME
- eng "Subpartition `%s`"
- swe "Subpartition `%s`"
+ eng "Subpartition"
+ swe "Subpartition"
ER_TEMPORARY_NAME
eng "Temporary"
swe "Temporär"