database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

10.0-base merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-11-04 21:47:54 +01:00
parent a30e87414c bf603250b0
commit 0150dc6ed9
23 changed files with 94 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_table.cc
View File

@ -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);
}