[Commits] Rev 4282: Fix small merge errors after rebase in http://bazaar.launchpad.net/~maria-captains/maria/10.0

knielsen at knielsen-hq.org knielsen at knielsen-hq.org
Tue Jul 8 16:59:03 EEST 2014


At http://bazaar.launchpad.net/~maria-captains/maria/10.0

------------------------------------------------------------
revno: 4282
revision-id: knielsen at knielsen-hq.org-20140708135903-rmf1qd77gqc01gkj
parent: knielsen at knielsen-hq.org-20140708125453-m0h5zbe6w3hl6uvj
committer: Kristian Nielsen <knielsen at knielsen-hq.org>
branch nick: tmp-10.0
timestamp: Tue 2014-07-08 15:59:03 +0200
message:
  Fix small merge errors after rebase
=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2014-07-08 10:54:47 +0000
+++ b/sql/log_event.cc	2014-07-08 13:59:03 +0000
@@ -238,7 +238,6 @@ static void inline slave_rows_error_repo
     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;
 

=== modified file 'sql/rpl_rli.cc'
--- a/sql/rpl_rli.cc	2014-07-08 10:54:47 +0000
+++ b/sql/rpl_rli.cc	2014-07-08 13:59:03 +0000
@@ -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)
 {



More information about the commits mailing list