diff options
author | Mattias Jonsson <mattiasj@mysql.com> | 2008-08-12 12:26:23 +0200 |
---|---|---|
committer | Mattias Jonsson <mattiasj@mysql.com> | 2008-08-12 12:26:23 +0200 |
commit | f84bf0077d4eba3798820c72a9c1fdfa8d78c5a0 (patch) | |
tree | c37997f38ab924c9706f08ded9e966d08e391773 /sql/mysql_priv.h | |
parent | 4cb12690c75eaa17e85236fcdc28b9e5faf0629f (diff) | |
parent | 295fc5834aef999a8f77d0b38037699d7a2b26bc (diff) | |
download | mariadb-git-f84bf0077d4eba3798820c72a9c1fdfa8d78c5a0.tar.gz |
manual merge of bug#37402
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index e9deb479c5e..6f2080eaa4f 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -2227,6 +2227,8 @@ uint tablename_to_filename(const char *from, char *to, uint to_length); #ifdef MYSQL_SERVER uint build_table_filename(char *buff, size_t bufflen, const char *db, const char *table, const char *ext, uint flags); +const char *get_canonical_filename(handler *file, const char *path, + char *tmp_path); #define MYSQL50_TABLE_NAME_PREFIX "#mysql50#" #define MYSQL50_TABLE_NAME_PREFIX_LENGTH 9 |