diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-08-28 16:58:22 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-08-29 10:44:53 +0200 |
| commit | dfd2e54c7d693a3cead6ea388929aee2b73ae8e5 (patch) | |
| tree | 2c2da49a752b37ce33685f08f2d2557cc68fe415 | |
| parent | 0ba73b4e8506003f65ba607d942a86aa59e618eb (diff) | |
| download | mariadb-git-dfd2e54c7d693a3cead6ea388929aee2b73ae8e5.tar.gz | |
fix static builds
| -rw-r--r-- | mysql-test/suite/plugins/t/compression.combinations | 6 | ||||
| -rw-r--r-- | plugin/provider_bzip2/plugin.c | 2 | ||||
| -rw-r--r-- | plugin/provider_lz4/plugin.c | 2 | ||||
| -rw-r--r-- | plugin/provider_lzma/plugin.c | 2 | ||||
| -rw-r--r-- | plugin/provider_lzo/plugin.c | 2 | ||||
| -rw-r--r-- | plugin/provider_snappy/plugin.c | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/mysql-test/suite/plugins/t/compression.combinations b/mysql-test/suite/plugins/t/compression.combinations index 1a5979f36db..645ca60e5f0 100644 --- a/mysql-test/suite/plugins/t/compression.combinations +++ b/mysql-test/suite/plugins/t/compression.combinations @@ -1,23 +1,29 @@ [innodb-bzip2] innodb plugin-load-add=$PROVIDER_BZIP2_SO +loose-provider-bzip2 [innodb-lz4] innodb plugin-load-add=$PROVIDER_LZ4_SO +loose-provider-lz4 [innodb-lzma] innodb plugin-load-add=$PROVIDER_LZMA_SO +loose-provider-lzma [innodb-lzo] innodb plugin-load-add=$PROVIDER_LZO_SO +loose-provider-lzo [innodb-snappy] innodb plugin-load-add=$PROVIDER_SNAPPY_SO +loose-provider-snappy [mroonga-lz4] plugin-load-add=$HA_MROONGA_SO plugin-load-add=$PROVIDER_LZ4_SO +loose-provider-lz4 diff --git a/plugin/provider_bzip2/plugin.c b/plugin/provider_bzip2/plugin.c index 77e4eebb6d2..23ace048249 100644 --- a/plugin/provider_bzip2/plugin.c +++ b/plugin/provider_bzip2/plugin.c @@ -37,7 +37,7 @@ static int init(void* h) struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; -maria_declare_plugin(bzip2) +maria_declare_plugin(provider_bzip2) { MYSQL_DAEMON_PLUGIN, &info, diff --git a/plugin/provider_lz4/plugin.c b/plugin/provider_lz4/plugin.c index e39f3eba678..9a5fc039c88 100644 --- a/plugin/provider_lz4/plugin.c +++ b/plugin/provider_lz4/plugin.c @@ -32,7 +32,7 @@ static int init(void* h) struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; -maria_declare_plugin(lz4) +maria_declare_plugin(provider_lz4) { MYSQL_DAEMON_PLUGIN, &info, diff --git a/plugin/provider_lzma/plugin.c b/plugin/provider_lzma/plugin.c index af97d1d2a83..6dc334dba17 100644 --- a/plugin/provider_lzma/plugin.c +++ b/plugin/provider_lzma/plugin.c @@ -31,7 +31,7 @@ static int init(void* h) struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; -maria_declare_plugin(lzma) +maria_declare_plugin(provider_lzma) { MYSQL_DAEMON_PLUGIN, &info, diff --git a/plugin/provider_lzo/plugin.c b/plugin/provider_lzo/plugin.c index 9eff5bdd105..c480c36e392 100644 --- a/plugin/provider_lzo/plugin.c +++ b/plugin/provider_lzo/plugin.c @@ -31,7 +31,7 @@ static int init(void* h) struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; -maria_declare_plugin(lzo) +maria_declare_plugin(provider_lzo) { MYSQL_DAEMON_PLUGIN, &info, diff --git a/plugin/provider_snappy/plugin.c b/plugin/provider_snappy/plugin.c index 31abc912f93..8add0ec4db5 100644 --- a/plugin/provider_snappy/plugin.c +++ b/plugin/provider_snappy/plugin.c @@ -34,7 +34,7 @@ static int init(void* h) struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; -maria_declare_plugin(snappy) +maria_declare_plugin(provider_snappy) { MYSQL_DAEMON_PLUGIN, &info, |