diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-06-20 10:45:57 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-06-20 11:10:27 +0200 |
| commit | bb24663f5ad955a615172512c04779d219bb6645 (patch) | |
| tree | 63e9c3c6bc1026e9853f3d766d208899c3cfdae9 /sql/sql_class.cc | |
| parent | 44682962e3fe591d16c6fa966c39e9c738427712 (diff) | |
| download | mariadb-git-bb24663f5ad955a615172512c04779d219bb6645.tar.gz | |
MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specific temporary errors
Revert 7bbe324fc17
Fix the bug differently (in log_event.cc)
Fix the test case to actually fail without the bug fix
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 0a95d2e2cc5..0f629a2c995 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -7003,13 +7003,6 @@ bool THD::rgi_have_temporary_tables() return rgi_slave->rli->save_temporary_tables != 0; } -bool THD::is_optimistic_slave_worker() -{ - DBUG_ASSERT(system_thread != SYSTEM_THREAD_SLAVE_SQL || rgi_slave); - - return system_thread == SYSTEM_THREAD_SLAVE_SQL && rgi_slave && - rgi_slave->speculation == rpl_group_info::SPECULATE_OPTIMISTIC; -} void wait_for_commit::reinit() |