Fix buildbot failure:

Backport the code that runs cassandra.test only when Cassandra is 
present and running from 10.0 to 10.0-base.

5 files changed, 15 insertions, 11 deletions

diff --git a/mysql-test/include/have_cassandra.inc b/mysql-test/include/have_cassandra.inc
deleted file mode 100644
index d358e2ecc26..00000000000
--- a/mysql-test/include/have_cassandra.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# suite.pm will make sure that all tests including this file
-# will be skipped unless innodb or xtradb is enabled
-#
-# The test below is redundant
-
-if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'cassandra' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
-{
-  --skip Test requires Cassandra.
-}
diff --git a/mysql-test/r/cassandra.result b/mysql-test/suite/plugins/r/cassandra.result
index e26df069f93..e26df069f93 100644
--- a/mysql-test/r/cassandra.result
+++ b/mysql-test/suite/plugins/r/cassandra.result
diff --git a/mysql-test/suite/plugins/suite.pm b/mysql-test/suite/plugins/suite.pm
index 9ada541e44b..a2ac3957af0 100644
--- a/mysql-test/suite/plugins/suite.pm
+++ b/mysql-test/suite/plugins/suite.pm
@@ -1,11 +1,22 @@
 package My::Suite::Plugins;
 
+use My::Platform;
+
 @ISA = qw(My::Suite);
 
+sub cassandra_running() { 
+  return 0 if IS_WINDOWS; 
+  system 'echo show version | cqlsh -3 2>/dev/null >/dev/null'; 
+  return $? == 0; 
+} 
+
 sub skip_combinations {
   my %skip;
   $skip{'t/pam.test'} = 'No pam setup for mtr'
              unless -e '/etc/pam.d/mariadb_mtr';
+  $skip{'t/cassandra.test'} = 'Cassandra is not running'
+             unless cassandra_running();
+  $skip{'t/cassandra_qcache.test'} = $skip{'t/cassandra.test'};
   %skip;
 }
 
diff --git a/mysql-test/include/have_cassandra.opt b/mysql-test/suite/plugins/t/cassandra.opt
index 98a4a081de5..98a4a081de5 100644
--- a/mysql-test/include/have_cassandra.opt
+++ b/mysql-test/suite/plugins/t/cassandra.opt
diff --git a/mysql-test/t/cassandra.test b/mysql-test/suite/plugins/t/cassandra.test
index 2b92956d974..1543993843a 100644
--- a/mysql-test/t/cassandra.test
+++ b/mysql-test/suite/plugins/t/cassandra.test
@@ -1,7 +1,10 @@
 #
 # Tests for cassandra storage engine
 #
---source include/have_cassandra.inc
+if (`SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.ENGINES WHERE engine = 'cassandra' AND support IN ('YES', 'DEFAULT', 'ENABLED')`)
+{
+  --skip Test requires Cassandra.
+}
 
 --disable_warnings
 drop table if exists t0, t1;