Post-merge fixes.
mysql-test/t/disabled.def: disabling new test that was added during null-merge from 5.0 the new test innodb_unsafe_binlog will be re-enabled when the 5.1 snapshot for InnoDB is applied. Disabling test rather than removing files to make future merges easier (removing the files would cause merge conflicts when the files are re-added in the 5.1 snapshot).
This commit is contained in:
parent
a2f4283106
commit
409719cc0a
@ -17,6 +17,7 @@ func_group : Bug #15448
|
||||
func_math : Bug #15448
|
||||
group_min_max : Bug #15448
|
||||
innodb_concurrent : Results are not deterministic, Elliot will fix (BUG#3300)
|
||||
innodb_unsafe_binlog : re-enable with InnoDB 5.1 snapshot containing bug#15650
|
||||
subselect : Bug#15706
|
||||
ps_7ndb : dbug assert in RBR mode when executing test suite
|
||||
rpl_ddl : Bug#15963 SBR does not show "Definer" correctly
|
||||
|
Loading…
x
Reference in New Issue
Block a user