database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-09 11:41:36 +03:00
Code Activity

Merge branch '10.11' into 11.4

Browse Source
This commit is contained in:
Sergei Golubchik
2025-11-03 14:23:51 +01:00
parent 75ded7d03a cb0d6dd835
commit 1093a2f3b8
161 changed files with 3117 additions and 934 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sql/sql_table.cc
View File

@@ -5013,32 +5013,35 @@ bool wsrep_check_sequence(THD* thd,
const bool used_engine)
{
enum legacy_db_type db_type;
const LEX_CSTRING *engine_name;
DBUG_ASSERT(WSREP(thd));
if (used_engine)
{
db_type= thd->lex->create_info.db_type->db_type;
// Currently any dynamic storage engine is not possible to identify
// using DB_TYPE_XXXX and ENGINE=SEQUENCE is one of them.
// Therefore, we get storage engine name from lex.
engine_name=
thd->lex->m_sql_cmd->option_storage_engine_name()->name();
}
else
{
const handlerton *hton= ha_default_handlerton(thd);
db_type= hton->db_type;
engine_name= hton_name(hton);
}
// In Galera cluster we support only InnoDB sequences
if (db_type != DB_TYPE_INNODB)
{
// Currently any dynamic storage engine is not possible to identify
// using DB_TYPE_XXXX and ENGINE=SEQUENCE is one of them.
// Therefore, we get storage engine name from lex.
const LEX_CSTRING *tb_name= thd->lex->m_sql_cmd->option_storage_engine_name()->name();
// (1) CREATE TABLE ... ENGINE=SEQUENCE OR
// (2) ALTER TABLE ... ENGINE= OR
// Note in ALTER TABLE table->s->sequence != nullptr
// (3) CREATE SEQUENCE ... ENGINE=
if ((thd->lex->sql_command == SQLCOM_CREATE_TABLE &&
lex_string_eq(tb_name, STRING_WITH_LEN("SEQUENCE"))) ||
lex_string_eq(engine_name, STRING_WITH_LEN("SEQUENCE"))) ||
(thd->lex->sql_command == SQLCOM_ALTER_TABLE) ||
(thd->lex->sql_command == SQLCOM_CREATE_SEQUENCE))
{
@@ -5046,7 +5049,8 @@ bool wsrep_check_sequence(THD* thd,
"non-InnoDB sequences in Galera cluster");
push_warning_printf(thd, Sql_condition::WARN_LEVEL_NOTE,
ER_NOT_SUPPORTED_YET,
"ENGINE=%s not supported by Galera", tb_name->str);
"ENGINE=%s not supported by Galera",
engine_name->str);
return(true);
}
}
@@ -11761,6 +11765,7 @@ do_continue:;
}
else
{
/* MERGE TABLE */
if (!table->s->tmp_table &&
wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
goto err_new_table_cleanup;
@@ -11769,6 +11774,8 @@ do_continue:;
alter_info->keys_onoff);
if (trans_commit_stmt(thd) || trans_commit_implicit(thd))
goto err_new_table_cleanup;
/* Ensure that the ALTER is binlogged as a DDL */
thd->transaction->stmt.mark_trans_did_ddl();
}
thd->count_cuted_fields= CHECK_FIELD_IGNORE;