mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge 10.2 into 10.3
FIXME: Properly resolve conflicts between MDEV-18883 and MDEV-7742/MDEV-8305, and record the correct result for main.log_slow
This commit is contained in:
@ -160,6 +160,8 @@ public:
|
||||
*/
|
||||
virtual bool execute(THD *thd) = 0;
|
||||
|
||||
virtual bool log_slow_enabled_statement(const THD *thd) const;
|
||||
|
||||
protected:
|
||||
Sql_cmd()
|
||||
{}
|
||||
@ -177,6 +179,17 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
class Sql_cmd_admin: public Sql_cmd
|
||||
{
|
||||
public:
|
||||
Sql_cmd_admin()
|
||||
{}
|
||||
~Sql_cmd_admin()
|
||||
{}
|
||||
bool log_slow_enabled_statement(const THD *thd) const;
|
||||
};
|
||||
|
||||
|
||||
/**
|
||||
Sql_cmd_call represents the CALL statement.
|
||||
*/
|
||||
|
Reference in New Issue
Block a user