Skip to content

Commit

Permalink
MDEV-25549 : Assertion `*new_engine' failed in bool check_engine(THD*…
Browse files Browse the repository at this point in the history
…, const char*, const char*, HA_CREATE_INFO*)

In Galera case we call check_engine that could set create_info->db_type
to NULL e.g. if TEMPORARY is not supported by storage engine. Thus,
we need to restore it after that call because it is needed later
on mysql_create_table that will also call check_engine.
  • Loading branch information
Jan Lindström committed Jan 11, 2022
1 parent c430f61 commit ce415be
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions sql/sql_table.cc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright (c) 2000, 2019, Oracle and/or its affiliates.
Copyright (c) 2010, 2020, MariaDB
Copyright (c) 2010, 2022, MariaDB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -11036,14 +11036,23 @@ bool Sql_cmd_create_table::execute(THD *thd)
tables, like mysql replication does. Also check if the requested
engine is allowed/supported.
*/
if (WSREP(thd) &&
!check_engine(thd, create_table->db, create_table->table_name,
&create_info) &&
(!thd->is_current_stmt_binlog_format_row() ||
!create_info.tmp_table()))
#ifdef WITH_WSREP
if (WSREP(thd))
{
WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL)
handlerton *orig_ht= create_info.db_type;
if (!check_engine(thd, create_table->db, create_table->table_name,
&create_info) &&
(!thd->is_current_stmt_binlog_format_row() ||
!create_info.tmp_table()))
{
WSREP_TO_ISOLATION_BEGIN(create_table->db, create_table->table_name, NULL)
}
// check_engine will set db_type to NULL if e.g. TEMPORARY is
// not supported by the storage engine, this case is checked
// again in mysql_create_table
create_info.db_type= orig_ht;
}
#endif /* WITH_WSREP */
/* Regular CREATE TABLE */
res= mysql_create_table(thd, create_table, &create_info, &alter_info);
}
Expand Down

0 comments on commit ce415be

Please sign in to comment.