diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-03-26 14:58:14 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-03-26 14:58:14 +0100 |
| commit | f66e3474a82e0b44c4738f8c722305bb1a65cee7 (patch) | |
| tree | 45999e61104b8a58e01ea6c5045f6e20698395cd /sql/rpl_gtid.cc | |
| parent | 5fa4c2351902154849c90d4a8c58750ff6364e8d (diff) | |
| download | mariadb-git-f66e3474a82e0b44c4738f8c722305bb1a65cee7.tar.gz | |
MDEV-26: Global transaction ID.
Fix missing error check for applying Gtid_log_event.
Fix a couple compiler warnings.
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 6f45c4daf5c..55e2f039562 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -1088,16 +1088,17 @@ slave_connection_state::update(const rpl_gtid *in_gtid) void slave_connection_state::remove(const rpl_gtid *in_gtid) { - bool err; uchar *rec= my_hash_search(&hash, (const uchar *)(&in_gtid->domain_id), 0); #ifndef DBUG_OFF + bool err; rpl_gtid *slave_gtid= (rpl_gtid *)rec; DBUG_ASSERT(rec /* We should never try to remove not present domain_id. */); DBUG_ASSERT(slave_gtid->server_id == in_gtid->server_id); DBUG_ASSERT(slave_gtid->seq_no == in_gtid->seq_no); #endif - err= my_hash_delete(&hash, rec); + IF_DBUG(err=, ) + my_hash_delete(&hash, rec); DBUG_ASSERT(!err); } |