Skip to content

M
mariadb
Commit ba4e56d8 authored by Kristian Nielsen's avatar Kristian Nielsen
Browse files
Options

Fix small merge errors after rebase

parent 92577cc0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
sql/log_event.cc
View file @ ba4e56d8
...@@ -238,7 +238,6 @@ static void inline slave_rows_error_report(enum loglevel level, int ha_error, ...@@ -238,7 +238,6 @@ static void inline slave_rows_error_report(enum loglevel level, int ha_error,
thd->get_stmt_da()->sql_conditions(); thd->get_stmt_da()->sql_conditions();
Relay_log_info const *rli= rgi->rli; Relay_log_info const *rli= rgi->rli;
const Sql_condition *err; const Sql_condition *err;
Relay_log_info const *rli= rgi->rli;
buff[0]= 0; buff[0]= 0;
int errcode= thd->is_error() ? thd->get_stmt_da()->sql_errno() : 0; int errcode= thd->is_error() ? thd->get_stmt_da()->sql_errno() : 0;
......
sql/rpl_rli.cc
View file @ ba4e56d8
...@@ -1848,7 +1848,6 @@ rpl_group_info::mark_start_commit() ...@@ -1848,7 +1848,6 @@ rpl_group_info::mark_start_commit()
} }
<<<<<<< TREE
/* /*
Format the current GTID as a string suitable for printing in error messages. Format the current GTID as a string suitable for printing in error messages.
...@@ -1869,7 +1868,6 @@ rpl_group_info::gtid_info() ...@@ -1869,7 +1868,6 @@ rpl_group_info::gtid_info()
} }
=======
/* /*
Undo the effect of a prior mark_start_commit(). Undo the effect of a prior mark_start_commit().
...@@ -1898,7 +1896,6 @@ rpl_group_info::unmark_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_sql_thread_info::rpl_sql_thread_info(Rpl_filter *filter)
: rpl_filter(filter) : rpl_filter(filter)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7