database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2018-11-06 08:41:48 +02:00
parent af9649c722 bae21bfb5d
commit 32062cc61c
277 changed files with 16966 additions and 4246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_admin.cc
View File

@@ -1321,6 +1321,7 @@ bool Sql_cmd_analyze_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}
@@ -1379,6 +1380,7 @@ bool Sql_cmd_optimize_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}
@@ -1413,5 +1415,6 @@ bool Sql_cmd_repair_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}