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

10
sql/sql_show.cc
View File

@@ -1078,7 +1078,7 @@ public:
bool handle_condition(THD *thd, uint sql_errno, const char * /* sqlstate */,
Sql_condition::enum_warning_level *level,
const char *message, Sql_condition ** /* cond_hdl */)
const char *message, Sql_condition ** /* cond_hdl */) override
{
/*
The handler does not handle the errors raised by itself.
@@ -5132,7 +5132,7 @@ class Warnings_only_error_handler : public Internal_error_handler
public:
bool handle_condition(THD *thd, uint sql_errno, const char* sqlstate,
Sql_condition::enum_warning_level *level,
const char* msg, Sql_condition ** cond_hdl)
const char* msg, Sql_condition ** cond_hdl) override
{
if (sql_errno == ER_TRG_NO_DEFINER || sql_errno == ER_TRG_NO_CREATION_CTX
|| sql_errno == ER_PARSE_ERROR)
@@ -10324,12 +10324,12 @@ class IS_internal_schema_access : public ACL_internal_schema_access
public:
IS_internal_schema_access() = default;
~IS_internal_schema_access() = default;
~IS_internal_schema_access() override = default;
ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
privilege_t *save_priv) const override;
const ACL_internal_table_access *lookup(const char *name) const;
const ACL_internal_table_access *lookup(const char *name) const override;
};
ACL_internal_access_result