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 branch '10.11' into 11.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2024-07-05 12:45:07 +02:00
parent e012407397 034a175982
commit 2447dda2c0
589 changed files with 13709 additions and 11121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_cmd.h
View File

@@ -316,16 +316,16 @@ public:
@param thd global context the processed statement
@returns false on success, true on error
*/
virtual bool prepare(THD *thd);
bool prepare(THD *thd) override;
/**
Execute the processed statement once
@param thd global context the processed statement
@returns false on success, true on error
*/
virtual bool execute(THD *thd);
bool execute(THD *thd) override;
virtual bool is_dml() const { return true; }
bool is_dml() const override { return true; }
select_result *get_result() { return result; }
@@ -415,9 +415,9 @@ public:
:show_all_slaves_status(status_all)
{}
enum_sql_command sql_command_code() const { return SQLCOM_SHOW_SLAVE_STAT; }
enum_sql_command sql_command_code() const override { return SQLCOM_SHOW_SLAVE_STAT; }
bool execute(THD *thd);
bool execute(THD *thd) override;
bool is_show_all_slaves_stat() { return show_all_slaves_status; }
};
@@ -426,20 +426,20 @@ class Sql_cmd_create_table_like: public Sql_cmd,
public Storage_engine_name
{
public:
Storage_engine_name *option_storage_engine_name() { return this; }
bool execute(THD *thd);
Storage_engine_name *option_storage_engine_name() override { return this; }
bool execute(THD *thd) override;
};
class Sql_cmd_create_table: public Sql_cmd_create_table_like
{
public:
enum_sql_command sql_command_code() const { return SQLCOM_CREATE_TABLE; }
enum_sql_command sql_command_code() const override { return SQLCOM_CREATE_TABLE; }
};
class Sql_cmd_create_sequence: public Sql_cmd_create_table_like
{
public:
enum_sql_command sql_command_code() const { return SQLCOM_CREATE_SEQUENCE; }
enum_sql_command sql_command_code() const override { return SQLCOM_CREATE_SEQUENCE; }
};
@@ -463,9 +463,9 @@ public:
@param thd the current thread.
@return false on success.
*/
bool execute(THD *thd);
bool execute(THD *thd) override;
virtual enum_sql_command sql_command_code() const
enum_sql_command sql_command_code() const override
{
return SQLCOM_CALL;
}