From ba4e56d8d753b57815edd38fb17bd2a2a1d9ca8c Mon Sep 17 00:00:00 2001
From: Kristian Nielsen <knielsen@knielsen-hq.org>
Date: Tue, 8 Jul 2014 15:59:03 +0200
Subject: [PATCH] Fix small merge errors after rebase

---
 sql/log_event.cc | 1 -
 sql/rpl_rli.cc   | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/sql/log_event.cc b/sql/log_event.cc
index eb05b3b5749..188aa87ae51 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -238,7 +238,6 @@ static void inline slave_rows_error_report(enum loglevel level, int ha_error,
     thd->get_stmt_da()->sql_conditions();
   Relay_log_info const *rli= rgi->rli;
   const Sql_condition *err;
-  Relay_log_info const *rli= rgi->rli;
   buff[0]= 0;
   int errcode= thd->is_error() ? thd->get_stmt_da()->sql_errno() : 0;
 
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index ee1ca37ccc5..3307293e656 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -1848,7 +1848,6 @@ rpl_group_info::mark_start_commit()
 }
 
 
-<<<<<<< TREE
 /*
   Format the current GTID as a string suitable for printing in error messages.
 
@@ -1869,7 +1868,6 @@ rpl_group_info::gtid_info()
 }
 
 
-=======
 /*
   Undo the effect of a prior mark_start_commit().
 
@@ -1898,7 +1896,6 @@ rpl_group_info::unmark_start_commit()
 }
 
 
->>>>>>> MERGE-SOURCE
 rpl_sql_thread_info::rpl_sql_thread_info(Rpl_filter *filter)
   : rpl_filter(filter)
 {