diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 18:16:49 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 18:16:49 +0300 |
| commit | 31c950cca8fa1623d41a8a7784e09fbcd6bc2c71 (patch) | |
| tree | e0a2b134996c7fc07efe5f254943683f8a02c220 /storage/innobase/handler/handler0alter.cc | |
| parent | 0e937f30f6cdadd2bc1607efa4a07f19c88e1b68 (diff) | |
| parent | c6392d52ee2e918a65b05c275286ff4d450eef2c (diff) | |
| download | mariadb-git-31c950cca8fa1623d41a8a7784e09fbcd6bc2c71.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/handler/handler0alter.cc')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 517f20006af..dd4362a9fe9 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -5727,6 +5727,13 @@ check_if_ok_to_rename: goto err_exit_no_heap; } + if (info.flags2() & DICT_TF2_USE_FILE_PER_TABLE) { + /* Preserve the DATA DIRECTORY attribute, because it + currently cannot be changed during ALTER TABLE. */ + info.flags_set(m_prebuilt->table->flags + & 1U << DICT_TF_POS_DATA_DIR); + } + max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(info.flags()); /* Check each index's column length to make sure they do not |