Merge 10.0-base -> 10.0

1 files changed, 7 insertions, 3 deletions

diff --git a/sql/rpl_mi.h b/sql/rpl_mi.h
index 9958f9a5cea..7e3709993ed 100644
--- a/sql/rpl_mi.h
+++ b/sql/rpl_mi.h
@@ -131,10 +131,14 @@ class Master_info : public Slave_reporting_capability
   DYNAMIC_ARRAY ignore_server_ids;
   ulong master_id;
   /*
-    True if slave position is set using GTID state rather than old-style
-    file/offset binlog position.
+    Which kind of GTID position (if any) is used when connecting to master.
+
+    Note that you can not change the numeric values of these, they are used
+    in master.info.
   */
-  bool using_gtid;
+  enum {
+    USE_GTID_NO= 0, USE_GTID_CURRENT_POS= 1, USE_GTID_SLAVE_POS= 2
+  } using_gtid;
 };
 int init_master_info(Master_info* mi, const char* master_info_fname,
 		     const char* slave_info_fname,