diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-11-22 16:08:51 +0200 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-11-22 16:08:51 +0200 |
| commit | d5787a3c59694c36098690cbbe14e874d7ab3e67 (patch) | |
| tree | cbd8a037595b299deb954eb81cddc98c278a382a /storage | |
| parent | 250d851129f8429a303faeb307fb09cd68c84cea (diff) | |
| download | mariadb-git-d5787a3c59694c36098690cbbe14e874d7ab3e67.tar.gz | |
Fix Bug#57739 Scary messages in error log
Silence a warning about old table name when InnoDB tests whether the
format has changed using a nonexistent table name.
Reviewed by: bar@mysql.com, marko.makela@oracle.com
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index b0d620c060d..c9072b4c63e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -2164,13 +2164,13 @@ innobase_init( ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR); -#ifdef UNIV_DEBUG +#ifndef DBUG_OFF static const char test_filename[] = "-@"; char test_tablename[sizeof test_filename + sizeof srv_mysql50_table_name_prefix]; if ((sizeof test_tablename) - 1 != filename_to_tablename(test_filename, test_tablename, - sizeof test_tablename) + sizeof test_tablename, true) || strncmp(test_tablename, srv_mysql50_table_name_prefix, sizeof srv_mysql50_table_name_prefix) @@ -2180,7 +2180,7 @@ innobase_init( sql_print_error("tablename encoding has been changed"); goto error; } -#endif /* UNIV_DEBUG */ +#endif /* DBUG_OFF */ /* Check that values don't overflow on 32-bit systems. */ if (sizeof(ulint) == 4) { |