diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /sql/sql_tablespace.cc | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'sql/sql_tablespace.cc')
| -rw-r--r-- | sql/sql_tablespace.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc index 93a3007d1ea..d97d50912e6 100644 --- a/sql/sql_tablespace.cc +++ b/sql/sql_tablespace.cc @@ -46,21 +46,16 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) if (hton->alter_tablespace) { - if ((error= hton->alter_tablespace(hton, thd, ts_info))) + if (unlikely((error= hton->alter_tablespace(hton, thd, ts_info)))) { if (error == 1) - { DBUG_RETURN(1); - } if (error == HA_ADMIN_NOT_IMPLEMENTED) - { my_error(ER_CHECK_NOT_IMPLEMENTED, MYF(0), ""); - } else - { my_error(error, MYF(0)); - } + DBUG_RETURN(error); } } |