issues found by CI, 1st batch

Author: ParadoxV5

mysql-test/suite/rpl/r/rpl_heartbeat_debug.result

@@ -6,7 +6,7 @@ set @restore_slave_net_timeout= @@global.slave_net_timeout;
 set @@global.slave_net_timeout= 10;
 show status like 'Slave_heartbeat_period';;
 Variable_name	Slave_heartbeat_period
-Value	60.000
+Value	5.000
 SET @saved_dbug= @@GLOBAL.debug_dbug;
 SET GLOBAL debug_dbug="+d,simulate_slave_heartbeat_network_error";
 include/start_slave.inc

sql/mysqld.cc

@@ -6821,11 +6821,11 @@ struct my_option my_long_options[]=
    "more than one storage engine, when binary log is disabled)",
    &opt_tc_log_file, &opt_tc_log_file, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+#ifdef HAVE_REPLICATION
   {"master-retry-count", 0,
    "The number of tries the slave will make to connect to the master before giving up",
    &master_retry_count, &master_retry_count, 0, GET_ULL,
    REQUIRED_ARG, static_cast<longlong>(master_retry_count), 0, 0, 0, 0, 0},
-#ifdef HAVE_REPLICATION
   {"init-rpl-role", 0, "Set the replication role",
    &rpl_status, &rpl_status, &rpl_role_typelib,
    GET_ENUM, REQUIRED_ARG, RPL_AUTH_MASTER, 0, 0, 0, 0, 0},

sql/rpl_info_file.hh

@@ -18,6 +18,7 @@
 #ifndef RPL_INFO_FILE_HH
 #define RPL_INFO_FILE_HH
 
+#include <cstdint>     // uintN_t
 #include <charconv>    // std::from/to_chars and other helpers
 #include <functional>  // superclass of InfoFile::mem_fn
 #include <my_sys.h>    // IO_CACHE
@@ -254,7 +255,7 @@ protected:
       lines= default_lines;
     for (; i < lines; ++i)
     {
-      char c;
+      int c;
       if (i < fields.size()) // line known in the ` list
       {
         const mem_fn &pm= fields.begin()[i];

sql/rpl_master_info_file.hh

@@ -37,7 +37,7 @@ inline static constexpr uint32_t SLAVE_MAX_HEARTBEAT_PERIOD=
 inline static int change_master_id_cmp(const void *arg1, const void *arg2)
 {
   const ulong &id1= *(const ulong *)arg1, &id2= *(const ulong *)arg2;
-  return (id2 > id1) - (id2 < id1);
+  return (id1 > id2) - (id1 < id2);
 }
 
 /// enum for @ref MasterInfoFile::master_use_gtid
@@ -357,6 +357,7 @@ struct MasterInfoFile: InfoFile
     bool set_default() override
     {
       mode= enum_master_use_gtid::DEFAULT;
+      gtid_supported= true;
       return false;
     }
     /** @return
@@ -418,12 +419,20 @@ struct MasterInfoFile: InfoFile
       */
       char buf[IntIOCache::BUF_SIZE<uint32_t> + 3];
       size_t length= my_b_gets(file, buf, sizeof(buf));
-      if (!length ||
-          std::from_chars(buf, &buf[length], seconds,
-                          std::chars_format::fixed).ec != IntIOCache::ERRC_OK ||
-          seconds < 0 || seconds > SLAVE_MAX_HEARTBEAT_PERIOD)
+      if (!length)
         return true;
-      operator=(seconds / 1000);
+    #ifdef __clang__
+      // FIXME: floating-point variants of `std::from_chars()` not supported
+      char end;
+      if (sscanf(buf, "%lf%c", &seconds, &end) < 2 || end
+    #else
+      std::from_chars_result result=
+        std::from_chars(buf, &buf[length], seconds, std::chars_format::fixed);
+      if (result.ec != IntIOCache::ERRC_OK || *(result.ptr)
+    #endif
+            != '\n' || seconds < 0 || seconds > SLAVE_MAX_HEARTBEAT_PERIOD)
+        return true;
+      operator=(static_cast<uint32_t>(seconds / 1000));
       return false;
     }
     /**

sql/rpl_mi.h

@@ -369,7 +369,7 @@ class Master_info: public MasterInfoFile, public Slave_reporting_capability
     first need to test if the master supports GTIDs. If not, fall back to 'No'.
     Cache the value so future RESET SLAVE commands don't revert to Slave_Pos.
   */
-  bool &master_supports_gtid= master_use_gtid.gtid_supported= true;
+  bool &master_supports_gtid= master_use_gtid.gtid_supported;
 
   /*
     When TRUE, transition this server from being an active master to a slave.

sql/slave.h

@@ -113,7 +113,7 @@ struct rpl_parallel_thread;
   (so that you have to update the .index file).
 */
 
-extern ulong master_retry_count;
+extern uint64_t master_retry_count;
 extern MY_BITMAP slave_error_mask;
 extern char slave_skip_error_names[];
 extern bool use_slave_mask;