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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2023-09-11 14:46:39 +03:00
parent 961b96a5e0 ef569c324d
commit 0dd25f28f7
98 changed files with 1125 additions and 22817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sql/sql_table.cc
View File

@ -77,11 +77,9 @@ static bool make_unique_constraint_name(THD *, LEX_CSTRING *, const char *,
List<Virtual_column_info> *, uint *);
static const char *make_unique_invisible_field_name(THD *, const char *,
List<Create_field> *);
static int copy_data_between_tables(THD *, TABLE *,TABLE *,
List<Create_field> &, bool, uint, ORDER *,
ha_rows *, ha_rows *,
Alter_info::enum_enable_or_disable,
Alter_table_ctx *);
static int copy_data_between_tables(THD *, TABLE *,TABLE *, bool, uint,
ORDER *, ha_rows *, ha_rows *,
Alter_info *, Alter_table_ctx *);
static int append_system_key_parts(THD *, HA_CREATE_INFO *, Key *);
static int mysql_prepare_create_table(THD *, HA_CREATE_INFO *, Alter_info *,
uint *, handler *, KEY **, uint *, int);
@ -10518,10 +10516,8 @@ do_continue:;
new_table->mark_columns_needed_for_insert();
thd->binlog_write_table_map(new_table, 1);
}
if (copy_data_between_tables(thd, table, new_table,
alter_info->create_list, ignore,
order_num, order, &copied, &deleted,
alter_info->keys_onoff,
if (copy_data_between_tables(thd, table, new_table, ignore, order_num,
order, &copied, &deleted, alter_info,
&alter_ctx))
goto err_new_table_cleanup;
}
@ -10990,11 +10986,9 @@ bool mysql_trans_commit_alter_copy_data(THD *thd)
static int
copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
List<Create_field> &create, bool ignore,
uint order_num, ORDER *order,
ha_rows *copied, ha_rows *deleted,
Alter_info::enum_enable_or_disable keys_onoff,
copy_data_between_tables(THD *thd, TABLE *from, TABLE *to, bool ignore,
uint order_num, ORDER *order, ha_rows *copied,
ha_rows *deleted, Alter_info *alter_info,
Alter_table_ctx *alter_ctx)
{
int error= 1;
@ -11043,7 +11037,8 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
backup_set_alter_copy_lock(thd, from);
alter_table_manage_keys(to, from->file->indexes_are_disabled(), keys_onoff);
alter_table_manage_keys(to, from->file->indexes_are_disabled(),
alter_info->keys_onoff);
from->default_column_bitmaps();
@ -11052,12 +11047,14 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
from->file->info(HA_STATUS_VARIABLE);
to->file->extra(HA_EXTRA_PREPARE_FOR_ALTER_TABLE);
to->file->ha_start_bulk_insert(from->file->stats.records,
ignore ? 0 : HA_CREATE_UNIQUE_INDEX_BY_SORT);
bulk_insert_started= 1;
if (!to->s->long_unique_table)
{
to->file->ha_start_bulk_insert(from->file->stats.records,
ignore ? 0 : HA_CREATE_UNIQUE_INDEX_BY_SORT);
bulk_insert_started= 1;
}
mysql_stage_set_work_estimated(thd->m_stage_progress_psi, from->file->stats.records);
List_iterator<Create_field> it(create);
List_iterator<Create_field> it(alter_info->create_list);
Create_field *def;
copy_end=copy;
to->s->default_fields= 0;
@ -11316,7 +11313,7 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
/* We are going to drop the temporary table */
to->file->extra(HA_EXTRA_PREPARE_FOR_DROP);
}
if (unlikely(to->file->ha_end_bulk_insert()) && error <= 0)
if (bulk_insert_started && to->file->ha_end_bulk_insert() && error <= 0)
{
/* Give error, if not already given */
if (!thd->is_error())
@ -11358,7 +11355,6 @@ copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
{
/* This happens if we get an error during initialization of data */
DBUG_ASSERT(error);
to->file->ha_end_bulk_insert();
ha_enable_transaction(thd, TRUE);
}