diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-03-31 16:40:29 +0400 |
| commit | f00a314f9a659399eff392c4b635d1c381b9badb (patch) | |
| tree | c64e89699dcc22b4ba3a62f83f21252c486617ce /plugin/wsrep_info | |
| parent | e191833d758e89d282aea2d84126c9ca10036571 (diff) | |
| parent | 2f3d4bd566b5e377fe8a1749c14050b0a0e083d0 (diff) | |
| download | mariadb-git-f00a314f9a659399eff392c4b635d1c381b9badb.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'plugin/wsrep_info')
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/suite.pm | 1 | ||||
| -rw-r--r-- | plugin/wsrep_info/plugin.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm index 7148a9cf057..9f684ae6b0c 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm +++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm @@ -33,6 +33,7 @@ push @::global_suppressions, qr(WSREP: last inactive check more than .* skipping check), qr(WSREP: Gap in state sequence. Need state transfer.), qr(WSREP: Failed to prepare for incremental state transfer: .*), + qr(WSREP: SYNC message from member .* in non-primary configuration. Ignored.), ); diff --git a/plugin/wsrep_info/plugin.cc b/plugin/wsrep_info/plugin.cc index 023011f1d24..ed502d30f88 100644 --- a/plugin/wsrep_info/plugin.cc +++ b/plugin/wsrep_info/plugin.cc @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA */ #ifndef MYSQL_SERVER #define MYSQL_SERVER |