diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /sql/sql_alter.h | |
parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'sql/sql_alter.h')
-rw-r--r-- | sql/sql_alter.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_alter.h b/sql/sql_alter.h index 1d1ad5b2..c5e4e812 100644 --- a/sql/sql_alter.h +++ b/sql/sql_alter.h @@ -310,13 +310,14 @@ public: @retval false Supported lock type @retval true Not supported value */ - bool supports_lock(THD *thd, const Alter_inplace_info *ha_alter_info); + bool supports_lock(THD *thd, bool, Alter_inplace_info *ha_alter_info); /** Return user requested algorithm. If user does not specify algorithm then return alter_algorithm variable value. */ enum_alter_table_algorithm algorithm(const THD *thd) const; + bool algorithm_is_nocopy(const THD *thd) const; uint check_vcol_field(Item_field *f) const; |