diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-08 15:59:03 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2014-07-08 15:59:03 +0200 |
| commit | ba4e56d8d753b57815edd38fb17bd2a2a1d9ca8c (patch) | |
| tree | 3697de4081f6d5b3f690a6f000b8a4d4b8df4018 /sql/rpl_rli.cc | |
| parent | 92577cc0ebb737b279592729eb547021182eb640 (diff) | |
| download | mariadb-git-ba4e56d8d753b57815edd38fb17bd2a2a1d9ca8c.tar.gz | |
Fix small merge errors after rebase
Diffstat (limited to 'sql/rpl_rli.cc')
| -rw-r--r-- | sql/rpl_rli.cc | 3 |
1 files changed, 0 insertions, 3 deletions
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) { |