diff options
| author | Daniel Black <daniel@mariadb.org> | 2021-08-31 14:31:18 +1000 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2021-08-31 14:31:22 +1000 |
| commit | 29e2d4319683807d51d922741520d2c5f4233ca9 (patch) | |
| tree | 27c0744084c9b695e1b5ae8df0fbb88f8bc1d32c | |
| parent | 18de678be485ce50eab10845654b3980b712e4df (diff) | |
| download | mariadb-git-bb-10.7-danielblack-mdev-12933-fixup.tar.gz | |
MDEV-12933: compression chaos - make info staticbb-10.7-danielblack-mdev-12933-fixup
Prevent compile error:
libmariadbd.a(plugin.c.o):/buildbot/amd64-ubuntu-1804-valgrind/build/plugin/provider_lz4/plugin.c:38: multiple definition of `info'
libmariadbd.a(plugin.c.o):/buildbot/amd64-ubuntu-1804-valgrind/build/plugin/provider_snappy/plugin.c:40: first defined here
collect2: error: ld returned 1 exit status
libmysqld/CMakeFiles/libmysqld.dir/build.make:102: recipe for target 'libmysqld/libmariadbd.so.19' failed
CMakeFiles/Makefile2:14235: recipe for target 'libmysqld/CMakeFiles/libmysqld.dir/all' failed
make[2]: *** [libmysqld/libmariadbd.so.19] Error 1
make[1]: *** [libmysqld/CMakeFiles/libmysqld.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....
[ 96%] Building CXX object sql/CMakeFiles/sql.dir/rpl_utility.cc.o
[ 96%] Building CXX object sql/CMakeFiles/sql.dir/rpl_utility_server.cc.o
[ 96%] Building CXX object sql/CMakeFiles/sql.dir/rpl_injector.cc.o
../libmariadbd.a(plugin.c.o):/buildbot/amd64-ubuntu-1804-valgrind/build/plugin/provider_lz4/plugin.c:38: multiple definition of `info'
../libmariadbd.a(plugin.c.o):/buildbot/amd64-ubuntu-1804-valgrind/build/plugin/provider_snappy/plugin.c:40: first defined here
collect2: error: ld returned 1 exit status
| -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 |
5 files changed, 5 insertions, 5 deletions
diff --git a/plugin/provider_bzip2/plugin.c b/plugin/provider_bzip2/plugin.c index 0a585e1e349..92978b7e888 100644 --- a/plugin/provider_bzip2/plugin.c +++ b/plugin/provider_bzip2/plugin.c @@ -40,7 +40,7 @@ static int deinit(void *h) return 1; /* don't unload me */ } -struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; +static struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; maria_declare_plugin(provider_bzip2) { diff --git a/plugin/provider_lz4/plugin.c b/plugin/provider_lz4/plugin.c index 4f76791bcbc..f9eab163d5a 100644 --- a/plugin/provider_lz4/plugin.c +++ b/plugin/provider_lz4/plugin.c @@ -35,7 +35,7 @@ static int deinit(void *h) return 1; /* don't unload me */ } -struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; +static struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; maria_declare_plugin(provider_lz4) { diff --git a/plugin/provider_lzma/plugin.c b/plugin/provider_lzma/plugin.c index c8740ef7f75..0c18471a068 100644 --- a/plugin/provider_lzma/plugin.c +++ b/plugin/provider_lzma/plugin.c @@ -34,7 +34,7 @@ static int deinit(void *h) return 1; /* don't unload me */ } -struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; +static struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; maria_declare_plugin(provider_lzma) { diff --git a/plugin/provider_lzo/plugin.c b/plugin/provider_lzo/plugin.c index 50f5f30b8b4..44c6b54111b 100644 --- a/plugin/provider_lzo/plugin.c +++ b/plugin/provider_lzo/plugin.c @@ -34,7 +34,7 @@ static int deinit(void *h) return 1; /* don't unload me */ } -struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; +static struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; maria_declare_plugin(provider_lzo) { diff --git a/plugin/provider_snappy/plugin.c b/plugin/provider_snappy/plugin.c index d837dc8f569..8af7eb1b0ea 100644 --- a/plugin/provider_snappy/plugin.c +++ b/plugin/provider_snappy/plugin.c @@ -37,7 +37,7 @@ static int deinit(void *h) return 1; /* don't unload me */ } -struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; +static struct st_mysql_daemon info= { MYSQL_DAEMON_INTERFACE_VERSION }; maria_declare_plugin(provider_snappy) { |