diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-21 14:40:52 +0100 |
| commit | 93ac7ae70ff000353538f732899b421a3f2ea7ce (patch) | |
| tree | 819b5ca057d80b42699de219c982b7924857c406 /plugin | |
| parent | 4932aba921755cfbc351b92c67068a5c48d3922b (diff) | |
| parent | a40de1bdeb218d66d5cc737758a4bab1b06f255d (diff) | |
| download | mariadb-git-93ac7ae70ff000353538f732899b421a3f2ea7ce.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/suite.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index b6f48cd18a0..248d56e8d76 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -11,4 +11,4 @@ MYSQL_ADD_PLUGIN(aws_key_management IF(TARGET aws_key_management) USE_AWS_SDK_LIBS(aws_key_management kms) -ENDIF()
\ No newline at end of file +ENDIF() diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm index 2adc6811f3f..a095dace6cb 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm +++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm @@ -32,10 +32,12 @@ push @::global_suppressions, qr(WSREP: Failed to send state UUID:.*), qr(WSREP: wsrep_sst_receive_address.*), qr(WSREP: Could not open saved state file for reading: .*), + qr(WSREP: Could not open state file for reading: .*), 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.), + qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|, ); |