database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-24758 heap-use-after-poison in innobase_add_instant_try/rec_copy

Browse Source 
This is a backport of
commit fd9ca2a742 (MDEV-23295) and
commit 9a156e1a23 (MDEV-23345) to 10.3.

An instant ADD/DROP/reorder column could create a dummy table
object with the wrong ROW_FORMAT when innodb_default_row_format
was changed between CREATE TABLE and ALTER TABLE.

prepare_inplace_alter_table_dict(): If we had promised that
ALGORITHM=INPLACE is supported, we must preserve the ROW_FORMAT.

The rest of the changes are related to adding
Alter_inplace_info::inplace_supported to cache the return value of
handler::check_if_supported_inplace_alter().
This commit is contained in:
Marko Mäkelä
2021-04-26 18:17:18 +03:00
parent 391f1aa6ee
commit 4d412e9854
7 changed files with 56 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_alter.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
Copyright (c) 2016, 2018, MariaDB Corporation
Copyright (c) 2016, 2020, MariaDB Corporation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -127,10 +127,10 @@ const char* Alter_info::lock() const
}
bool Alter_info::supports_algorithm(THD *thd, enum_alter_inplace_result result,
bool Alter_info::supports_algorithm(THD *thd,
const Alter_inplace_info *ha_alter_info)
{
switch (result) {
switch (ha_alter_info->inplace_supported) {
case HA_ALTER_INPLACE_EXCLUSIVE_LOCK:
case HA_ALTER_INPLACE_SHARED_LOCK:
case HA_ALTER_INPLACE_NO_LOCK:
@ -171,10 +171,10 @@ bool Alter_info::supports_algorithm(THD *thd, enum_alter_inplace_result result,
}
bool Alter_info::supports_lock(THD *thd, enum_alter_inplace_result result,
bool Alter_info::supports_lock(THD *thd,
const Alter_inplace_info *ha_alter_info)
{
switch (result) {
switch (ha_alter_info->inplace_supported) {
case HA_ALTER_INPLACE_EXCLUSIVE_LOCK:
// If SHARED lock and no particular algorithm was requested, use COPY.
if (requested_lock == Alter_info::ALTER_TABLE_LOCK_SHARED &&