Merged mysql-5.6-test-fixes and resolved conflicts

This commit is contained in:
Brian Fraser
2012-12-19 13:47:54 -03:00
41 changed files with 1231 additions and 193 deletions

View File

@@ -3239,9 +3239,16 @@ sub table_is_allowed {
my $filter = $self->{filters};
if ( $db eq 'mysql' && ($tbl eq 'general_log' || $tbl eq 'slow_log') ) {
return 0;
}
return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
general_log
|slow_log
|innodb_index_stats
|innodb_table_stats
|ndb_binlog_index
|slave_master_info
|slave_relay_log_info
|slave_worker_info
)$/x;
if ( $filter->{'ignore-tables'}->{$tbl}
&& ($filter->{'ignore-tables'}->{$tbl} eq '*'