diff options
| author | unknown <dlenev@mockturtle.local> | 2007-01-24 19:26:06 +0300 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2007-01-24 19:26:06 +0300 |
| commit | 491ef6af00efd228690a5f8131e6ecc98185705c (patch) | |
| tree | c076d2c719675ee2705ea0bf80abdae4d389738a /mysql-test/t/disabled.def | |
| parent | e57ef96a08b7339a9e6a546fd8a603d98a6aa072 (diff) | |
| parent | 07b6b2f8764c18766c11065f5ac8eea367f60c2c (diff) | |
| download | mariadb-git-491ef6af00efd228690a5f8131e6ecc98185705c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
mysql-test/t/disabled.def:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 8c2c4740f5e..2c525742bc4 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -11,7 +11,7 @@ ############################################################################## user_limits : Bug#23921 random failure of user_limits.test -im_daemon_life_cycle : Bug#24415 see note: [19 Dec 23:17] Trudy Pelzer +# im_daemon_life_cycle : Bug#24415 see note: [19 Dec 23:17] Trudy Pelzer im_options : Bug#20294 2006-07-24 stewart Instance manager test im_options fails randomly concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences ndb_autodiscover : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog |