diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
| commit | d8ecbbe63471f958aa70443545b63d88d2db0230 (patch) | |
| tree | 32a6f432080d9125b3619f8935eb5b1de00e861d /mysql-test/t/disabled.def | |
| parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
| parent | 6d69089845ed4c50df0ca8136a2cdacb8f2e1380 (diff) | |
| download | mariadb-git-d8ecbbe63471f958aa70443545b63d88d2db0230.tar.gz | |
Merge with MySQL 5.1.42
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()
storage/xtradb/handler/ha_innodb.cc:
Call explain_filename() to get proper names for partitioned tables
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index ad7617b9403..378b810fcbb 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -11,7 +11,5 @@ ############################################################################## kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild. 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 -innodb-autoinc : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference rpl_killed_ddl : Bug#45520: rpl_killed_ddl fails sporadically in pb2 +innodb-autoinc : Bug#49267 2009-12-02 test fails on windows because of different case mode |