diff options
| author | brian@zim.(none) <> | 2006-09-30 12:49:46 -0700 |
|---|---|---|
| committer | brian@zim.(none) <> | 2006-09-30 12:49:46 -0700 |
| commit | 46ae2113ba8a0d240469ba304b51ebebdd34942c (patch) | |
| tree | 84daf07576e05d5882ff636c5b4ae61f791e0a47 /sql/sql_tablespace.cc | |
| parent | a756fd36ef7f462a0103ad4b5a27f2e1c2924a93 (diff) | |
| download | mariadb-git-46ae2113ba8a0d240469ba304b51ebebdd34942c.tar.gz | |
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
Diffstat (limited to 'sql/sql_tablespace.cc')
| -rw-r--r-- | sql/sql_tablespace.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_tablespace.cc b/sql/sql_tablespace.cc index 13dfb491af4..470fa5bc862 100644 --- a/sql/sql_tablespace.cc +++ b/sql/sql_tablespace.cc @@ -21,7 +21,7 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) { int error= HA_ADMIN_NOT_IMPLEMENTED; - const handlerton *hton= ts_info->storage_engine; + handlerton *hton= ts_info->storage_engine; DBUG_ENTER("mysql_alter_tablespace"); /* @@ -42,7 +42,7 @@ int mysql_alter_tablespace(THD *thd, st_alter_tablespace *ts_info) if (hton->alter_tablespace) { - if ((error= hton->alter_tablespace(thd, ts_info))) + if ((error= hton->alter_tablespace(hton, thd, ts_info))) { if (error == HA_ADMIN_NOT_IMPLEMENTED) { |