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:
@ -28,7 +28,7 @@ int reassign_keycache_tables(THD* thd, KEY_CACHE *src_cache,
|
||||
/**
|
||||
Sql_cmd_analyze_table represents the ANALYZE TABLE statement.
|
||||
*/
|
||||
class Sql_cmd_analyze_table : public Sql_cmd
|
||||
class Sql_cmd_analyze_table : public Sql_cmd_admin
|
||||
{
|
||||
public:
|
||||
/**
|
||||
@ -53,7 +53,7 @@ public:
|
||||
/**
|
||||
Sql_cmd_check_table represents the CHECK TABLE statement.
|
||||
*/
|
||||
class Sql_cmd_check_table : public Sql_cmd
|
||||
class Sql_cmd_check_table : public Sql_cmd_admin
|
||||
{
|
||||
public:
|
||||
/**
|
||||
@ -77,7 +77,7 @@ public:
|
||||
/**
|
||||
Sql_cmd_optimize_table represents the OPTIMIZE TABLE statement.
|
||||
*/
|
||||
class Sql_cmd_optimize_table : public Sql_cmd
|
||||
class Sql_cmd_optimize_table : public Sql_cmd_admin
|
||||
{
|
||||
public:
|
||||
/**
|
||||
@ -102,7 +102,7 @@ public:
|
||||
/**
|
||||
Sql_cmd_repair_table represents the REPAIR TABLE statement.
|
||||
*/
|
||||
class Sql_cmd_repair_table : public Sql_cmd
|
||||
class Sql_cmd_repair_table : public Sql_cmd_admin
|
||||
{
|
||||
public:
|
||||
/**
|
||||
|
Reference in New Issue
Block a user