diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 18:50:54 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-12 18:50:54 +0300 |
| commit | 609ea2f37b8169a7c282fe2d607c2412467ccbbb (patch) | |
| tree | ce5f8317d4d659641799c560fe074abcc24d6ac6 /sql/sql_class.cc | |
| parent | be33124c9dc284c4409d02e5405de568b467a167 (diff) | |
| download | mariadb-git-609ea2f37b8169a7c282fe2d607c2412467ccbbb.tar.gz | |
MDEV-17614: After-merge fix
MDEV-17614 flags INSERT…ON DUPLICATE KEY UPDATE unsafe for statement-based
replication when there are multiple unique indexes. This correctly fixes
something whose attempted fix in MySQL 5.7
in mysql/mysql-server@c93b0d9a972cb6f98fd445f2b69d924350f9128a
caused lock conflicts. That change was reverted in MySQL 5.7.26
in mysql/mysql-server@066b6fdd433aa6673622341f1a2f0a3a20018043
(with a substantial amount of other changes).
In MDEV-17073 we already disabled the unfortunate MySQL change when
statement-based replication was not being used. Now, thanks to MDEV-17614,
we can actually remove the change altogether.
This reverts commit 8a346f31b913daa011085afec2b2d38450c73e00 (MDEV-17073)
and mysql/mysql-server@c93b0d9a972cb6f98fd445f2b69d924350f9128a while
keeping the test cases.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 0f6003264b6..20366742084 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -4553,12 +4553,6 @@ extern "C" int thd_rpl_is_parallel(const MYSQL_THD thd) return thd->rgi_slave && thd->rgi_slave->is_parallel_exec; } -extern "C" int thd_rpl_stmt_based(const MYSQL_THD thd) -{ - return thd && - !thd->is_current_stmt_binlog_format_row() && - !thd->is_current_stmt_binlog_disabled(); -} /* Returns high resolution timestamp for the start of the current query. */ |