diff options
| author | unknown <svoj@june.mysql.com> | 2007-07-17 13:20:32 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-07-17 13:20:32 +0500 |
| commit | 342a894527ef7d4df3fc620c87691cde8317d43f (patch) | |
| tree | 3861d3828815af2f79f0e535f287c633a0bd1695 | |
| parent | a21ff660953cae4c43b8221926a5f302e205c9c8 (diff) | |
| parent | cc533adf9cd6b1325a346c9d5c90ace6487a3ff1 (diff) | |
| download | mariadb-git-342a894527ef7d4df3fc620c87691cde8317d43f.tar.gz | |
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into mysql.com:/home/svoj/devel/mysql/test/mysql-5.1-engines
mysql-test/t/disabled.def:
SCCS merged
| -rw-r--r-- | mysql-test/suite/binlog/t/disabled.def | 14 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/t/disabled.def b/mysql-test/suite/binlog/t/disabled.def new file mode 100644 index 00000000000..76eeb5b00ef --- /dev/null +++ b/mysql-test/suite/binlog/t/disabled.def @@ -0,0 +1,14 @@ +############################################################################## +# +# List the test cases that are to be disabled temporarily. +# +# Separate the test case name and the comment with ':'. +# +# <testcasename> : BUG#<xxxx> <date disabled> <disabler> <comment> +# +# Do not use any TAB characters for whitespace. +# +############################################################################## + +binlog_innodb : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd +binlog_killed : Bug#29806 2007-07-17 ingo master.err: InnoDB: Error: MySQL is freeing a thd diff --git a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def index 6ebbd3a2f46..14102c27c17 100644 --- a/mysql-test/suite/rpl/t/disabled.def +++ b/mysql-test/suite/rpl/t/disabled.def @@ -14,6 +14,7 @@ rpl_ddl : BUG#26418 2007-03-01 mleich Slave out of sync after C rpl_innodb_mixed_ddl : Bug #29363 rpl.rpl_innodb_mixed_* test failures rpl_innodb_mixed_dml : Bug #29363 rpl.rpl_innodb_mixed_* test failures rpl_invoked_features : BUG#29020 2007-06-21 Lars Non-deterministic test case +rpl_auto_increment_11932 : Bug#29809 2007-07-16 ingo Slave SQL errors in warnings file rpl_deadlock_innodb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file rpl_extraCol_innodb : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file rpl_extraCol_myisam : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 17505cc91b7..07c5b4d56a3 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -25,4 +25,4 @@ ctype_big5 : BUG#26711 2007-06-21 Lars Test has never worked on Do 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() -binlog_innodb : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd +lowercase_table3 : Bug#29839 2007-07-17 ingo Cannot find table test/T1 from the internal data dictionary |