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.cc | |
| 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.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 2 |
1 files changed, 1 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; |