add force_and_permanent .cnf files for wrappersbb-10.6-serg-compression-libs

to maintain old behavior when the server was dynamically linked
with a library. A library cannot be unloaded at runtime and
a missing library prevented the server from starting.

10 files changed, 15 insertions, 5 deletions

diff --git a/plugin/wrapper_bzip2/CMakeLists.txt b/plugin/wrapper_bzip2/CMakeLists.txt
index 12076ee37e0..cc4f881e617 100644
--- a/plugin/wrapper_bzip2/CMakeLists.txt
+++ b/plugin/wrapper_bzip2/CMakeLists.txt
@@ -8,5 +8,5 @@ IF (HAVE_BZLIB2_H AND HAVE_BZLIB2_COMPRESS AND HAVE_BZLIB2_DECOMPRESS)
   SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")
 
   MYSQL_ADD_PLUGIN(bzip2_plugin plugin.c MODULE_OUTPUT_NAME bzip2
-    COMPONENT bzip2 LINK_LIBRARIES bz2)
+    COMPONENT bzip2 LINK_LIBRARIES bz2 CONFIG bzip2.cnf)
 ENDIF()
diff --git a/plugin/wrapper_bzip2/bzip2.cnf b/plugin/wrapper_bzip2/bzip2.cnf
new file mode 100644
index 00000000000..bfc19d7851c
--- /dev/null
+++ b/plugin/wrapper_bzip2/bzip2.cnf
@@ -0,0 +1,2 @@
+[server]
+bzip2=force_and_permanent
diff --git a/plugin/wrapper_lz4/CMakeLists.txt b/plugin/wrapper_lz4/CMakeLists.txt
index 6308e08a593..1da6d47f14c 100644
--- a/plugin/wrapper_lz4/CMakeLists.txt
+++ b/plugin/wrapper_lz4/CMakeLists.txt
@@ -7,5 +7,5 @@ IF (HAVE_LZ4_H AND HAVE_LZ4_COMPRESS_DEFAULT)
   SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")
 
   MYSQL_ADD_PLUGIN(lz4_plugin plugin.c MODULE_OUTPUT_NAME lz4
-    COMPONENT lz4 LINK_LIBRARIES lz4)
+    COMPONENT lz4 LINK_LIBRARIES lz4 CONFIG lz4.cnf)
 ENDIF()
diff --git a/plugin/wrapper_lz4/lz4.cnf b/plugin/wrapper_lz4/lz4.cnf
new file mode 100644
index 00000000000..49549c7eef6
--- /dev/null
+++ b/plugin/wrapper_lz4/lz4.cnf
@@ -0,0 +1,2 @@
+[server]
+lz4=force_and_permanent
diff --git a/plugin/wrapper_lzma/CMakeLists.txt b/plugin/wrapper_lzma/CMakeLists.txt
index 82481cfeb50..4ef52166118 100644
--- a/plugin/wrapper_lzma/CMakeLists.txt
+++ b/plugin/wrapper_lzma/CMakeLists.txt
@@ -8,5 +8,5 @@ IF (HAVE_LZMA_DECODE AND HAVE_LZMA_ENCODE AND HAVE_LZMA_H)
   SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")
 
   MYSQL_ADD_PLUGIN(lzma_plugin plugin.c MODULE_OUTPUT_NAME lzma
-    COMPONENT lzma LINK_LIBRARIES lzma)
+    COMPONENT lzma LINK_LIBRARIES lzma CONFIG lzma.cnf)
 ENDIF()
diff --git a/plugin/wrapper_lzma/lzma.cnf b/plugin/wrapper_lzma/lzma.cnf
new file mode 100644
index 00000000000..53cad7f3207
--- /dev/null
+++ b/plugin/wrapper_lzma/lzma.cnf
@@ -0,0 +1,2 @@
+[server]
+lzma=force_and_permanent
diff --git a/plugin/wrapper_lzo/CMakeLists.txt b/plugin/wrapper_lzo/CMakeLists.txt
index 309717cbdeb..e0372a990d6 100644
--- a/plugin/wrapper_lzo/CMakeLists.txt
+++ b/plugin/wrapper_lzo/CMakeLists.txt
@@ -7,5 +7,5 @@ IF (HAVE_LZO_H AND HAVE_LZO_COMPRESS)
   SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")
 
   MYSQL_ADD_PLUGIN(lzo_plugin plugin.c MODULE_OUTPUT_NAME lzo
-    COMPONENT lzo LINK_LIBRARIES lzo2)
+    COMPONENT lzo LINK_LIBRARIES lzo2 CONFIG lzo.cnf)
 ENDIF()
diff --git a/plugin/wrapper_lzo/lzo.cnf b/plugin/wrapper_lzo/lzo.cnf
new file mode 100644
index 00000000000..c7c28d4ae7a
--- /dev/null
+++ b/plugin/wrapper_lzo/lzo.cnf
@@ -0,0 +1,2 @@
+[server]
+lzo=force_and_permanent
diff --git a/plugin/wrapper_snappy/CMakeLists.txt b/plugin/wrapper_snappy/CMakeLists.txt
index 4f511d1d95b..041c2aa325c 100644
--- a/plugin/wrapper_snappy/CMakeLists.txt
+++ b/plugin/wrapper_snappy/CMakeLists.txt
@@ -7,5 +7,5 @@ IF (HAVE_SNAPPY_H AND HAVE_SNAPPY_UNCOMPRESS)
   SET_PROPERTY(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "${dirs}")
 
   MYSQL_ADD_PLUGIN(snappy_plugin plugin.c MODULE_OUTPUT_NAME snappy
-    COMPONENT snappy LINK_LIBRARIES snappy)
+    COMPONENT snappy LINK_LIBRARIES snappy CONFIG snappy.cnf)
 ENDIF()
diff --git a/plugin/wrapper_snappy/snappy.cnf b/plugin/wrapper_snappy/snappy.cnf
new file mode 100644
index 00000000000..da509a118d1
--- /dev/null
+++ b/plugin/wrapper_snappy/snappy.cnf
@@ -0,0 +1,2 @@
+[server]
+snappy=force_and_permanent