From a3a4ea935541bbe4b44a51d7f808119702e35841 Mon Sep 17 00:00:00 2001 From: Oleksandr Byelkin Date: Thu, 31 Jan 2019 19:28:38 +0100 Subject: postmerge rollbacks and fixes --- plugin/wsrep_info/mysql-test/wsrep_info/suite.pm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugin') diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm index 9f684ae6b0c..cf4d124cb53 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm +++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm @@ -30,10 +30,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\)|, ); -- cgit v1.2.1 From 2de0b57dd15230897fd4cad2872637d202bc3f1c Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 18 Feb 2019 11:12:52 +0100 Subject: Don't build aws_key_management plugin by default --- plugin/aws_key_management/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'plugin') diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 9221b54ef7e..49f6b54a24c 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -22,11 +22,17 @@ MACRO(SKIP_AWS_PLUGIN msg) ENDMACRO() SET(CMAKE_CXX_STANDARD 11) +IF(NOT NOT_FOR_DISTRIBUTION) + SKIP_AWS_PLUGIN("AWS SDK has Apache 2.0 License which is not complatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need this plugin") +ENDIF() + MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc DISABLED COMPONENT aws-key-management) IF(NOT TARGET aws_key_management) RETURN() +ELSE() + SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE) ENDIF() # This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features) -- cgit v1.2.1