t/lib/SchemaIterator.t: Update the samples and skip the percona_test db when applicable

This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-06-05 16:01:37 -03:00
parent 04d6a51074
commit c4a8a67204
4 changed files with 25 additions and 4 deletions

View File

@@ -183,13 +183,13 @@ SKIP: {
# Ignore some dbs and tbls.
test_so(
filters => ['--ignore-databases', 'mysql,sakila,d1,d3'],
filters => ['--ignore-databases', 'mysql,sakila,d1,d3,percona_test'],
result => "d2.t1 ",
test_name => '--ignore-databases',
);
test_so(
filters => ['--ignore-databases', 'mysql,sakila,d2,d3',
filters => ['--ignore-databases', 'mysql,sakila,d2,d3,percona_test',
'--ignore-tables', 't1,t2'],
result => "d1.t3 ",
test_name => '--ignore-databases and --ignore-tables',
@@ -223,7 +223,7 @@ SKIP: {
);
test_so(
filters => ['--ignore-databases-regex', '(?:^d[23]|mysql|info|sakila)',
filters => ['--ignore-databases-regex', '(?:^d[23]|mysql|info|sakila|percona_test)',
'--ignore-tables-regex', 't[^23]'],
result => "d1.t2 d1.t3 ",
test_name => '--ignore-databases-regex',
@@ -281,7 +281,7 @@ SKIP: {
);
test_so(
filters => ['--ignore-databases', 'mysql,sakila',
filters => ['--ignore-databases', 'mysql,sakila,percona_test',
'--ignore-tables', 'd1.t1'],
result => "d1.t2 d1.t3 d2.t1 ",
test_name => '--ignore-databases and --ignore-tables d1.t1 (issue 806)',

View File

@@ -236,6 +236,13 @@ CREATE TABLE `user` (
PRIMARY KEY (`Host`,`User`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
percona_test.checksums
CREATE TABLE `checksums` (
`db_tbl` varchar(128) NOT NULL,
`checksum` int(10) unsigned NOT NULL,
PRIMARY KEY (`db_tbl`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
sakila.actor
CREATE TABLE `actor` (
`actor_id` smallint(5) unsigned NOT NULL auto_increment,

View File

@@ -305,6 +305,13 @@ CREATE TABLE `user` (
PRIMARY KEY (`Host`,`User`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
percona_test.checksums
CREATE TABLE `checksums` (
`db_tbl` varchar(128) NOT NULL,
`checksum` int(10) unsigned NOT NULL,
PRIMARY KEY (`db_tbl`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1
sakila.actor
CREATE TABLE `actor` (
`actor_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,

View File

@@ -321,6 +321,13 @@ CREATE TABLE `user` (
PRIMARY KEY (`Host`,`User`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
percona_test.checksums
CREATE TABLE `checksums` (
`db_tbl` varchar(128) NOT NULL,
`checksum` int(10) unsigned NOT NULL,
PRIMARY KEY (`db_tbl`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
sakila.actor
CREATE TABLE `actor` (
`actor_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,