Revert most of commit 579282f and re-enable Mroonga

Author: ottok

Diff for: debian/changelog

@@ -4,6 +4,7 @@ mariadb-10.0 (10.0.21-2) UNRELEASED; urgency=low
   * Add CVE IDs to previous changelog entries
   * Pass DEB_BUILD_ARCH to CMake options to enhance buils on some platforms
   * Test suite failures are now fatal on all platforms and not ignored anywhere
+  * Revert most of commit 579282f and re-enable Mroonga
 
  -- Otto Kekäläinen <[email protected]>  Wed, 26 Aug 2015 18:20:54 +0300
 

Diff for: debian/patches/mroonga-disable-switch.patch

@@ -8,6 +8,5 @@ extend_default_test_timeout_for_tokudb.patch
 remove_rename_mariadb-server_files_in.patch
 innodb_simulate_comp_test_speedup.patch
 fix-spelling-errors.patch
-mroonga-disable-switch.patch
 mysqld_multi_confd.patch
 mysqld_multi.server_lsb-header.patch

Diff for: debian/patches/series

@@ -49,11 +49,6 @@ endif
 # See https://lists.launchpad.net/maria-developers/msg08390.html
 CMAKEFLAGS += -DWITHOUT_TOKUDB=true
 
-# Skip Mroonga if arch is not amd64
-ifneq ($(ARCH), amd64)
-    CMAKEFLAGS += -DWITHOUT_MROONGA=true
-endif
-
 # Add support for verbose builds
 MAKEFLAGS += VERBOSE=1