diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-01-05 22:52:06 +0200 |
| commit | fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf (patch) | |
| tree | 0c7d096327ae1ce637c2042f7daee1589cf36e90 /sql/sql_partition_admin.cc | |
| parent | 6feb74c4b21143ece69bcc1e04474a528f122cdb (diff) | |
| parent | 6d49ef49e57708b4bbc6b428c9e6228685e59452 (diff) | |
| download | mariadb-git-fa7d85bb87e796f1cf77fdf79f2b2d6ece423baf.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/sql_partition_admin.cc')
| -rw-r--r-- | sql/sql_partition_admin.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index efddcbf3857..8168397da85 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -379,15 +379,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); + 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)) { - my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name, - my_errno); + my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name, my_errno); error_set= TRUE; goto err_rename; } @@ -398,8 +396,7 @@ 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); + 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();); @@ -416,8 +413,7 @@ 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); + 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();); |