Merge branch '10.9' into 10.10

This commit is contained in:
Oleksandr Byelkin 2023-08-07 10:34:52 +02:00
commit 45b7a01002
5 changed files with 56 additions and 0 deletions

View file

@ -4963,6 +4963,17 @@ int ha_mroonga::wrapper_close()
MRN_DBUG_ENTER_METHOD();
MRN_SET_WRAP_SHARE_KEY(share, table->s);
MRN_SET_WRAP_TABLE_KEY(this, table);
#ifdef MRN_HANDLER_HAVE_CHECK_IF_SUPPORTED_INPLACE_ALTER
if (alter_key_info_buffer) {
my_free(alter_key_info_buffer);
alter_key_info_buffer = NULL;
}
#else
if (wrap_alter_key_info) {
my_free(wrap_alter_key_info);
wrap_alter_key_info = NULL;
}
#endif
#ifdef MRN_HANDLER_HAVE_HA_CLOSE
error = wrap_handler->ha_close();
#else