summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-11-20 14:02:30 +0800
committerMarko Mäkelä <marko.makela@mariadb.com>2019-11-20 14:02:30 +0800
commitaa3d28ac34322940c2ac59f74e50b450d2cff531 (patch)
treeea905b2a2269d7e4da6524a71795537c3c496251
parent89f487f2e26ecff3f304ec7862445064c3640c17 (diff)
downloadmariadb-git-aa3d28ac34322940c2ac59f74e50b450d2cff531.tar.gz
MDEV-21088: Follow-up fix for ROW_FORMAT=REDUNDANT
For ROW_FORMAT=REDUNDANT, we must reserve fixed-length dummy values for the CHAR columns in the metadata record. This is because in MariaDB Server 10.4, btr_cur_instant_init_low() will rely on dict_index_t::trx_id_offset being accurate for the metadata record.
-rw-r--r--storage/innobase/handler/handler0alter.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index ab50c327e28..785c8a970d4 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -4285,7 +4285,7 @@ innobase_add_instant_try(
break;
case MYSQL_TYPE_STRING:
if (col->mbminlen != col->mbmaxlen
- || !dict_table_is_comp(user_table)) {
+ && dict_table_is_comp(user_table)) {
goto variable_length;
}
/* fall through */