database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix small merge errors after rebase

Browse Source
This commit is contained in:
Kristian Nielsen
2014-07-08 15:59:03 +02:00
parent 92577cc0eb
commit ba4e56d8d7
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/log_event.cc
View File

@ -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;

3
sql/rpl_rli.cc
View File

@ -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()
} }
=======
/* /*
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()
} }
>>>>>>> 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)
{ {