database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.6' into 10.7

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-10-16 21:40:33 +02:00
parent 8a9e17103b 822694bd56
commit ec2b30e736
24 changed files with 233 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sql/sql_class.h
View File

@ -2061,6 +2061,21 @@ public:
};
struct Suppress_warnings_error_handler : public Internal_error_handler
{
bool handle_condition(THD *thd,
uint sql_errno,
const char *sqlstate,
Sql_condition::enum_warning_level *level,
const char *msg,
Sql_condition **cond_hdl)
{
return *level == Sql_condition::WARN_LEVEL_WARN;
}
};
/**
Tables that were locked with LOCK TABLES statement.