summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
diff options
context:
space:
mode:
authorMattias Jonsson <mattias.jonsson@sun.com>2009-09-25 11:26:49 +0200
committerMattias Jonsson <mattias.jonsson@sun.com>2009-09-25 11:26:49 +0200
commit7d9548d26b276c7932d0f366e6f9acd516c86257 (patch)
treef186b28679dd86523d93b35f6d675bb38bf7bf20 /sql/mysql_priv.h
parent09f07bc1107c0facc32c16c58bae0215ce08eeea (diff)
downloadmariadb-git-7d9548d26b276c7932d0f366e6f9acd516c86257.tar.gz
Bug#32430: 'show innodb status' causes errors
Invalid (old?) table or database name in logs Problem was still not completely fixed, due to qouting. This is the server side only fix (in explain_filename), the change from filename_to_tablename to use explain_filename in the InnoDB code must be done before the bug is fixed.
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r--sql/mysql_priv.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 381a0313add..6fde16d3049 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -2277,10 +2277,9 @@ enum enum_explain_filename_mode
{
EXPLAIN_ALL_VERBOSE= 0,
EXPLAIN_PARTITIONS_VERBOSE,
- EXPLAIN_PARTITIONS_AS_COMMENT,
- EXPLAIN_PARTITIONS_AS_COMMENT_NO_QUOTING
+ EXPLAIN_PARTITIONS_AS_COMMENT
};
-uint explain_filename(const char *from, char *to, uint to_length,
+uint explain_filename(THD* thd, const char *from, char *to, uint to_length,
enum_explain_filename_mode explain_mode);
uint filename_to_tablename(const char *from, char *to, uint to_length);
uint tablename_to_filename(const char *from, char *to, uint to_length);