diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 14:32:28 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-19 14:32:28 +0100 |
| commit | 510ca9b6973eacf879b94baeb8bbdd84d224c8d6 (patch) | |
| tree | b62dcf29e83e6ae16f13affced5840e15bb414bd /sql/log.h | |
| parent | 73ebabd2eea6db71db2270e855a4af9630306a54 (diff) | |
| download | mariadb-git-510ca9b6973eacf879b94baeb8bbdd84d224c8d6.tar.gz | |
MDEV-7402 'reset master' hangs, waits for signalled COND_xid_list
Using a boolean flag for 'there is a RESET MASTER in progress' doesn't
work very well for multiple concurrent RESET MASTER statements.
Changed to a counter.
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 1bf87733ce2..a93e2e1c0b9 100644 --- a/sql/log.h +++ b/sql/log.h @@ -470,7 +470,7 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG anyway). Instead we should signal COND_xid_list whenever a new binlog checkpoint arrives - when all have arrived, RESET MASTER will complete. */ - bool reset_master_pending; + uint reset_master_pending; ulong mark_xid_done_waiting; /* LOCK_log and LOCK_index are inited by init_pthread_objects() */ |