diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-05 12:56:05 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-05 12:56:05 +0200 |
| commit | 446b3ebdfc75f3a97d349d1347c4900a2e3eee03 (patch) | |
| tree | 1fc75e520ac84591d2e2c647855f153a07ec3190 /sql/sql_cmd.h | |
| parent | 8f4de38f65ba89c6273c15c9adb50ab762d03f59 (diff) | |
| parent | 90f09ba8c249e23e015ce9d1d56463869f1a5358 (diff) | |
| download | mariadb-git-446b3ebdfc75f3a97d349d1347c4900a2e3eee03.tar.gz | |
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
Diffstat (limited to 'sql/sql_cmd.h')
| -rw-r--r-- | sql/sql_cmd.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sql/sql_cmd.h b/sql/sql_cmd.h index 1c4c89eb132..83dd1b1da4f 100644 --- a/sql/sql_cmd.h +++ b/sql/sql_cmd.h @@ -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. */ |