diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
| commit | daf4fa5238a67fcf47075721d86d4348adab687b (patch) | |
| tree | fff85b8f2e11607c93d806e787475ad82f5055f6 /sql/sql_table.cc | |
| parent | 756568f26c6a23c537f4d93ff00f485c6291c92e (diff) | |
| parent | 7dfaded9625e832fade4ef1678bcb21c445dad2b (diff) | |
| download | mariadb-git-st-10.8-merge.tar.gz | |
Merge 10.7 into 10.8st-10.8-merge
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index b07efb29bba..a9ad8b7720d 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -11903,8 +11903,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); @@ -11926,9 +11932,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 } |