Revert previous changes tailored for Ubuntu 16.04 compatibility

- Revert "Temporarily remove mariadb-plugin-cassandra and upload to unstable"
  This reverts commit b37654c4.

- Revert "Temporarily disable the test suite due to excessive false positives"
  This reverts commit 62562ed3.

debian/changelog

+mariadb-10.0 (10.0.24-8) UNRELEASED; urgency=low
+
+  * Revert previous changes tailored for Ubuntu 16.04 compatibility.
+
+ -- Otto Kekäläinen <otto@debian.org>  Sun, 24 Apr 2016 20:00:10 +0300
+
 mariadb-10.0 (10.0.24-7) unstable; urgency=low
 
   * Temporarily remove mariadb-plugin-cassandra as Debian FTP bot thinks

debian/control

@@ -352,6 +352,21 @@ Description: Mroonga storage engine for MariaDB
  provides fast CJK-ready full text searching using column store.
  This package contains the Mroonga plugin for MariaDB.
 
+Package: mariadb-plugin-cassandra
+Architecture: any
+Depends: mariadb-server-10.0|mariadb-galera-server-10.0,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: mariadb-server-10.0 (<< ${source:Version})
+Replaces: mariadb-server-10.0 (<< ${source:Version})
+Description: Cassandra storage engine for MariaDB
+ The Cassandra Storage Engine allows access to data in a Cassandra cluster from
+ MariaDB, combining the best of SQL and no-SQL worlds. Cassandra SE (storage
+ engine) makes Cassandra's column family appear as a table in MariaDB that you
+ can insert to, update, and select from. You can write joins against this table,
+ it is possible to join data that's stored in MariaDB with data that's stored in
+ Cassandra.
+
 Package: mariadb-plugin-spider
 Architecture: any
 Depends: mariadb-server-10.0|mariadb-galera-server-10.0,

debian/rules

@@ -100,10 +100,7 @@ override_dh_auto_test:
 	[ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/unstable-tests
 	# Run testsuite
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	# Disable test suite because of too many false positives that we don't have
-	# time to fix in time of the Ubuntu 16.04 release, and as actual fixes must
-	# get in, the test suite with false positives is an unnecessary obstacle.
-	# cd $(BUILDDIR)/mysql-test && ./mtr --force --testcase-timeout=30 --suite-timeout=540 --retry=3 --parallel=$(NUMJOBS) --skip-test-list=unstable-tests  || $(TESTSUITE_FAIL_CMD) ;
+	cd $(BUILDDIR)/mysql-test && ./mtr --force --testcase-timeout=30 --suite-timeout=540 --retry=3 --parallel=$(NUMJOBS) --skip-test-list=unstable-tests  || $(TESTSUITE_FAIL_CMD) ;
 endif
 
 override_dh_auto_install:
@@ -120,7 +117,7 @@ override_dh_auto_install:
 	# If libthrift-dev was available (manually installed, as it is
 	# not in Debian) and ha_cassandra.so was thus built, create package,
 	# otherwise skip it.
-	#[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+14d" debian/control
+	[ -f $(BUILDDIR)/storage/cassandra/ha_cassandra.so ] || sed -i -e "/Package: mariadb-plugin-cassandra/,+14d" debian/control
 
 	# make install
 	cd $(BUILDDIR) && $(MAKE) install DESTDIR=$(TMP)