diff options
| author | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-10-01 15:25:13 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@oracle.com> | 2010-10-01 15:25:13 +0200 |
| commit | 9aa7484cfe9d5255dc9addeca97bc4a93d0d4f71 (patch) | |
| tree | 3718881c83a25f3ce27aa467f1b9605e5071478d /mysql-test/collections | |
| parent | acc1b32675b38738111cd877c5cf172e1e279a96 (diff) | |
| parent | f7d82cd3a2b46042a938ce50c827022abaf9f99a (diff) | |
| download | mariadb-git-9aa7484cfe9d5255dc9addeca97bc4a93d0d4f71.tar.gz | |
merge
Diffstat (limited to 'mysql-test/collections')
| -rw-r--r-- | mysql-test/collections/default.experimental | 2 | ||||
| -rw-r--r-- | mysql-test/collections/default.weekly | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index 45929ab9527..b292356f1c7 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -24,8 +24,6 @@ main.sp @solaris # Bug#47791 2010-01-20 alik Several tes main.type_float @freebsd # Bug#38965 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server main.wait_timeout @solaris # Bug#51244 2010-04-26 alik wait_timeout fails on OpenSolaris -parts.partition_alter4_innodb # Bug#45299 2010-06-28 alik Test "partition_alter4_innodb" is taking too long, timeout - rpl.rpl_heartbeat_basic # BUG#54820 2010-06-26 alik rpl.rpl_heartbeat_basic fails sporadically again rpl.rpl_heartbeat_2slaves # BUG#43828 2009-10-22 luis fails sporadically rpl.rpl_innodb_bug28430* # Bug#46029 diff --git a/mysql-test/collections/default.weekly b/mysql-test/collections/default.weekly index 452a79eacbd..d874c2f4519 100644 --- a/mysql-test/collections/default.weekly +++ b/mysql-test/collections/default.weekly @@ -1 +1,2 @@ -perl mysql-test-run.pl --timer --force --comment=1st --experimental=collections/default.experimental 1st +perl mysql-test-run.pl --timer --force --comment=1st --experimental=collections/default.experimental 1st +perl mysql-test-run.pl --timer --force --comment=big-tests --experimental=collections/default.experimental --vardir=var-big-tests --big-test --testcase-timeout=60 --suite-timeout=600 parts.part_supported_sql_func_innodb parts.partition_alter1_1_2_innodb parts.partition_alter1_1_2_ndb parts.partition_alter1_1_ndb parts.partition_alter1_2_innodb parts.partition_alter1_2_ndb parts.partition_alter2_1_1_innodb parts.partition_alter2_1_2_innodb parts.partition_alter2_2_2_innodb parts.partition_alter4_innodb main.variables-big rpl_ndb.rpl_truncate_7ndb_2 |