diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-04-20 16:16:26 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-04-21 10:30:17 +0200 |
| commit | 00eebb22435c871bbe9938582d96e6a3d1c00861 (patch) | |
| tree | a3240ace9767388cd0506c3020b43701fb04cf98 /sql/rpl_gtid.h | |
| parent | 638d4e90e823756922f162af7783ad122d03f6dc (diff) | |
| download | mariadb-git-00eebb22435c871bbe9938582d96e6a3d1c00861.tar.gz | |
MDEV-12179: Per-engine mysql.gtid_slave_pos table
Intermediate commit.
Fix incorrect assertion. The hton in the list of pending GTIDs can be
NULL, in the special case where we failed to load the
mysql.gtid_slave_pos table at server startup, but nevertheless allow
non-GTID replication to proceed.
Diffstat (limited to 'sql/rpl_gtid.h')
| -rw-r--r-- | sql/rpl_gtid.h | 5 |
1 files changed, 5 insertions, 0 deletions
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; }; |