summaryrefslogtreecommitdiff
path: root/sql/rpl_gtid.cc
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/rpl_gtid.cc
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/rpl_gtid.cc')
-rw-r--r--sql/rpl_gtid.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/rpl_gtid.cc b/sql/rpl_gtid.cc
index 55e2f039562..cdb948f3618 100644
--- a/sql/rpl_gtid.cc
+++ b/sql/rpl_gtid.cc
@@ -881,14 +881,6 @@ rpl_binlog_state::find(uint32 domain_id, uint32 server_id)
}
-slave_connection_state::slave_connection_state()
-{
- my_hash_init(&hash, &my_charset_bin, 32,
- offsetof(rpl_gtid, domain_id), sizeof(uint32), NULL, my_free,
- HASH_UNIQUE);
-}
-
-
uint32
rpl_binlog_state::count()
{
@@ -961,6 +953,14 @@ rpl_binlog_state::get_most_recent_gtid_list(rpl_gtid **list, uint32 *size)
}
+slave_connection_state::slave_connection_state()
+{
+ my_hash_init(&hash, &my_charset_bin, 32,
+ offsetof(rpl_gtid, domain_id), sizeof(uint32), NULL, my_free,
+ HASH_UNIQUE);
+}
+
+
slave_connection_state::~slave_connection_state()
{
my_hash_free(&hash);