From aa3d28ac34322940c2ac59f74e50b450d2cff531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Wed, 20 Nov 2019 14:02:30 +0800 Subject: [PATCH] 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. --- storage/innobase/handler/handler0alter.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */