10.0-base merge

1 files changed, 2 insertions, 5 deletions

diff --git a/sql/sql_table.h b/sql/sql_table.h
index 3d8ad3c8875..c42f8aaa39e 100644
--- a/sql/sql_table.h
+++ b/sql/sql_table.h
@@ -137,11 +137,8 @@ static const uint SKIP_SYMDIR_ACCESS= 1 << 5;
 /** Don't check foreign key constraints while renaming table */
 static const uint NO_FK_CHECKS=    1 << 6;
 
-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);