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_admin.cc | |
| 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_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index c17567e6a89..914cd4d826b 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2010, 2015, Oracle and/or its affiliates. - Copyright (c) 2011, 2018, MariaDB + Copyright (c) 2011, 2019, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1398,8 +1398,6 @@ bool Sql_cmd_repair_table::execute(THD *thd) if (check_table_access(thd, SELECT_ACL | INSERT_ACL, first_table, FALSE, UINT_MAX, FALSE)) goto error; /* purecov: inspected */ - thd->enable_slow_log&= !MY_TEST(thd->variables.log_slow_disabled_statements & - LOG_SLOW_DISABLE_ADMIN); WSREP_TO_ISOLATION_BEGIN_WRTCHK(NULL, NULL, first_table); res= mysql_admin_table(thd, first_table, &m_lex->check_opt, "repair", TL_WRITE, 1, |