database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into 10.3

Browse Source 
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:
Marko Mäkelä
2019-03-05 12:56:05 +02:00
parent 8f4de38f65 90f09ba8c2
commit 446b3ebdfc
38 changed files with 833 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_alter.h
View File

@ -333,7 +333,7 @@ private:
statements.
@todo move Alter_info and other ALTER generic structures from Lex here.
*/
class Sql_cmd_common_alter_table : public Sql_cmd
class Sql_cmd_common_alter_table : public Sql_cmd_admin
{
protected:
/**