diff options
author | Andrei Elkin <aelkin@mysql.com> | 2009-11-10 20:45:15 +0200 |
---|---|---|
committer | Andrei Elkin <aelkin@mysql.com> | 2009-11-10 20:45:15 +0200 |
commit | 7eb789a723582a503e6c7b18afee5b92d39dbbd5 (patch) | |
tree | 4673f5dde3aac3f1173eb33cbd96a67269d48499 /mysql-test/t/disabled.def | |
parent | 19c380aaff1f1f3c0d21ac0c18904c21d7bdce76 (diff) | |
parent | 3c1e1f6d6c7caa8916a03ac9594ff950e6b380e3 (diff) | |
download | mariadb-git-7eb789a723582a503e6c7b18afee5b92d39dbbd5.tar.gz |
merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade fail and are under treatment
Diffstat (limited to 'mysql-test/t/disabled.def')
-rw-r--r-- | mysql-test/t/disabled.def | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 6d8f0af0c28..6f0b1716d38 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -12,3 +12,5 @@ kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild. innodb_bug39438 : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently" query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically +partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes +partition_innodb_plugin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes |