Merge bk-internal:/home/bk/mysql-5.1-new

into mysql.com:/usr/local/mysql/mysql-5.1-new

Merge bk-internal:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/mysql/mysql-5.1-new
fdab131b · knielsen@mysql.com · 4a0fe734 · 17ec0394 · fdab131b
Commit fdab131b authored Jan 06, 2006 by knielsen@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

mysql-test/t/disabled.def mysql-test/t/disabled.def +1 -0

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -24,3 +24,4 @@ type_time       : Bug#15805
 #rpl000002       : Bug#15920 Temporary tables are not binlogged in SBR
 ps_7ndb         : Bug#15923 Core dump in RBR mode when executing test suite
 rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly
+mysqlslap       : Bug#16167