diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 20:29:03 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-10-18 20:29:03 +0800 |
| commit | f71b836e500d9d0647d492d597f7b49168af32ee (patch) | |
| tree | c6bca95db8769c27836b2425a2b90cf7053bcc32 /plugin | |
| parent | dab1162b53e25bd1d2510e76b512ba5e1a8c172d (diff) | |
| download | mariadb-git-f71b836e500d9d0647d492d597f7b49168af32ee.tar.gz | |
Postfix of bug#45674
rpl_semi_sync_master_wait_sessions was reset by FLUSH STATUS,
which could cause the master fail to wake up waiting sessions and
result in master timeout waiting for slave reply.
rpl_semi_sync_master_wait_session should not be reset, this
problem is fixed by this patch.
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/semisync/semisync_master_plugin.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugin/semisync/semisync_master_plugin.cc b/plugin/semisync/semisync_master_plugin.cc index d2ef500d932..efcb7172b28 100644 --- a/plugin/semisync/semisync_master_plugin.cc +++ b/plugin/semisync/semisync_master_plugin.cc @@ -278,6 +278,7 @@ Binlog_transmit_observer transmit_observer = { DEF_SHOW_FUNC(status, SHOW_BOOL) DEF_SHOW_FUNC(clients, SHOW_LONG) +DEF_SHOW_FUNC(wait_sessions, SHOW_LONG) DEF_SHOW_FUNC(trx_wait_time, SHOW_LONGLONG) DEF_SHOW_FUNC(trx_wait_num, SHOW_LONGLONG) DEF_SHOW_FUNC(net_wait_time, SHOW_LONGLONG) @@ -301,8 +302,8 @@ static SHOW_VAR semi_sync_master_status_vars[]= { (char*) &rpl_semi_sync_master_no_transactions, SHOW_LONG}, {"Rpl_semi_sync_master_wait_sessions", - (char*) &rpl_semi_sync_master_wait_sessions, - SHOW_LONG}, + (char*) &SHOW_FNAME(wait_sessions), + SHOW_FUNC}, {"Rpl_semi_sync_master_no_times", (char*) &rpl_semi_sync_master_off_times, SHOW_LONG}, |