database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-6981: feature request MASTER_GTID_WAIT status variables

Browse Source 
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.
This commit is contained in:
Kristian Nielsen
2015-03-16 14:40:29 +01:00
parent 0e717c5bf4
commit ef4d8db5ec
4 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/rpl_gtid.cc
View File

@@ -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;