summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-05-17 09:35:35 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-17 09:37:01 +0300
commit66afb5ecb76469cd1eb042cfc45368f2b414b0a1 (patch)
tree8a6cf1f884f1bc67938fabfb821eacdee651f49e
parent4c7608aeb187383f2629e96e085b5b50fc81337f (diff)
downloadmariadb-git-66afb5ecb76469cd1eb042cfc45368f2b414b0a1.tar.gz
MDEV-16172: Enable skipped tests
-rw-r--r--mysql-test/main/alter_table.test4
-rw-r--r--mysql-test/main/partition_innodb.test4
-rw-r--r--mysql-test/suite/handler/innodb.test5
-rw-r--r--mysql-test/suite/innodb/t/innodb_bug13510739.test4
-rw-r--r--mysql-test/suite/innodb/t/tmpdir.test5
-rw-r--r--mysql-test/suite/innodb_fts/r/fulltext2.result1
-rw-r--r--mysql-test/suite/innodb_fts/r/fulltext_var.result1
-rw-r--r--mysql-test/suite/innodb_fts/t/fulltext2.test8
-rw-r--r--mysql-test/suite/innodb_fts/t/fulltext_var.test9
-rw-r--r--mysql-test/suite/rpl/t/rpl_mdev382.test5
10 files changed, 0 insertions, 46 deletions
diff --git a/mysql-test/main/alter_table.test b/mysql-test/main/alter_table.test
index 7f692f36f4e..54fa4ad8c7e 100644
--- a/mysql-test/main/alter_table.test
+++ b/mysql-test/main/alter_table.test
@@ -1,7 +1,3 @@
-if (`select plugin_auth_version < "5.6.26" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB below 5.6.26
-}
--source include/have_innodb.inc
#
# Test of alter table
diff --git a/mysql-test/main/partition_innodb.test b/mysql-test/main/partition_innodb.test
index 7b5a69fe622..49430414913 100644
--- a/mysql-test/main/partition_innodb.test
+++ b/mysql-test/main/partition_innodb.test
@@ -1,7 +1,3 @@
-if (`select plugin_auth_version < "5.6.25" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in InnoDB as of 5.6.24 or earlier
-}
--source include/not_embedded.inc
--source include/have_partition.inc
--source include/have_innodb.inc
diff --git a/mysql-test/suite/handler/innodb.test b/mysql-test/suite/handler/innodb.test
index d752da7dc31..6527c4bb8bb 100644
--- a/mysql-test/suite/handler/innodb.test
+++ b/mysql-test/suite/handler/innodb.test
@@ -9,11 +9,6 @@
# rename t/innodb_handler.test to t/handler_innodb.test
#
-if (`select plugin_auth_version < "5.6.15" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in InnoDB before 5.6.15
-}
-
--source include/have_innodb.inc
let $engine_type= InnoDB;
diff --git a/mysql-test/suite/innodb/t/innodb_bug13510739.test b/mysql-test/suite/innodb/t/innodb_bug13510739.test
index d2193996d68..f10bcd8e272 100644
--- a/mysql-test/suite/innodb/t/innodb_bug13510739.test
+++ b/mysql-test/suite/innodb/t/innodb_bug13510739.test
@@ -2,10 +2,6 @@
# Bug#13510739 63775: SERVER CRASH ON HANDLER READ NEXT AFTER DELETE RECORD.
#
-if (`select plugin_auth_version < "5.6.15" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in InnoDB before 5.6.15
-}
-- source include/have_innodb.inc
CREATE TABLE bug13510739 (c INTEGER NOT NULL, PRIMARY KEY (c)) ENGINE=INNODB;
diff --git a/mysql-test/suite/innodb/t/tmpdir.test b/mysql-test/suite/innodb/t/tmpdir.test
index 98517a97c7a..b43a02363dc 100644
--- a/mysql-test/suite/innodb/t/tmpdir.test
+++ b/mysql-test/suite/innodb/t/tmpdir.test
@@ -1,11 +1,6 @@
--source include/have_innodb.inc
--source include/count_sessions.inc
-if (`select plugin_auth_version <= "5.6.28-MariaDB-76.1" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in XtraDB as of 5.6.28-MariaDB-76.1 or earlier
-}
-
--echo #
--echo # Bug #19183565 CREATE DYNAMIC INNODB_TMPDIR VARIABLE TO CONTROL
--echo # WHERE INNODB WRITES TEMP FILES
diff --git a/mysql-test/suite/innodb_fts/r/fulltext2.result b/mysql-test/suite/innodb_fts/r/fulltext2.result
index 2aa7d2a6754..9376d088244 100644
--- a/mysql-test/suite/innodb_fts/r/fulltext2.result
+++ b/mysql-test/suite/innodb_fts/r/fulltext2.result
@@ -1,4 +1,3 @@
-DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
i int(10) unsigned not null auto_increment primary key,
a varchar(255) not null,
diff --git a/mysql-test/suite/innodb_fts/r/fulltext_var.result b/mysql-test/suite/innodb_fts/r/fulltext_var.result
index 9fe586210c8..ee4ba98d6eb 100644
--- a/mysql-test/suite/innodb_fts/r/fulltext_var.result
+++ b/mysql-test/suite/innodb_fts/r/fulltext_var.result
@@ -1,4 +1,3 @@
-drop table if exists t1;
show variables like "ft\_%";
Variable_name Value
ft_boolean_syntax + -><()~*:""&|
diff --git a/mysql-test/suite/innodb_fts/t/fulltext2.test b/mysql-test/suite/innodb_fts/t/fulltext2.test
index 33b6a7ac88e..1c31bcd0319 100644
--- a/mysql-test/suite/innodb_fts/t/fulltext2.test
+++ b/mysql-test/suite/innodb_fts/t/fulltext2.test
@@ -7,14 +7,6 @@
#
--source include/have_innodb.inc
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-
-if (`select plugin_auth_version <= "5.6.10" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in InnoDB 5.6.10 or earlier
-}
CREATE TABLE t1 (
i int(10) unsigned not null auto_increment primary key,
diff --git a/mysql-test/suite/innodb_fts/t/fulltext_var.test b/mysql-test/suite/innodb_fts/t/fulltext_var.test
index 03eab7e8557..2b94aa58424 100644
--- a/mysql-test/suite/innodb_fts/t/fulltext_var.test
+++ b/mysql-test/suite/innodb_fts/t/fulltext_var.test
@@ -3,15 +3,6 @@
#
--source include/have_innodb.inc
---disable_warnings
-drop table if exists t1;
---enable_warnings
-
-if (`select plugin_auth_version <= "5.6.10" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in InnoDB 5.6.10 or earlier
-}
-
# Save ft_boolean_syntax variable
let $saved_ft_boolean_syntax=`select @@global.ft_boolean_syntax`;
diff --git a/mysql-test/suite/rpl/t/rpl_mdev382.test b/mysql-test/suite/rpl/t/rpl_mdev382.test
index cb67052b47d..3ec877cdb1a 100644
--- a/mysql-test/suite/rpl/t/rpl_mdev382.test
+++ b/mysql-test/suite/rpl/t/rpl_mdev382.test
@@ -2,11 +2,6 @@
--source include/have_binlog_format_statement.inc
--source include/master-slave.inc
-if (`select plugin_auth_version <= "5.6.10" from information_schema.plugins where plugin_name='innodb'`)
-{
- --skip Not fixed in InnoDB 5.6.10 or earlier
-}
-
# MDEV-382: multiple SQL injections in replication code.
# Test previous SQL injection attack against binlog for SAVEPOINT statement.