diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 15:42:36 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-05-17 15:42:36 +0300 |
| commit | 339a290d220551255f9995372f632d6d65a05e06 (patch) | |
| tree | 4e5e8e53a6417c094058ad3f0ab1951aae28af04 /sql/rpl_mi.cc | |
| parent | b87873b221fffccae622d4d52d9d1219e306a98f (diff) | |
| parent | 934b8312817d4e8e0387fae0bd9cca3ffafbc7de (diff) | |
| download | mariadb-git-339a290d220551255f9995372f632d6d65a05e06.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
Diffstat (limited to 'sql/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index bff0abe8198..bdc88625c0d 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -558,7 +558,7 @@ file '%s')", fname); mi->connect_retry= (uint) connect_retry; mi->ssl= (my_bool) ssl; mi->ssl_verify_server_cert= ssl_verify_server_cert; - mi->heartbeat_period= master_heartbeat_period; + mi->heartbeat_period= MY_MIN(SLAVE_MAX_HEARTBEAT_PERIOD, master_heartbeat_period); } DBUG_PRINT("master_info",("log_file_name: %s position: %ld", mi->master_log_name, @@ -675,8 +675,8 @@ int flush_master_info(Master_info* mi, contents of file). But because of number of lines in the first line of file we don't care about this garbage. */ - char heartbeat_buf[sizeof(mi->heartbeat_period) * 4]; // buffer to suffice always - sprintf(heartbeat_buf, "%.3f", mi->heartbeat_period); + char heartbeat_buf[FLOATING_POINT_BUFFER]; + my_fcvt(mi->heartbeat_period, 3, heartbeat_buf, NULL); my_b_seek(file, 0L); my_b_printf(file, "%u\n%s\n%s\n%s\n%s\n%s\n%d\n%d\n%d\n%s\n%s\n%s\n%s\n%s\n%d\n%s\n%s\n%s\n%s\n%d\n%s\n%s\n" |