diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-03-30 11:44:51 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-03-30 11:44:51 +0300 |
| commit | 3b5e242640a2c3c52ad9d9374c8f7e662da7b992 (patch) | |
| tree | 397ac4cfa76669d480555f1a3695e8d6356062be /sql/log.cc | |
| parent | b11ff3d49581d9e7b6f8b990f08e85e4d6384418 (diff) | |
| parent | 36e9cb54f9b0c3f9048e674f257ee60154c4a1a5 (diff) | |
| download | mariadb-git-bb-10.2-MDEV-22021.tar.gz | |
Merge branch 'codership-10.2-MDEV-22021' into bb-10.2-MDEV-22021bb-10.2-MDEV-22021
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 64da45bfcea..5a6d2fbe24e 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -2209,9 +2209,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); @@ -2245,9 +2242,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 |