diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 11:32:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-09-23 11:32:43 +0300 |
| commit | 882ce206dbf06b771ffe4cbce2e3e4214982f302 (patch) | |
| tree | 63b3d1314bf9ab4d8c7fe314818c6349c127f877 /storage/innobase/handler/handler0alter.cc | |
| parent | 6ab6b1510ed0851bda335a8919047c02860fe2e8 (diff) | |
| parent | d7c82610c14f5102258640c73c1d78ea22f942c3 (diff) | |
| download | mariadb-git-882ce206dbf06b771ffe4cbce2e3e4214982f302.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/handler/handler0alter.cc')
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index ceda6187374..f80ee865746 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -10902,9 +10902,14 @@ ha_innobase::commit_inplace_alter_table( = static_cast<ha_innobase_inplace_ctx*>(*pctx); DBUG_ASSERT(new_clustered == ctx->need_rebuild()); - - fail = commit_set_autoinc(ha_alter_info, ctx, altered_table, - table); + if (ctx->need_rebuild() && !ctx->old_table->space) { + my_error(ER_TABLESPACE_DISCARDED, MYF(0), + table->s->table_name.str); + fail = true; + } else { + fail = commit_set_autoinc(ha_alter_info, ctx, + altered_table, table); + } if (fail) { } else if (ctx->need_rebuild()) { |