summaryrefslogtreecommitdiff
path: root/sql/sql_table.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-11-04 13:40:20 +0100
committerSergei Golubchik <sergii@pisem.net>2013-11-04 13:40:20 +0100
commit032a61fc0ac748af272db4f3931d22d48c9e9785 (patch)
treeb99f9f3657382bfbba155e594e1bf74738b927ec /sql/sql_table.h
parent79d2e6c82f5dfa2b5fd9f74d2129815b22ca819c (diff)
downloadmariadb-git-032a61fc0ac748af272db4f3931d22d48c9e9785.tar.gz
restore the condition in filename_to_tablename()
(broken in the revid:sergii@pisem.net-20130615170931-bn2h8j30vu5bfp0t)
Diffstat (limited to 'sql/sql_table.h')
-rw-r--r--sql/sql_table.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_table.h b/sql/sql_table.h
index 58280b45861..02e72fc564c 100644
--- a/sql/sql_table.h
+++ b/sql/sql_table.h
@@ -123,11 +123,8 @@ enum enum_explain_filename_mode
/** Don't check foreign key constraints while renaming table */
#define NO_FK_CHECKS (1 << 4)
-uint filename_to_tablename(const char *from, char *to, uint to_length
-#ifndef DBUG_OFF
- , bool stay_quiet = false
-#endif /* DBUG_OFF */
- );
+uint filename_to_tablename(const char *from, char *to, uint to_length,
+ bool stay_quiet = false);
uint tablename_to_filename(const char *from, char *to, uint to_length);
uint check_n_cut_mysql50_prefix(const char *from, char *to, uint to_length);
bool check_mysql50_prefix(const char *name);