diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-01 15:51:25 +0200 |
| commit | 5091a4ba755250ed8e35f4f5a39a118d476cd8f1 (patch) | |
| tree | 370ba468d78204544b56e9d967d8d09e1317a1ed /sql/rpl_mi.cc | |
| parent | 84eaf0911f311acba797c265ef7508ab6c108b35 (diff) | |
| parent | 0880284bf715b4916cc735e19b76d1062c2bfdcf (diff) | |
| download | mariadb-git-5091a4ba755250ed8e35f4f5a39a118d476cd8f1.tar.gz | |
Merge tag 'mariadb-10.0.19' into 10.1
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 a56a4e5dc7b..d2b792a259d 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -36,9 +36,9 @@ Master_info::Master_info(LEX_STRING *connection_name_arg, rli(is_slave_recovery), port(MYSQL_PORT), checksum_alg_before_fd(BINLOG_CHECKSUM_ALG_UNDEF), connect_retry(DEFAULT_CONNECT_RETRY), inited(0), abort_slave(0), - slave_running(0), slave_run_id(0), sync_counter(0), - heartbeat_period(0), received_heartbeats(0), master_id(0), - prev_master_id(0), + slave_running(0), slave_run_id(0), clock_diff_with_master(0), + sync_counter(0), heartbeat_period(0), received_heartbeats(0), + master_id(0), prev_master_id(0), using_gtid(USE_GTID_NO), events_queued_since_last_gtid(0), gtid_reconnect_event_skip_count(0), gtid_event_seen(false) { |