summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2014-05-01 14:07:11 +0200
committerSergei Golubchik <sergii@pisem.net>2014-05-01 14:07:11 +0200
commit26618a54fa2be4be3711db7e128fe1d57c4233eb (patch)
tree8eef14725db7d11c48a329d6ebd8f5d50f21c045 /sql/log_event.cc
parentd81b662b8c75018f4facd2323558805ee2bc7eb8 (diff)
downloadmariadb-git-26618a54fa2be4be3711db7e128fe1d57c4233eb.tar.gz
MDEV-5736 remove what remains from ONE_SHOT hack
Diffstat (limited to 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc13
1 files changed, 1 insertions, 12 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index dda7f360f55..6610c436302 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -4471,18 +4471,7 @@ end:
int Query_log_event::do_update_pos(rpl_group_info *rgi)
{
- /*
- Note that we will not increment group* positions if we are just
- after a SET ONE_SHOT, because SET ONE_SHOT should not be separated
- from its following updating query.
- */
- if (thd->one_shot_set)
- {
- rgi->inc_event_relay_log_pos();
- return 0;
- }
- else
- return Log_event::do_update_pos(rgi);
+ return Log_event::do_update_pos(rgi);
}