summaryrefslogtreecommitdiff
path: root/sql/sql_tablespace.cc
diff options
context:
space:
mode:
authortomas@poseidon.ndb.mysql.com <>2006-04-24 13:31:24 +0200
committertomas@poseidon.ndb.mysql.com <>2006-04-24 13:31:24 +0200
commit2b47e66b267a45006d18a3395b2cf9c68c6c693b (patch)
tree0cdad314a74ea42f7fc57f62173c7443d84423f8 /sql/sql_tablespace.cc
parentffe003eb5cd5cf02207eb0cfa3b5a9aad1bc39b0 (diff)
downloadmariadb-git-2b47e66b267a45006d18a3395b2cf9c68c6c693b.tar.gz
Bug #18603 Lost connection on poorly formed "create logfile" and "create tablespace"
Diffstat (limited to 'sql/sql_tablespace.cc')
-rw-r--r--sql/sql_tablespace.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc
index 954d65ea44e..e7f6b04045e 100644
--- a/sql/sql_tablespace.cc
+++ b/sql/sql_tablespace.cc
@@ -28,7 +28,8 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info)
If the user haven't defined an engine, this will fallback to using the
default storage engine.
*/
- hton= ha_resolve_by_legacy_type(thd, ts_info->storage_engine);
+ hton= ha_resolve_by_legacy_type(thd, ts_info->storage_engine != DB_TYPE_UNKNOWN ?
+ ts_info->storage_engine : DB_TYPE_DEFAULT);
if (hton->state == SHOW_OPTION_YES &&
hton->alter_tablespace && (error= hton->alter_tablespace(thd, ts_info)))