diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-06-15 15:27:11 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-06-15 15:27:11 +0400 |
| commit | 765347384af7fd3393ad37567a612d93ed8b3d92 (patch) | |
| tree | a2c0a08596142312ec38f33e4e02f353a2730fe1 /sql/rpl_gtid.cc | |
| parent | 3b1921c714fcb4415cea9058408fb5a626e93b62 (diff) | |
| parent | e813fe862226554cfe31754b3dfeafbb2b9a7159 (diff) | |
| download | mariadb-git-765347384af7fd3393ad37567a612d93ed8b3d92.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/rpl_gtid.cc')
| -rw-r--r-- | sql/rpl_gtid.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc index a2617de2757..c385434e41e 100644 --- a/sql/rpl_gtid.cc +++ b/sql/rpl_gtid.cc @@ -2045,7 +2045,7 @@ 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); - /* Deliberate fall through. */ + /* fall through */ case 0: status_var_add(thd->status_var.master_gtid_wait_time, microsecond_interval_timer() - before); |