diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-02-23 13:01:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-02-23 13:06:22 +0100 |
| commit | f33e57a9e66f7e1790cb84b141381bb668e281a0 (patch) | |
| tree | 31bb1c5bd8e0addc9e994a1bb42b4703c37f7ed8 /sql/sql_admin.cc | |
| parent | 1a0526e2f294acdcac829672794ee1fe708eb2b3 (diff) | |
| parent | 245d33db4e0586df4fe28362fb002cef0151a1c9 (diff) | |
| download | mariadb-git-f33e57a9e66f7e1790cb84b141381bb668e281a0.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/sql_admin.cc')
| -rw-r--r-- | sql/sql_admin.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc index 7c1f8596ece..ee7226afd0b 100644 --- a/sql/sql_admin.cc +++ b/sql/sql_admin.cc @@ -1454,7 +1454,9 @@ bool Sql_cmd_optimize_table::execute(THD *thd) /* Presumably, OPTIMIZE and binlog writing doesn't require synchronization */ + thd->get_stmt_da()->set_overwrite_status(true); res= write_bin_log(thd, TRUE, thd->query(), thd->query_length()); + thd->get_stmt_da()->set_overwrite_status(false); } m_lex->first_select_lex()->table_list.first= first_table; m_lex->query_tables= first_table; @@ -1486,7 +1488,9 @@ bool Sql_cmd_repair_table::execute(THD *thd) /* Presumably, REPAIR and binlog writing doesn't require synchronization */ + thd->get_stmt_da()->set_overwrite_status(true); res= write_bin_log(thd, TRUE, thd->query(), thd->query_length()); + thd->get_stmt_da()->set_overwrite_status(false); } m_lex->first_select_lex()->table_list.first= first_table; m_lex->query_tables= first_table; |