database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-10-23 18:49:29 +03:00
Code Activity

Merge branch '10.11' into 11.4

Browse Source
This commit is contained in:
Sergei Golubchik
2026-01-28 16:06:03 +01:00
parent ca39e66060 b29d3779e4
commit 40f7084661
391 changed files with 14112 additions and 2799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_trigger.cc
View File

@@ -119,39 +119,33 @@ Trigger_creation_ctx::create(THD *thd,
bool invalid_creation_ctx= FALSE;
myf utf8_flag= thd->get_utf8_flag();
if (resolve_charset(client_cs_name->str,
if (resolve_charset(safe_str(client_cs_name),
thd->variables.character_set_client,
&client_cs, MYF(utf8_flag)))
{
sql_print_warning("Trigger for table '%s'.'%s': "
"invalid character_set_client value (%s).",
(const char *) db_name,
(const char *) table_name,
(const char *) client_cs_name->str);
db_name, table_name, safe_str(client_cs_name));
invalid_creation_ctx= TRUE;
}
if (resolve_collation(connection_cl_name->str,
if (resolve_collation(safe_str(connection_cl_name),
thd->variables.collation_connection,
&connection_cl,MYF(utf8_flag)))
{
sql_print_warning("Trigger for table '%s'.'%s': "
"invalid collation_connection value (%s).",
(const char *) db_name,
(const char *) table_name,
(const char *) connection_cl_name->str);
db_name, table_name, safe_str(connection_cl_name));
invalid_creation_ctx= TRUE;
}
if (resolve_collation(db_cl_name->str, NULL, &db_cl, MYF(utf8_flag)))
if (resolve_collation(safe_str(db_cl_name), NULL, &db_cl, MYF(utf8_flag)))
{
sql_print_warning("Trigger for table '%s'.'%s': "
"invalid database_collation value (%s).",
(const char *) db_name,
(const char *) table_name,
(const char *) db_cl_name->str);
db_name, table_name, safe_str(db_cl_name));
invalid_creation_ctx= TRUE;
}
@@ -162,8 +156,7 @@ Trigger_creation_ctx::create(THD *thd,
Sql_condition::WARN_LEVEL_WARN,
ER_TRG_INVALID_CREATION_CTX,
ER_THD(thd, ER_TRG_INVALID_CREATION_CTX),
(const char *) db_name,
(const char *) table_name);
db_name, table_name);
}
/*