diff options
| author | unknown <dlenev@mockturtle.local> | 2007-01-24 22:15:14 +0300 |
|---|---|---|
| committer | unknown <dlenev@mockturtle.local> | 2007-01-24 22:15:14 +0300 |
| commit | 5c0216c593566377e2429a54fdab33babc0b70ab (patch) | |
| tree | 1a07081802139fd44ba8239341be50b3dbb98440 | |
| parent | 491ef6af00efd228690a5f8131e6ecc98185705c (diff) | |
| parent | 259a4658228b347fe9e7bd3949e59cd3e6a08140 (diff) | |
| download | mariadb-git-5c0216c593566377e2429a54fdab33babc0b70ab.tar.gz | |
Merge mockturtle.local:/home/dlenev/src/mysql-5.0-merge
into mockturtle.local:/home/dlenev/src/mysql-5.1-merge
mysql-test/t/ps.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
mysql-test/t/disabled.def:
Manual merge.
| -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 2c525742bc4..8c2c4740f5e 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 |