diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2013-03-07 22:25:03 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2013-03-07 22:25:03 +0400 |
| commit | 62222eb5185438ab809e9e3d372457f32aa2b8bf (patch) | |
| tree | 34ccad96bf46036555a4242c0dc092f6ec624c07 /mysql-test/include | |
| parent | 938d47dcdc50ae4f127197ed72fd044b33ea7524 (diff) | |
| download | mariadb-git-62222eb5185438ab809e9e3d372457f32aa2b8bf.tar.gz | |
Fix buildbot failure:
Backport the code that runs cassandra.test only when Cassandra is
present and running from 10.0 to 10.0-base.
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/have_cassandra.inc | 10 | ||||
| -rw-r--r-- | mysql-test/include/have_cassandra.opt | 1 |
2 files changed, 0 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/include/have_cassandra.opt b/mysql-test/include/have_cassandra.opt deleted file mode 100644 index 98a4a081de5..00000000000 --- a/mysql-test/include/have_cassandra.opt +++ /dev/null @@ -1 +0,0 @@ ---plugin-load=$HA_CASSANDRA_SO --loose-cassandra=on |