From 26618a54fa2be4be3711db7e128fe1d57c4233eb Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Thu, 1 May 2014 14:07:11 +0200
Subject: MDEV-5736 remove what remains from ONE_SHOT hack

---
 sql/log_event.cc | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'sql/log_event.cc')

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);
 }
 
 
-- 
cgit v1.2.1