MDEV-26. Intermediate commit.

Implement CHANGE MASTER TO MASTER_GTID_POS=xxx.

1 files changed, 23 insertions, 6 deletions

diff --git a/sql/log_event.cc b/sql/log_event.cc
index 7a32a812214..3f008b30aa7 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -6292,7 +6292,6 @@ rpl_slave_state::tostring(String *dest)
 {
   bool first= true;
   uint32 i;
-    int err= 1;
 
   lock();
 
@@ -6303,9 +6302,8 @@ rpl_slave_state::tostring(String *dest)
     element *e= (element *)my_hash_element(&hash, i);
     list_element *l= e->list;
 
-    DBUG_ASSERT(l /* We should never have empty list in element. */);
     if (!l)
-      goto err;
+      continue;                                 /* Nothing here */
 
     best_gtid.domain_id= e->domain_id;
     best_gtid.server_id= l->server_id;
@@ -6332,11 +6330,30 @@ rpl_slave_state::tostring(String *dest)
     dest->append_ulonglong(best_gtid.seq_no);
  }
 
-  err= 0;
+  unlock();
+  return 0;
+}
+
 
-err:
+bool
+rpl_slave_state::is_empty()
+{
+  uint32 i;
+  bool result= true;
+
+  lock();
+  for (i= 0; i < hash.records; ++i)
+  {
+    element *e= (element *)my_hash_element(&hash, i);
+    if (e->list)
+    {
+      result= false;
+      break;
+    }
+  }
   unlock();
-  return err;
+
+  return result;
 }