summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-11-04 21:47:54 +0100
committerSergei Golubchik <sergii@pisem.net>2013-11-04 21:47:54 +0100
commit0150dc6ed9cc018173c211acb552d2791b0cebd2 (patch)
tree6250055d8a71bd297864fe16e5926cbb75add0d8 /sql/sql_table.cc
parenta30e87414c3d3bdb04d953e98853b5c07c370122 (diff)
parentbf603250b02c936a271d628c93078cba3d081823 (diff)
downloadmariadb-git-0150dc6ed9cc018173c211acb552d2791b0cebd2.tar.gz
10.0-base merge
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index f1c6d85c659..f78f1b56489 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -369,11 +369,8 @@ uint explain_filename(THD* thd,
Table name length.
*/
-uint filename_to_tablename(const char *from, char *to, uint to_length
-#ifndef DBUG_OFF
- , bool stay_quiet
-#endif /* DBUG_OFF */
- )
+uint filename_to_tablename(const char *from, char *to, uint to_length,
+ bool stay_quiet)
{
uint errors;
size_t res;
@@ -386,7 +383,7 @@ uint filename_to_tablename(const char *from, char *to, uint to_length
{
res= (strxnmov(to, to_length, MYSQL50_TABLE_NAME_PREFIX, from, NullS) -
to);
- if (IF_DBUG(!stay_quiet,0))
+ if (!stay_quiet)
sql_print_error("Invalid (old?) table or database name '%s'", from);
}