diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 21:48:47 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 21:48:47 +0100 |
| commit | 4b21cd21fef2763d757aa15681c9c9a7ed5db3c9 (patch) | |
| tree | e9e233392b47f93de12cecce1f7f403ce26057b0 /sql/log.h | |
| parent | 0b049b40124d72d77c008d4441e4db2e77f0f127 (diff) | |
| parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
| download | mariadb-git-4b21cd21fef2763d757aa15681c9c9a7ed5db3c9.tar.gz | |
Merge branch '10.0' into merge-wip
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 762dc5f54f4..390b8c3a046 100644 --- a/sql/log.h +++ b/sql/log.h @@ -475,7 +475,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() */ |