From 1caee393076dc642a7d8e1283377b59ef8f52dbd Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 2 Dec 2014 22:25:53 +0100
Subject: [PATCH] disable mroonga temporarily: see MDEV-7246

---
 debian/dist/Debian/mariadb-server-10.1.files.in |  1 -
 debian/dist/Ubuntu/mariadb-server-10.1.files.in |  1 -
 storage/mroonga/CMakeLists.txt                  | 12 ++++--------
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/dist/Debian/mariadb-server-10.1.files.in b/debian/dist/Debian/mariadb-server-10.1.files.in
index 5f752de5441..402bbade712 100644
--- a/debian/dist/Debian/mariadb-server-10.1.files.in
+++ b/debian/dist/Debian/mariadb-server-10.1.files.in
@@ -1,6 +1,5 @@
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
-usr/lib/mysql/plugin/ha_mroonga.so
 usr/lib/mysql/plugin/ha_sequence.so
 usr/lib/mysql/plugin/ha_sphinx.so
 usr/lib/mysql/plugin/ha_innodb.so
diff --git a/debian/dist/Ubuntu/mariadb-server-10.1.files.in b/debian/dist/Ubuntu/mariadb-server-10.1.files.in
index 9856a3d4a5b..36ab7d9e330 100644
--- a/debian/dist/Ubuntu/mariadb-server-10.1.files.in
+++ b/debian/dist/Ubuntu/mariadb-server-10.1.files.in
@@ -1,6 +1,5 @@
 usr/lib/mysql/plugin/auth_pam.so
 usr/lib/mysql/plugin/auth_socket.so
-usr/lib/mysql/plugin/ha_mroonga.so
 usr/lib/mysql/plugin/ha_sequence.so
 usr/lib/mysql/plugin/ha_sphinx.so
 usr/lib/mysql/plugin/ha_innodb.so
diff --git a/storage/mroonga/CMakeLists.txt b/storage/mroonga/CMakeLists.txt
index faad871fa95..0ca1dd4638b 100644
--- a/storage/mroonga/CMakeLists.txt
+++ b/storage/mroonga/CMakeLists.txt
@@ -240,16 +240,12 @@ link_directories(
 
 if(MRN_BUNDLED)
   if(GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED)
-    mysql_add_plugin(mroonga
-      "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
-      STORAGE_ENGINE MODULE_ONLY
-      LINK_LIBRARIES ${GROONGA_LIBRARIES})
+    set(sources "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}")
   else()
-    mysql_add_plugin(mroonga
-      "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}"
-      STORAGE_ENGINE MODULE_ONLY
-      LINK_LIBRARIES ${GROONGA_LIBRARIES})
+    set(sources "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}")
   endif()
+  mysql_add_plugin(mroonga ${sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES ${GROONGA_LIBRARIES}
+    DISABLED)
  else()
 else()
   add_library(mroonga MODULE