summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-01-15 15:22:03 +0200
committerGitHub <noreply@github.com>2019-01-15 15:22:03 +0200
commitce06990056824f0a3ef15cdf9980aaa3cfb911e0 (patch)
tree0312240e577301c8a88fd276bd56a8bfbd461d0d /storage
parent55a0c3eb6dc8f8fb4786932901ca74cbb9b8637c (diff)
parent35318d730ac1294e2c4b8327f686cebff277fde5 (diff)
downloadmariadb-git-ce06990056824f0a3ef15cdf9980aaa3cfb911e0.tar.gz
Merge pull request #1088 from tempesta-tech/tt-10.4-MDEV-18173
MDEV-18173 Assertion `o->ind == vers_end' or `o->ind == vers_start' failed in dict_table_t::instant_column
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/handler/handler0alter.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index a6fa08b3679..2295e3fa5bf 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -4241,9 +4241,9 @@ innobase_build_col_map(
col_map[old_i - num_old_v] = i;
if (old_table->versioned()) {
if (old_i == old_table->vers_start) {
- new_table->vers_start = i;
+ new_table->vers_start = i + num_v;
} else if (old_i == old_table->vers_end) {
- new_table->vers_end = i;
+ new_table->vers_end = i + num_v;
}
}
goto found_col;