Cherry-pick #4441 for merge conflict resolution

ParadoxV5 · ParadoxV5 · commit fa9b7aece75d · 2025-11-18T21:25:04.000-07:00
MDEV-35879 Slave_heartbeat_period is imprecise
* Increase maximum to `std::numeric_limits&lt;uint32_t&gt;::max() ÷ 1000`,
  i.e., `4294967.295` *exactly*
* Excludes its additional tests as they are exclusive to that issue fix.
  * But not the `0.00049` case, which was *changed*, not *added*.
* Some changes are refactors and so are exclusive to the `main` branch.
  * Delete tests in `rpl.rpl_heartbeat`
    that duplicates `rpl.rpl_heartbeat_basic`
diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat.result b/mysql-test/suite/rpl/r/rpl_heartbeat.result
@@ -6,41 +6,6 @@ connection slave;
 include/stop_slave.inc
 set @restore_slave_net_timeout= @@global.slave_net_timeout;
 set @@global.slave_net_timeout= 10;
-change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
-show status like 'Slave_heartbeat_period';;
-Variable_name	Slave_heartbeat_period
-Value	5.000
-change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294968;
-ERROR HY000: The requested value for the heartbeat period is either negative or exceeds the maximum allowed (4294967 seconds)
-show status like 'Slave_heartbeat_period';;
-Variable_name	Slave_heartbeat_period
-Value	5.000
-connection slave;
-change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.0009999;
-Warnings:
-Warning	1703	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled
-show status like 'Slave_heartbeat_period';;
-Variable_name	Slave_heartbeat_period
-Value	0.000
-change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4294967;
-Warnings:
-Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout
-show status like 'Slave_heartbeat_period';;
-Variable_name	Slave_heartbeat_period
-Value	4294967.000
-change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 0.001;
-show status like 'Slave_heartbeat_period';;
-Variable_name	Slave_heartbeat_period
-Value	0.001
-reset slave;
-set @@global.slave_net_timeout= 5;
-change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 5.001;
-Warnings:
-Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout
-show status like 'Slave_heartbeat_period';;
-Variable_name	Slave_heartbeat_period
-Value	5.001
-reset slave;
 set @@global.slave_net_timeout= 5;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root', master_heartbeat_period= 4;
 show status like 'Slave_heartbeat_period';;
diff --git a/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result b/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
@@ -145,7 +145,7 @@ SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
 Slave_heartbeat_period	0.001
 RESET SLAVE;
-CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.0009;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=0.00049;
 Warnings:
 Warning	1703	The requested value for the heartbeat period is less than 1 millisecond. The value is reset to 0, meaning that heartbeating will effectively be disabled
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
@@ -154,21 +154,21 @@ Slave_heartbeat_period	0.000
 RESET SLAVE;
 
 *** Max slave_heartbeat_timeout ***
-CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=4294967;
+CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=4294967.295;
 Warnings:
 Warning	1704	The requested value for the heartbeat period exceeds the value of `slave_net_timeout' seconds. A sensible value for the period should be less than the timeout
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 Variable_name	Value
-Slave_heartbeat_period	4294967.000
+Slave_heartbeat_period	4294967.295
 RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=4294968;
-ERROR HY000: The requested value for the heartbeat period is either negative or exceeds the maximum allowed (4294967 seconds)
+ERROR HY000: The requested value for the heartbeat period is either negative or exceeds the maximum allowed (4294967.295 seconds)
 RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=8589935;
-ERROR HY000: The requested value for the heartbeat period is either negative or exceeds the maximum allowed (4294967 seconds)
+ERROR HY000: The requested value for the heartbeat period is either negative or exceeds the maximum allowed (4294967.295 seconds)
 RESET SLAVE;
 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=4294967296;
-ERROR HY000: The requested value for the heartbeat period is either negative or exceeds the maximum allowed (4294967 seconds)
+ERROR HY000: The requested value for the heartbeat period is either negative or exceeds the maximum allowed (4294967.295 seconds)
 RESET SLAVE;
 
 *** Misc incorrect values ***
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat.test b/mysql-test/suite/rpl/t/rpl_heartbeat.test
@@ -21,58 +21,6 @@ set @@global.slave_net_timeout= 10;
 --enable_warnings
 
 --enable_prepare_warnings
-###
-### Checking the range
-###
-
-#
-# default period slave_net_timeout/2
-#
---replace_result $MASTER_MYPORT MASTER_PORT
-eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root';
---query_vertical show status like 'Slave_heartbeat_period';
-
-#
-# the max for the period is ULONG_MAX/1000; an attempt to exceed it is  denied
-#
---replace_result $MASTER_MYPORT MASTER_PORT
---error ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
-eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 4294968;
---query_vertical show status like 'Slave_heartbeat_period';
-
-#
-# the min value for the period is 1 millisecond an attempt to assign a
-# lesser will be warned with treating the value as zero
-#
-connection slave;
---replace_result $MASTER_MYPORT MASTER_PORT
-### 5.1 mtr does not have --warning ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
-eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 0.0009999;
---query_vertical show status like 'Slave_heartbeat_period';
-
-#
-# the actual max and min must be accepted
-#
---replace_result $MASTER_MYPORT MASTER_PORT
-eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 4294967;
---query_vertical show status like 'Slave_heartbeat_period';
-
---replace_result $MASTER_MYPORT MASTER_PORT
-eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 0.001;
---query_vertical show status like 'Slave_heartbeat_period';
-
-reset slave;
-
-#
-# A warning if period greater than slave_net_timeout
-#
-set @@global.slave_net_timeout= 5;
---replace_result $MASTER_MYPORT MASTER_PORT
-eval change master to master_host='127.0.0.1',master_port=$MASTER_MYPORT, master_user='root', master_heartbeat_period= 5.001;
---query_vertical show status like 'Slave_heartbeat_period';
-
-reset slave;
-
 #
 # A warning if slave_net_timeout is set to less than the current HB period
 #
diff --git a/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test b/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
@@ -197,14 +197,14 @@ eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTE
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 RESET SLAVE;
 --replace_result $MASTER_MYPORT MASTER_PORT
-eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=0.0009;
+eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=0.00049;
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 RESET SLAVE;
 --echo
 
 --echo *** Max slave_heartbeat_timeout ***
 --replace_result $MASTER_MYPORT MASTER_PORT
-eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=4294967;
+eval CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT, MASTER_USER='root', MASTER_CONNECT_RETRY=$connect_retry, MASTER_HEARTBEAT_PERIOD=4294967.295;
 SHOW GLOBAL STATUS LIKE 'slave_heartbeat_period';
 RESET SLAVE;
 --replace_result $MASTER_MYPORT MASTER_PORT
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
@@ -7112,8 +7112,8 @@ static int show_heartbeat_period(THD *thd, SHOW_VAR *var, void *buff,
       get_master_info(&thd->variables.default_master_connection,
                       Sql_condition::WARN_LEVEL_NOTE))
   {
-    sprintf(static_cast<char*>(buff), "%.3f",
-            mi->master_heartbeat_period / 1000.0);
+    sprintf(static_cast<char*>(buff), "%.3lf",
+            mi->master_heartbeat_period/1000.0);
     mi->release();
     var->type= SHOW_CHAR;
     var->value= buff;
diff --git a/sql/rpl_info_file.h b/sql/rpl_info_file.h
@@ -51,7 +51,7 @@ namespace Int_IO_CACHE
     if (!length) // EOF
       return true;
     // SFINAE if `I` is not a numeric type
-    std::from_chars_result result= std::from_chars(buf, &buf[length], value);
+    std::from_chars_result result= std::from_chars(buf, &(buf[length]), value);
     // Return `true` if the conversion failed or if the number ended early
     return result.ec != ERRC_OK || *(result.ptr) != '\n';
   }
diff --git a/sql/rpl_master_info_file.h b/sql/rpl_master_info_file.h
@@ -18,9 +18,13 @@
 #include "rpl_info_file.h"
 #include <unordered_map> // Type of @ref Master_info_file::FIELDS_MAP
 #include <string_view>   // Key type of @ref Master_info_file::FIELDS_MAP
-#include <optional>      // Storage type of @ref Optional_int_field
-#include <unordered_set> // Used by Master_info_file::load_from_file() to dedup
-#include "sql_const.h"   // MAX_PASSWORD_LENGTH
+// Storage type of @ref Master_info_file::Optional_int_field
+#include <optional>
+#include <unordered_set>  // Used by Master_info_file::load_from_file() to dedup
+#include <mysqld_error.h> // ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_X
+#include "sql_const.h"    // MAX_PASSWORD_LENGTH
+// Interface type of @ref Master_info_file::master_heartbeat_period
+#include "my_decimal.h"
 
 
 /**
@@ -396,19 +400,60 @@ struct Master_info_file: Info_file
     It has a `DEFAULT` value of @ref ::master_heartbeat_period,
     which in turn has a `DEFAULT` value of `@@slave_net_timeout / 2` seconds.
   */
-  struct: Optional_field<uint32_t>
+  struct Heartbeat_period_field: Optional_field<uint32_t>
   {
+    /// @return std::numeric_limits<uint32_t>::max() / 1000.0 as a C-string
+    static constexpr std::string_view MAX= "4294967.295";
     using Optional_field::operator=;
     operator uint32_t() override
     {
       return is_default() ? ::master_heartbeat_period.value_or(
-        MY_MIN(slave_net_timeout*500ULL, SLAVE_MAX_HEARTBEAT_PERIOD)
+        MY_MIN(slave_net_timeout*500ULL, std::numeric_limits<uint32_t>::max())
       ) : *(Optional_field<uint32_t>::optional);
     }
+    /** Load from a `DECIMAL(10,3)`
+      @param out_warning This is overwritten with a MariaDB error code -
+        whose message has no additional parameters - on *and only on* warning.
+    */
+    // TODO might have to be a static helper callable from the lexer, instead of error on parser
+    bool load_from(const decimal_t &decimal, uint &out_warning)
+    {
+      /*
+        (The ideal use would work with `double`s, including the `*1000` step,
+         but disappointingly, the double interfaces of @ref decimal_t are
+         implemented by printing into a string and parsing that char array.
+      */
+      static const struct Decimal_from_str: my_decimal
+      {
+        Decimal_from_str(const std::string_view &string): my_decimal()
+        {
+          const char *end= string.end();
+          [[maybe_unused]] int unexpected_error= str2my_decimal(
+            E_DEC_ERROR, string.begin(), this, const_cast<char **>(&end));
+          DBUG_ASSERT(!unexpected_error && !*end);
+        }
+      } MAX_PERIOD= MAX, THOUSAND= std::string_view(STRING_WITH_LEN("1000"));
+      ulonglong decimal_out;
+      if (decimal.sign || decimal_cmp(&MAX_PERIOD, &decimal) < 0)
+        return (out_warning= ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE);
+      bool overprecise= decimal.frac > 3;
+      // decomposed from my_decimal2int() to reduce a bit of computations
+      auto rounded= my_decimal(), product= my_decimal();
+      [[maybe_unused]] int unexpected_error=
+        decimal_round(&decimal, &rounded, 3, HALF_UP) |
+        decimal_mul(&rounded, &THOUSAND, &product) |
+        decimal2ulonglong(&product, &decimal_out);
+      DBUG_ASSERT(!unexpected_error);
+      operator=(static_cast<uint32_t>(decimal_out));
+      if (unlikely(decimal_out > slave_net_timeout*1000ULL))
+        out_warning= ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MAX;
+      else if (unlikely(!decimal_out && overprecise))
+        out_warning= ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE_MIN;
+      return false;
+    }
     bool load_from(IO_CACHE *file) override
     {
-      /// Read in floating point first to validate the range
-      double seconds;
+      [[maybe_unused]] uint ignored_warning;
       /**
         Number of chars Optional_int_field::load_from() uses plus
         1 for the decimal point; truncate the excess precision,
@@ -418,20 +463,10 @@ struct Master_info_file: Info_file
       size_t length= my_b_gets(file, buf, sizeof(buf));
       if (!length)
         return true;
-#if defined(__clang__) ? _LIBCPP_VERSION < 200000 :\
-    defined(__GNUC__) && __GNUC__ < 11
-      // 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 != Int_IO_CACHE::ERRC_OK || *(result.ptr)
-#endif
-            != '\n' || seconds < 0 || seconds > SLAVE_MAX_HEARTBEAT_PERIOD)
-        return true;
-      operator=(static_cast<uint32_t>(seconds * 1000));
-      return false;
+      char *end= &(buf[length]);
+      auto decimal= my_decimal();
+      return str2my_decimal(E_DEC_ERROR, buf, &decimal, &end) || *end != '\n' ||
+             load_from(decimal, ignored_warning);
     }
     /**
       This method is engineered (that is, hard-coded) to take
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
@@ -8482,11 +8482,11 @@ ER_SLAVE_HEARTBEAT_FAILURE
         spa "Datos inesperados de latido (heartbeat) de maestro (master): %s"
         sw "Data isiyotarajiwa ya mapigo ya moyo ya bwana: %s"
 ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
-        chi "心跳周期的请求值是负的或超过允许的最大值（%u秒）"
-        eng "The requested value for the heartbeat period is either negative or exceeds the maximum allowed (%u seconds)"
-        geo "გულისცემის პერიოდის მოთოხვნილი მნიშვნელობა ან უარყოფითა, ან მაქსიმალურ დაშვებულ მნიშვნელობას (%u წამი) აჭარბებს"
-        spa "El valor requerido para el período de latido o es negativo o excede al máximo permitido (%u segundos)"
-        sw "Thamani iliyoombwa kwa kipindi cha mpigo wa moyo ni hasi au inazidi kiwango cha juu kinachoruhusiwa (sekunde %u)"
+        chi "心跳周期的请求值是负的或超过允许的最大值（%s秒）"
+        eng "The requested value for the heartbeat period is either negative or exceeds the maximum allowed (%s seconds)"
+        geo "გულისცემის პერიოდის მოთოხვნილი მნიშვნელობა ან უარყოფითა, ან მაქსიმალურ დაშვებულ მნიშვნელობას (%s წამი) აჭარბებს"
+        spa "El valor requerido para el período de latido o es negativo o excede al máximo permitido (%s segundos)"
+        sw "Thamani iliyoombwa kwa kipindi cha mpigo wa moyo ni hasi au inazidi kiwango cha juu kinachoruhusiwa (sekunde %s)"
 ER_UNUSED_14
         eng "You should never see it"
         geo "ამას ვერ უნდა ხედავდეთ"
diff --git a/sql/slave.cc b/sql/slave.cc
@@ -1905,13 +1905,11 @@ when it try to get the value of TIME_ZONE global variable from master.";
 
   if (heartbeat_period)
   {
-    const char query_format[]= "SET @master_heartbeat_period= %llu";
-    char query[sizeof(query_format) + 32];
-    /* 
-       the period is an ulonglong of nano-secs. 
-    */
-    my_snprintf(query, sizeof(query), query_format,
-                heartbeat_period*1'000'000ULL);
+    // The user variable is in nanoseconds
+    static const char query_format[]=
+      "SET @master_heartbeat_period= %" PRIu32 "000""000";
+    char query[sizeof(query_format) + Int_IO_CACHE::BUF_SIZE<uint32_t>];
+    my_snprintf(query, sizeof(query), query_format, heartbeat_period);
 
     DBUG_EXECUTE_IF("simulate_slave_heartbeat_network_error",
                     { static ulong dbug_count= 0;
diff --git a/sql/sql_const.h b/sql/sql_const.h
@@ -33,8 +33,6 @@
 #define MAX_SYS_VAR_LENGTH 32
 #define MAX_KEY MAX_INDEXES                     /* Max used keys */
 #define MAX_REF_PARTS 32			/* Max parts used as ref */
-/// @return std::numeric_limits<uint32_t>::max() / 1000
-#define SLAVE_MAX_HEARTBEAT_PERIOD 4294967
 
 /*
   Maximum length of the data part of an index lookup key.
diff --git a/sql/sql_lex.h b/sql/sql_lex.h
@@ -369,7 +369,8 @@ struct LEX_MASTER_INFO
   ulong server_id;
   uint port, connect_retry;
   ulong retry_count;
-  double heartbeat_period;
+  my_decimal heartbeat_period;
+  my_decimal *heartbeat_opt;
   int sql_delay;
   bool is_demotion_opt;
   bool is_until_before_gtids;
@@ -380,22 +381,24 @@ struct LEX_MASTER_INFO
     changed variable or if it should be left at old value
    */
   enum {LEX_MI_UNCHANGED= 0, LEX_MI_DISABLE, LEX_MI_ENABLE}
-    ssl, ssl_verify_server_cert, heartbeat_opt, repl_ignore_server_ids_opt,
+    ssl, ssl_verify_server_cert, repl_ignore_server_ids_opt,
     repl_do_domain_ids_opt, repl_ignore_domain_ids_opt;
   enum {
     LEX_GTID_UNCHANGED, LEX_GTID_NO, LEX_GTID_CURRENT_POS, LEX_GTID_SLAVE_POS
   } use_gtid_opt;
 
   void init()
   {
-    bzero(this, sizeof(*this));
+    reset(false);
+    connection_name= null_clex_str;
+    heartbeat_period.init();
+    show_all_slaves= false;
     my_init_dynamic_array(PSI_INSTRUMENT_ME, &repl_ignore_server_ids,
                           sizeof(::server_id), 0, 16, MYF(0));
     my_init_dynamic_array(PSI_INSTRUMENT_ME, &repl_do_domain_ids,
                           sizeof(ulong), 0, 16, MYF(0));
     my_init_dynamic_array(PSI_INSTRUMENT_ME, &repl_ignore_domain_ids,
                           sizeof(ulong), 0, 16, MYF(0));
-    sql_delay= -1;
   }
   void reset(bool is_change_master)
   {
@@ -410,8 +413,8 @@ struct LEX_MASTER_INFO
     host= user= password= log_file_name= ssl_key= ssl_cert= ssl_ca=
       ssl_capath= ssl_cipher= ssl_crl= ssl_crlpath= relay_log_name= NULL;
     pos= relay_log_pos= server_id= retry_count= port= connect_retry= 0;
-    heartbeat_period= 0;
-    ssl= ssl_verify_server_cert= heartbeat_opt=
+    heartbeat_opt= nullptr;
+    ssl= ssl_verify_server_cert=
       repl_ignore_server_ids_opt= repl_do_domain_ids_opt=
       repl_ignore_domain_ids_opt= LEX_MI_UNCHANGED;
     gtid_pos_str= null_clex_str;
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc
@@ -4064,9 +4064,20 @@ bool change_master(THD* thd, Master_info* mi, bool *master_info_added)
     mi->retry_count= lex_mi->retry_count;
     mi->connects_tried= 0;
   }
-  if (lex_mi->heartbeat_opt != LEX_MASTER_INFO::LEX_MI_UNCHANGED)
-    mi->master_heartbeat_period=
-      static_cast<uint32_t>(lex_mi->heartbeat_period * 1000);
+  if (lex_mi->heartbeat_opt)
+  {
+    uint warning= 0;
+    ret= mi->master_heartbeat_period.load_from(*lex_mi->heartbeat_opt, warning);
+    if (ret)
+    {
+      my_error(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE, MYF(0),
+               Master_info_file::Heartbeat_period_field::MAX.data());
+      goto err;
+    }
+    if (warning)
+      push_warning(thd, Sql_condition::WARN_LEVEL_WARN,
+                   warning, ER_THD(thd, warning));
+  }
   mi->received_heartbeats= 0; // counter lives until master is CHANGEd
 
   /*
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ namespace Int_IO_CACHE`
`51`	`51`	`if (!length) // EOF`
`52`	`52`	`return true;`
`53`	`53`	// SFINAE if `I` is not a numeric type
`54`		`- std::from_chars_result result= std::from_chars(buf, &buf[length], value);`
	`54`	`+ std::from_chars_result result= std::from_chars(buf, &(buf[length]), value);`
`55`	`55`	// Return `true` if the conversion failed or if the number ended early
`56`	`56`	`return result.ec != ERRC_OK \|\| *(result.ptr) != '\n';`
`57`	`57`	`}`