diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 12:17:53 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-27 12:17:53 +0100 |
| commit | 933c3a5e5b22d1297d68839968fa7a103a144b08 (patch) | |
| tree | fa6a2db3a55e45cfeeb1b437b8942f3048ab15ea /storage/archive | |
| parent | 3b33caaca34615f4323dcd5d4ec8252175803095 (diff) | |
| download | mariadb-git-933c3a5e5b22d1297d68839968fa7a103a144b08.tar.gz | |
compilation failure on windows
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index fe6b611d1c6..3625df73c4f 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -781,12 +781,8 @@ int ha_archive::create(const char *name, TABLE *table_arg, #endif /* HAVE_READLINK */ { if (create_info->data_file_name) - { - push_warning_printf(table_arg->in_use, Sql_condition::WARN_LEVEL_WARN, - WARN_OPTION_IGNORED, - ER_DEFAULT(WARN_OPTION_IGNORED), - "DATA DIRECTORY"); - } + my_error(WARN_OPTION_IGNORED, MYF(ME_JUST_WARNING), "DATA DIRECTORY"); + fn_format(name_buff, name, "", ARZ, MY_REPLACE_EXT | MY_UNPACK_FILENAME); linkname[0]= 0; @@ -794,12 +790,7 @@ int ha_archive::create(const char *name, TABLE *table_arg, /* Archive engine never uses INDEX DIRECTORY. */ if (create_info->index_file_name) - { - push_warning_printf(table_arg->in_use, Sql_condition::WARN_LEVEL_WARN, - WARN_OPTION_IGNORED, - ER_DEFAULT(WARN_OPTION_IGNORED), - "INDEX DIRECTORY"); - } + my_error(WARN_OPTION_IGNORED, MYF(ME_JUST_WARNING), "INDEX DIRECTORY"); /* There is a chance that the file was "discovered". In this case |