diff options
| author | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-08-02 15:27:47 -0400 |
|---|---|---|
| committer | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-08-02 15:27:47 -0400 |
| commit | 9eea112d9dd42e47a6d21869d34169fb58323f0d (patch) | |
| tree | c3c53cd8413b3030c9f2837b374f3db5ad512a70 /mysql-test/t/disabled.def | |
| parent | 21c55af5a103bcd3133c28073a7cd6e09d0521e3 (diff) | |
| parent | ec73a9b0a759478e070da9a7030ac85136fd3e5b (diff) | |
| download | mariadb-git-9eea112d9dd42e47a6d21869d34169fb58323f0d.tar.gz | |
Merge mysql_cab_desk.:C:/source/c++/mysql-5.1
into mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl-merge
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/log_event.cc:
Auto merged
mysql-test/suite/rpl/r/rpl_row_create_table.result:
Merge with 5.1 main.
Diffstat (limited to 'mysql-test/t/disabled.def')
| -rw-r--r-- | mysql-test/t/disabled.def | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index cfee9c5ad00..c5aaa1ee0f5 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -19,9 +19,9 @@ im_instance_conf : Bug#20294 2007-05-30 alik Instance manager tests im_life_cycle : BUG#27851 Instance manager dies on ASSERT in ~Thread_registry() or from not being able to close a mysqld instance. im_instance_conf : BUG#28743 Instance manager generates warnings in test suite im_utils : BUG#28743 Instance manager generates warnings in test suite + concurrent_innodb : BUG#21579 2006-08-11 mleich innodb_concurrent random failures with varying differences ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Double Whopper mysql_upgrade : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage -federated_innodb : Bug#29522 failed assertion in binlog_close_connection() -lowercase_table3 : Bug#29839 2007-07-17 ingo Cannot find table test/T1 from the internal data dictionary +federated_transactions : Bug#29523 Transactions do not work |