diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-16 14:40:29 +0100 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-03-16 14:40:29 +0100 |
| commit | ef4d8db5ece5edfe3574561a8cec70863d390c91 (patch) | |
| tree | f0623f6ac8827339c3243fb72215d02ffd07e9d2 /sql/rpl_gtid.cc | |
| parent | 0e717c5bf424a7411030d625499485a821591830 (diff) | |
| download | mariadb-git-ef4d8db5ece5edfe3574561a8cec70863d390c91.tar.gz | |
MDEV-6981: feature request MASTER_GTID_WAIT status variables
Review fixes:
- Coding style
- Fix bad .result file
- Fix test to be tolerant of different timing.
- Fix test to give better info in case of unexpected timing.
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index 078ec74b263..1dc6a2720ad 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -2011,7 +2011,7 @@ gtid_waiting::wait_for_pos(THD *thd, String *gtid_str, longlong timeout_us) return 1; } status_var_increment(thd->status_var.master_gtid_wait_count); - before = microsecond_interval_timer(); + before= microsecond_interval_timer(); if (timeout_us >= 0) { @@ -2030,8 +2030,10 @@ gtid_waiting::wait_for_pos(THD *thd, String *gtid_str, longlong timeout_us) { case -1: status_var_increment(thd->status_var.master_gtid_wait_timeouts); - case 0: /* deliberate fall through */ - status_var_add(thd->status_var.master_gtid_wait_time, microsecond_interval_timer() - before); + /* Deliberate fall through. */ + case 0: + status_var_add(thd->status_var.master_gtid_wait_time, + microsecond_interval_timer() - before); } my_free(wait_pos); return err; |