summaryrefslogtreecommitdiff
path: root/sql/rpl_rli.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-08-17 11:32:16 +0200
committerSergei Golubchik <serg@mariadb.org>2017-08-17 11:38:34 +0200
commitcb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch)
tree29d130592e3dfea50251771979fbaa6923d44ba9 /sql/rpl_rli.h
parenta4885dde4ccec68bbb0268796f62e68e08ba4837 (diff)
parent48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff)
downloadmariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz
Merge branch '10.1' into 10.2
Diffstat (limited to 'sql/rpl_rli.h')
-rw-r--r--sql/rpl_rli.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h
index 448fc231b2b..d88bc9f6ecd 100644
--- a/sql/rpl_rli.h
+++ b/sql/rpl_rli.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2005, 2012, Oracle and/or its affiliates.
+/* Copyright (c) 2005, 2017, Oracle and/or its affiliates.
+ Copyright (c) 2009, 2017, MariaDB Corporation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -177,7 +178,14 @@ public:
a different log under our feet
*/
uint32 cur_log_old_open_count;
-
+
+ /*
+ If on init_info() call error_on_rli_init_info is true that means
+ that previous call to init_info() terminated with an error, RESET
+ SLAVE must be executed and the problem fixed manually.
+ */
+ bool error_on_rli_init_info;
+
/*
Let's call a group (of events) :
- a transaction