diff options
Diffstat (limited to 'sql/sql_tablespace.cc')
| -rw-r--r-- | sql/sql_tablespace.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc index 9fec0e3bc63..14b29452750 100644 --- a/sql/sql_tablespace.cc +++ b/sql/sql_tablespace.cc @@ -34,7 +34,7 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, ER_WARN_USING_OTHER_HANDLER, ER(ER_WARN_USING_OTHER_HANDLER), - ha_resolve_storage_engine_name(hton), + hton_name(hton)->str, ts_info->tablespace_name ? ts_info->tablespace_name : ts_info->logfile_group_name); } @@ -43,13 +43,14 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) { if ((error= hton->alter_tablespace(hton, thd, ts_info))) { - if (error == HA_ADMIN_NOT_IMPLEMENTED) + if (error == 1) { - my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), ""); + DBUG_RETURN(1); } - else if (error == 1) + + if (error == HA_ADMIN_NOT_IMPLEMENTED) { - DBUG_RETURN(1); + my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), ""); } else { @@ -63,7 +64,7 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, ER_ILLEGAL_HA_CREATE_OPTION, ER(ER_ILLEGAL_HA_CREATE_OPTION), - ha_resolve_storage_engine_name(hton), + hton_name(hton)->str, "TABLESPACE or LOGFILE GROUP"); } write_bin_log(thd, FALSE, thd->query, thd->query_length); |