database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch 10.4 into 10.5

Browse Source
This commit is contained in:
Julius Goryavsky
2021-12-26 12:51:04 +01:00
parent be20b3b03f 681b7784b6
commit 55bb933a88
89 changed files with 1619 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_table.cc
View File

@ -12231,8 +12231,14 @@ bool Sql_cmd_create_table_like::execute(THD *thd)
(!thd->is_current_stmt_binlog_format_row() ||
!create_info.tmp_table()))
{
WSREP_TO_ISOLATION_BEGIN_CREATE(create_table->db.str, create_table->table_name.str,
create_table, &create_info);
#ifdef WITH_WSREP
WSREP_TO_ISOLATION_BEGIN_ALTER(create_table->db.str, create_table->table_name.str,
first_table, &alter_info, NULL, &create_info)
{
WSREP_WARN("CREATE TABLE isolation failure");
DBUG_RETURN(true);
}
#endif /* WITH_WSREP */
}
/* Regular CREATE TABLE */
res= mysql_create_table(thd, create_table, &create_info, &alter_info);
@ -12254,9 +12260,4 @@ bool Sql_cmd_create_table_like::execute(THD *thd)
end_with_restore_list:
DBUG_RETURN(res);
#ifdef WITH_WSREP
wsrep_error_label:
DBUG_RETURN(true);
#endif
}