mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 03:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-06-24 13:09:47 +03:00
commit 0076eb3d4e
333 changed files with 6732 additions and 6129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
storage/innobase/handler/handler0alter.cc
View file

@ -1168,7 +1168,7 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
trx_start_for_ddl(trx);
}
~ha_innobase_inplace_ctx()
~ha_innobase_inplace_ctx() override
{
UT_DELETE(m_stage);
if (instant_table) {
@ -1277,7 +1277,7 @@ struct ha_innobase_inplace_ctx : public inplace_alter_handler_ctx
/** Share context between partitions.
@param[in] ctx context from another partition of the table */
void set_shared_data(const inplace_alter_handler_ctx& ctx)
void set_shared_data(const inplace_alter_handler_ctx& ctx) override
{
if (add_autoinc != ULINT_UNDEFINED) {
const ha_innobase_inplace_ctx& ha_ctx =