diff options
Diffstat (limited to 'sql/sql_partition_admin.cc')
| -rw-r--r-- | sql/sql_partition_admin.cc | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index 41555306da7..1f9ee32ba73 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -378,17 +378,13 @@ static bool exchange_name_with_ddl_log(THD *thd, */ /* call rename table from table to tmp-name */ DBUG_EXECUTE_IF("exchange_partition_fail_3", - my_error(ER_ERROR_ON_RENAME, MYF(0), - name, tmp_name, 0, "n/a"); + my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name, 0); error_set= TRUE; goto err_rename;); DBUG_EXECUTE_IF("exchange_partition_abort_3", DBUG_SUICIDE();); if (file->ha_rename_table(name, tmp_name)) { - char errbuf[MYSYS_STRERROR_SIZE]; - my_strerror(errbuf, sizeof(errbuf), my_errno); - my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name, - my_errno, errbuf); + my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name, my_errno); error_set= TRUE; goto err_rename; } @@ -399,17 +395,13 @@ static bool exchange_name_with_ddl_log(THD *thd, /* call rename table from partition to table */ DBUG_EXECUTE_IF("exchange_partition_fail_5", - my_error(ER_ERROR_ON_RENAME, MYF(0), - from_name, name, 0, "n/a"); + my_error(ER_ERROR_ON_RENAME, MYF(0), from_name, name, 0); error_set= TRUE; goto err_rename;); DBUG_EXECUTE_IF("exchange_partition_abort_5", DBUG_SUICIDE();); if (file->ha_rename_table(from_name, name)) { - char errbuf[MYSYS_STRERROR_SIZE]; - my_strerror(errbuf, sizeof(errbuf), my_errno); - my_error(ER_ERROR_ON_RENAME, MYF(0), from_name, name, - my_errno, errbuf); + my_error(ER_ERROR_ON_RENAME, MYF(0), from_name, name, my_errno); error_set= TRUE; goto err_rename; } @@ -420,17 +412,13 @@ static bool exchange_name_with_ddl_log(THD *thd, /* call rename table from tmp-nam to partition */ DBUG_EXECUTE_IF("exchange_partition_fail_7", - my_error(ER_ERROR_ON_RENAME, MYF(0), - tmp_name, from_name, 0, "n/a"); + my_error(ER_ERROR_ON_RENAME, MYF(0), tmp_name, from_name, 0); error_set= TRUE; goto err_rename;); DBUG_EXECUTE_IF("exchange_partition_abort_7", DBUG_SUICIDE();); if (file->ha_rename_table(tmp_name, from_name)) { - char errbuf[MYSYS_STRERROR_SIZE]; - my_strerror(errbuf, sizeof(errbuf), my_errno); - my_error(ER_ERROR_ON_RENAME, MYF(0), tmp_name, from_name, - my_errno, errbuf); + my_error(ER_ERROR_ON_RENAME, MYF(0), tmp_name, from_name, my_errno); error_set= TRUE; goto err_rename; } |