diff options
| author | unknown <knielsen@knielsen-hq.org> | 2014-02-10 15:12:17 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2014-02-10 15:12:17 +0100 |
| commit | dd93ec5633c325748118ec8f23028715d1935820 (patch) | |
| tree | 29aa2272a2782792024a4d1fd79b845f72122b96 /sql/log.h | |
| parent | e8193eeb8d90148f1cd46f085c96b2f3e3139d39 (diff) | |
| parent | f3a6f86ec3452b346de513075f72dbd02549a5fb (diff) | |
| download | mariadb-git-dd93ec5633c325748118ec8f23028715d1935820.tar.gz | |
Merge MariaDB 10.0-base to 10.0.
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/log.h b/sql/log.h index d6ae7bbb1bb..2577cc5225a 100644 --- a/sql/log.h +++ b/sql/log.h @@ -471,6 +471,7 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG checkpoint arrives - when all have arrived, RESET MASTER will complete. */ bool reset_master_pending; + ulong mark_xid_done_waiting; /* LOCK_log and LOCK_index are inited by init_pthread_objects() */ mysql_mutex_t LOCK_index; |