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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2020-04-29 15:40:51 +03:00
parent d4da131cff 5ba2aa1ddc
commit 496d0372ef
98 changed files with 2800 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_table.cc
View File

@ -10332,7 +10332,7 @@ do_continue:;
Alter_inplace_info ha_alter_info(create_info, alter_info,
key_info, key_count,
IF_PARTITIONING(thd->work_part_info, NULL),
ignore);
ignore, alter_ctx.error_if_not_empty);
TABLE_SHARE altered_share;
TABLE altered_table;
bool use_inplace= true;
@ -10863,7 +10863,8 @@ err_new_table_cleanup:
thd->get_stmt_da()->current_row_for_warning()))
{
Abort_on_warning_instant_set aws(thd, true);
alter_ctx.report_implicit_default_value_error(thd, new_table->s);
alter_ctx.report_implicit_default_value_error(thd, new_table
? new_table->s : table->s);
}
if (new_table)