summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.h
diff options
context:
space:
mode:
authorunknown <knielsen@knielsen-hq.org>2013-02-19 11:45:29 +0100
committerunknown <knielsen@knielsen-hq.org>2013-02-19 11:45:29 +0100
commitbfec9c64b8a6e25c1c0da3e219a2f083b31bb9f4 (patch)
treefacb759a7c6bcb155ec058169e9ef7fed7a05c3b /sql/rpl_rli.h
parentff8676e0e1f9665a92f44ef7685a7221a451ddc3 (diff)
downloadmariadb-git-bfec9c64b8a6e25c1c0da3e219a2f083b31bb9f4.tar.gz
MDEV-26: Global transaction ID, intermediate commit.
- Fix that slave GTID state was updated from the wrong place in the code, causing random crashing and other misery. - Fix updates to mysql.rpl_slave_state to not go to binlog (this would cause duplicate key errors on the slave and is generally the wrong thing to do).
Diffstat (limited to 'sql/rpl_rli.h')
-rw-r--r--sql/rpl_rli.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index 0bcaaa37a59..414baf9b762 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -453,7 +453,7 @@ public:
the <code>Seconds_behind_master</code> field.
*/
void stmt_done(my_off_t event_log_pos,
- time_t event_creation_time);
+ time_t event_creation_time, THD *thd);
/**