diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 17:34:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-06-26 17:34:44 +0300 |
| commit | c6392d52ee2e918a65b05c275286ff4d450eef2c (patch) | |
| tree | 1a5f9623ff08bfca9eacb83e21502563e656e932 /storage | |
| parent | c4eb4bcef648eb2ebdc6edc06905f39f95ef7f6b (diff) | |
| parent | cc8772f33e8f94844e32f3aa79e5f41d784f8ec0 (diff) | |
| download | mariadb-git-c6392d52ee2e918a65b05c275286ff4d450eef2c.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 6 | ||||
| -rw-r--r-- | storage/xtradb/handler/handler0alter.cc | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 9f44b64a235..f3e627babc2 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -3677,6 +3677,12 @@ check_if_ok_to_rename: goto err_exit_no_heap; } + /* Preserve this flag, because it currenlty can't be changed during + ALTER TABLE*/ + if (flags2 & DICT_TF2_USE_TABLESPACE) { + flags |= prebuilt->table->flags & 1U << DICT_TF_POS_DATA_DIR; + } + max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(flags); /* Check each index's column length to make sure they do not diff --git a/storage/xtradb/handler/handler0alter.cc b/storage/xtradb/handler/handler0alter.cc index 131939bcdb2..492386e003e 100644 --- a/storage/xtradb/handler/handler0alter.cc +++ b/storage/xtradb/handler/handler0alter.cc @@ -3693,6 +3693,12 @@ check_if_ok_to_rename: goto err_exit_no_heap; } + /* Preserve this flag, because it currenlty can't be changed during + ALTER TABLE*/ + if (flags2 & DICT_TF2_USE_TABLESPACE) { + flags |= prebuilt->table->flags & 1U << DICT_TF_POS_DATA_DIR; + } + max_col_len = DICT_MAX_FIELD_LEN_BY_FORMAT_FLAG(flags); /* Check each index's column length to make sure they do not |