Merge from mysql-5.1-security.

aad23e52 · Alexander Nozdrin · 44764cfb · 1490f187 · aad23e52 · aad23e52
Commit aad23e52 authored Nov 24, 2010 by Alexander Nozdrin
Expand all Show whitespace changes
Inline Side-by-side

Showing with 247 additions and 294 deletions

README README +246 -294

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

No files found.
--- a/README
+++ b/README
--- a/mysql-test/suite/binlog/t/disabled.def
+++ b/mysql-test/suite/binlog/t/disabled.def
@@ -11,3 +11,4 @@
 ##############################################################################
 binlog_truncate_innodb	: BUG#57291 2010-10-20 anitha Originally disabled due to BUG#42643. Product bug fixed, but test changes needed
 binlog_spurious_ddl_errors  : BUG#54195 2010-06-03 alik binlog_spurious_ddl_errors.test fails, thus disabled
+binlog_row_failure_mixing_engines : BUG#58416 2010-11-23 ramil Fails on win x86 debug_max