diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 07:41:35 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 07:41:35 +0200 |
| commit | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (patch) | |
| tree | 75506bd02a8186a013b5eb16a425de0c1d96bc71 /plugin | |
| parent | 7d4b2b984779e695d0c233d11173b2965d25ef27 (diff) | |
| parent | fe449affcf99fcf63f620994b544eb96d2504cda (diff) | |
| download | mariadb-git-b6ebadaa66ee68b1880c0e10669543d1ba058c18.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_gssapi/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | plugin/wsrep_info/mysql-test/wsrep_info/suite.pm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/plugin/auth_gssapi/CMakeLists.txt b/plugin/auth_gssapi/CMakeLists.txt index 1bf727ddf2e..8c82d335ab2 100644 --- a/plugin/auth_gssapi/CMakeLists.txt +++ b/plugin/auth_gssapi/CMakeLists.txt @@ -38,6 +38,7 @@ ELSE() IF(HAVE_KRB5_XFREE) ADD_DEFINITIONS(-DHAVE_KRB5_XFREE=1) ENDIF() + MY_CHECK_AND_SET_COMPILER_FLAG(-Wl,--as-needed) ELSE() # Can't build plugin diff --git a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm index c7d4b0adf5b..48c1bcccd45 100644 --- a/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm +++ b/plugin/wsrep_info/mysql-test/wsrep_info/suite.pm @@ -22,6 +22,4 @@ push @::global_suppressions, qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|, ); -sub is_default { 1 } - bless { }; |