summaryrefslogtreecommitdiff
path: root/sql/log.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-03-27 16:06:45 +0100
committerunknown <knielsen@knielsen-hq.org>2013-03-27 16:06:45 +0100
commit0fdbdde4747445cfb0d7fbc2e8fc0e766be70c8b (patch)
tree397683681e50ba0f783f265f2a767efade5f44c3 /sql/log.h
parentcb65cee82a192e8e0fa77dcc7d49cec0d5334ba0 (diff)
downloadmariadb-git-0fdbdde4747445cfb0d7fbc2e8fc0e766be70c8b.tar.gz
MDEV-26: Global transaction ID.
Implement test case rpl_gtid_stop_start.test to test normal stop and restart of master and slave mysqld servers. Fix a couple bugs found with the test: - When InnoDB is disabled (no XA), the binlog state was not read when master mysqld starts. - Remove old code that puts a bogus D-S-0 into the initial binlog state, it is not correct in current design. - Fix memory leak in gtid_find_binlog_file().
Diffstat (limited to 'sql/log.h')
-rw-r--r--sql/log.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.h b/sql/log.h
index 3f49365b2da..c9d3b47e837 100644
--- a/sql/log.h
+++ b/sql/log.h
@@ -507,6 +507,8 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG
*/
uint *sync_period_ptr;
uint sync_counter;
+ /* Protect against reading the binlog state file twice. */
+ bool state_read;
inline uint get_sync_period()
{