diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 08:56:11 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 08:56:11 +0300 |
| commit | 56b03e308fb4c0feee166ddf6a707d855affa3c3 (patch) | |
| tree | fc4e16093800cf4cbf1cc54fceb0b7280c4212ba /sql/rpl_rli.h | |
| parent | 4f40f87c48a9ee252f797b5d760a6b6f07cc3815 (diff) | |
| parent | a346a5613ee7c0b17b0b4ce377659c996ef6bb75 (diff) | |
| download | mariadb-git-56b03e308fb4c0feee166ddf6a707d855affa3c3.tar.gz | |
Merge tag 'mariadb-10.0.32' into 10.0-galera
Diffstat (limited to 'sql/rpl_rli.h')
| -rw-r--r-- | sql/rpl_rli.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/rpl_rli.h b/sql/rpl_rli.h index 7fc41786957..e3f8e10a705 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 @@ -176,7 +177,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 |