diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-17 17:08:00 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-18 08:43:11 +0200 |
| commit | 085b292a47ee8a6fb141c575e7d8f5ed3b4206bd (patch) | |
| tree | b04ef35ebd6934f5a62a4a5396f6428dd4c6acc9 /storage | |
| parent | 7cf97ed4ee93f7df6d021ad54b9f09964a943c82 (diff) | |
| download | mariadb-git-085b292a47ee8a6fb141c575e7d8f5ed3b4206bd.tar.gz | |
MDEV-11824 Allow ROW_FORMAT=DYNAMIC in the InnoDB system tablespace
When MySQL 5.7.9 (and MariaDB Server 10.2) introduced
innodb_default_row_format and made ROW_FORMAT=DYNAMIC the default,
it became possible to create any ROW_FORMAT tables in the InnoDB
system tablespace, except ROW_FORMAT=COMPRESSED.
In MySQL 5.7, it is possible to create ROW_FORMAT=DYNAMIC
tables when TABLESPACE=innodb_system is explicitly specified.
Because MariaDB Server 10.2 does not support the MySQL 5.7
TABLESPACE=innodb_system attribute for tables, we should allow
ROW_FORMAT=DYNAMIC when innodb_file_per_table=0.
Also, remove the test innodb_zip.innodb-create-options, which was
an outdated copy of innodb_zip.create_options.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index db1d90c06fe..93f5c936915 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -12368,15 +12368,6 @@ create_table_info_t::create_options_are_invalid() } break; case ROW_TYPE_DYNAMIC: - if (!m_allow_file_per_table && !is_temp) { - push_warning_printf( - m_thd, Sql_condition::WARN_LEVEL_WARN, - ER_ILLEGAL_HA_CREATE_OPTION, - "InnoDB: ROW_FORMAT=%s requires" - " innodb_file_per_table.", - get_row_format_name(row_format)); - ret = "ROW_FORMAT"; - } if (!is_temp && srv_file_format < UNIV_FORMAT_B) { push_warning_printf( m_thd, Sql_condition::WARN_LEVEL_WARN, |