diff options
| author | kevg <claprix@yandex.ru> | 2016-11-24 17:36:02 +0300 |
|---|---|---|
| committer | kevg <claprix@yandex.ru> | 2016-11-24 17:36:02 +0300 |
| commit | 780db8e25239e5423cfab50c04c60b79ebc0224b (patch) | |
| tree | 2c73735c76607093d466a143627efdd8b4fbc2ca /sql/log_event_old.cc | |
| parent | f4d6f26a4fae3f0cfcc6e77667c7697c4e024189 (diff) | |
| download | mariadb-git-780db8e25239e5423cfab50c04c60b79ebc0224b.tar.gz | |
fix build and some warnings
Diffstat (limited to 'sql/log_event_old.cc')
| -rw-r--r-- | sql/log_event_old.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/log_event_old.cc b/sql/log_event_old.cc index 0502f20d2b1..552221ee68a 100644 --- a/sql/log_event_old.cc +++ b/sql/log_event_old.cc @@ -1582,11 +1582,10 @@ int Old_rows_log_event::do_apply_event(rpl_group_info *rgi) break; default: - rli->report(ERROR_LEVEL, thd->net.last_errno, NULL, + rli->report(ERROR_LEVEL, thd->net.last_errno, NULL, "Error in %s event: row application failed. %s", - get_type_str(), - thd->net.last_error ? thd->net.last_error : ""); - thd->is_slave_error= 1; + get_type_str(), thd->net.last_error); + thd->is_slave_error = 1; break; } @@ -1625,7 +1624,7 @@ int Old_rows_log_event::do_apply_event(rpl_group_info *rgi) "on table %s.%s. %s", get_type_str(), table->s->db.str, table->s->table_name.str, - thd->net.last_error ? thd->net.last_error : ""); + thd->net.last_error); /* If one day we honour --skip-slave-errors in row-based replication, and |