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

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-06-24 13:09:47 +03:00
parent 49b4a6e26d d9dd673fee
commit 0076eb3d4e
333 changed files with 6721 additions and 6118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_trigger.cc
View File

@@ -82,7 +82,7 @@ public:
:Stored_program_creation_ctx(client_cs, connection_cl, db_cl)
{ }
virtual Stored_program_creation_ctx *clone(MEM_ROOT *mem_root)
Stored_program_creation_ctx *clone(MEM_ROOT *mem_root) override
{
return new (mem_root) Trigger_creation_ctx(m_client_cs,
m_connection_cl,
@@ -90,7 +90,7 @@ public:
}
protected:
virtual Object_creation_ctx *create_backup_ctx(THD *thd) const
Object_creation_ctx *create_backup_ctx(THD *thd) const override
{
return new Trigger_creation_ctx(thd);
}
@@ -282,8 +282,8 @@ public:
Handle_old_incorrect_sql_modes_hook(const char *file_path)
:path(file_path)
{};
virtual bool process_unknown_string(const char *&unknown_key, uchar* base,
MEM_ROOT *mem_root, const char *end);
bool process_unknown_string(const char *&unknown_key, uchar* base,
MEM_ROOT *mem_root, const char *end) override;
};
@@ -294,8 +294,8 @@ public:
LEX_CSTRING *trigger_table_arg)
:path(file_path), trigger_table_value(trigger_table_arg)
{};
virtual bool process_unknown_string(const char *&unknown_key, uchar* base,
MEM_ROOT *mem_root, const char *end);
bool process_unknown_string(const char *&unknown_key, uchar* base,
MEM_ROOT *mem_root, const char *end) override;
private:
const char *path;
LEX_CSTRING *trigger_table_value;
@@ -322,12 +322,12 @@ public:
Deprecated_trigger_syntax_handler() : m_trigger_name(NULL) {}
virtual bool handle_condition(THD *thd,
bool handle_condition(THD *thd,
uint sql_errno,
const char* sqlstate,
Sql_condition::enum_warning_level *level,
const char* message,
Sql_condition ** cond_hdl)
Sql_condition ** cond_hdl) override
{
if (sql_errno != EE_OUTOFMEMORY &&
sql_errno != ER_OUT_OF_RESOURCES)