diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-15 09:56:03 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-04-15 09:56:03 +0300 |
| commit | 84db10f27bdb4c8d9edf7f554afdcd2a24e3285a (patch) | |
| tree | 5f9d5b22cdfee6f147274d85b279d98f8a1bb46b /sql/log.cc | |
| parent | 9aacda409db8606b985a93f675487943846cbc86 (diff) | |
| parent | ccaec18b3934ee384296b4597bdf462fac66c5a4 (diff) | |
| download | mariadb-git-84db10f27bdb4c8d9edf7f554afdcd2a24e3285a.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/log.cc b/sql/log.cc index bde301452be..ae7468ede81 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2251,9 +2251,6 @@ static int binlog_savepoint_set(handlerton *hton, THD *thd, void *sv) int error= 1; DBUG_ENTER("binlog_savepoint_set"); - if (wsrep_emulate_bin_log) - DBUG_RETURN(0); - char buf[1024]; String log_query(buf, sizeof(buf), &my_charset_bin); @@ -2286,9 +2283,6 @@ static int binlog_savepoint_rollback(handlerton *hton, THD *thd, void *sv) { DBUG_ENTER("binlog_savepoint_rollback"); - if (wsrep_emulate_bin_log) - DBUG_RETURN(0); - /* Write ROLLBACK TO SAVEPOINT to the binlog cache if we have updated some non-transactional table. Otherwise, truncate the binlog cache starting |