diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 09:22:03 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 09:22:03 +0100 |
| commit | b728641e862df46b97616ce965cfa78ebf3f14aa (patch) | |
| tree | cd335135d6b576551a43147d1e220f47868700aa /sql/sql_table.cc | |
| parent | 88d1c1c5514dc922699e69d64877b7788c74ffcc (diff) | |
| parent | 7bd258c44c00f232ecf4ec448179f114b878227b (diff) | |
| download | mariadb-git-b728641e862df46b97616ce965cfa78ebf3f14aa.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index be5906ec8e6..607f20d2396 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -4192,7 +4192,7 @@ mysql_prepare_create_table(THD *thd, HA_CREATE_INFO *create_info, /* Give warnings for not supported table options */ #if defined(WITH_ARIA_STORAGE_ENGINE) extern handlerton *maria_hton; - if (file->ht != maria_hton) + if (file->partition_ht() != maria_hton) #endif if (create_info->transactional) push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, |