diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-18 20:05:50 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-18 20:05:50 +0200 |
| commit | 09c5bbf471da46d33cb21bf67166078bbf7e8f8c (patch) | |
| tree | 4706a7158538d477bf1dd9e3a41cdd7374605f16 /sql/sql_partition.cc | |
| parent | 682c3bfd259b3184232e5329558094faa0bc8562 (diff) | |
| parent | 40088bfc7e100294d622ab32a6e7cbcb79c12eab (diff) | |
| download | mariadb-git-09c5bbf471da46d33cb21bf67166078bbf7e8f8c.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index dc5e7fe1a1a..330892c16e9 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -6831,10 +6831,7 @@ uint fast_alter_partition_table(THD *thd, TABLE *table, lpt->part_info= part_info; lpt->alter_info= alter_info; lpt->create_info= create_info; - lpt->db_options= create_info->table_options; - if (create_info->row_type != ROW_TYPE_FIXED && - create_info->row_type != ROW_TYPE_DEFAULT) - lpt->db_options|= HA_OPTION_PACK_RECORD; + lpt->db_options= create_info->table_options_with_row_type(); lpt->table= table; lpt->key_info_buffer= 0; lpt->key_count= 0; |