diff options
| -rw-r--r-- | sql/rpl_gtid.cc | 2 | ||||
| -rw-r--r-- | sql/rpl_gtid.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index af70f281d8c..d0f5694fb5a 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -295,7 +295,7 @@ rpl_slave_state::update(uint32 domain_id, uint32 server_id, uint64 sub_id, element *elem= NULL; list_element *list_elem= NULL; - DBUG_ASSERT(hton); + DBUG_ASSERT(hton || !loaded); if (!(elem= get_element(domain_id))) return 1; diff --git a/sql/rpl_gtid.h b/sql/rpl_gtid.h index e6a3ea1a667..4ff1ca563b8 100644 --- a/sql/rpl_gtid.h +++ b/sql/rpl_gtid.h @@ -112,6 +112,11 @@ struct rpl_slave_state uint64 sub_id; uint64 seq_no; uint32 server_id; + /* + hton of mysql.gtid_slave_pos* table used to record this GTID. + Can be NULL if the gtid table failed to load (eg. missing + mysql.gtid_slave_pos table following an upgrade). + */ void *hton; }; |