percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-20 19:04:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes.

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-03 14:51:03 -07:00
parent 696a3b5e68 9569e0d317
commit e8d9781123
12 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/lib/MasterSlave.t
View File

@@ -337,7 +337,7 @@ ok($res->{result} >= 0, 'Wait was successful');
$ms->stop_slave($slaves[0]);
$dbh->do('drop database if exists test'); # Any stmt will do
diag(`(sleep 1; echo "start slave" | /tmp/$port_for{slave0}/use)&`);
diag(`(sleep 3; echo "start slave" | /tmp/$port_for{slave0}/use)&`);
eval {
$res = $ms->wait_for_master(
master_status => $ms->get_master_status($dbh),

4
t/lib/MockSyncStream.t
View File

@@ -78,9 +78,11 @@ is_deeply(
# Test online stuff, e.g. get_cols_and_struct().
# #############################################################################
use DSNParser;
use VersionParser;
use Sandbox;
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $vp = new VersionParser;
my $dbh = $sb->get_dbh_for('master');
SKIP: {
@@ -170,7 +172,7 @@ SKIP: {
id => undef,
i => undef,
f => undef,
d => undef,
d => ($vp->version_ge($dbh, '5.5.1') ? '(7)' : undef),
dt => undef,
ts => undef,
c => '(1)',

7
t/lib/SchemaIterator.t
View File

@@ -130,8 +130,9 @@ SKIP: {
# Test simple, unfiltered get_db_itr().
# ########################################################################
test_so(
result => $sandbox_version ge '5.1' ? "$out/all-dbs-tbls.txt"
: "$out/all-dbs-tbls-5.0.txt",
result => $sandbox_version ge '5.5' ? "$out/all-dbs-tbls.txt"
: $sandbox_version ge '5.1' ? "$out/all-dbs-tbls-5.1.txt"
: "$out/all-dbs-tbls-5.0.txt",
test_name => "Iterate all schema objects with dbh",
);
@@ -190,7 +191,7 @@ SKIP: {
# Filter by engines. This also tests that --engines is case-insensitive
test_so(
filters => ['-d', 'd1,d2,d3', '--engines', 'INNODB'],
result => "d1.t2 ",
result => ($sandbox_version ge '5.5' ? 'd1.t2 d2.t1 ' : "d1.t2 "),
test_name => '--engines',
);

0
t/lib/samples/SchemaIterator/all-dbs-tbls.txt → t/lib/samples/SchemaIterator/all-dbs-tbls-5.1.txt
View File

3
t/lib/samples/SchemaIterator/mysql-user-ddl.txt
View File

@@ -31,6 +31,7 @@ CREATE TABLE `user` (
`Create_user_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
`Event_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
`Trigger_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
`Create_tablespace_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
`ssl_type` enum('','ANY','X509','SPECIFIED') CHARACTER SET utf8 NOT NULL DEFAULT '',
`ssl_cipher` blob NOT NULL,
`x509_issuer` blob NOT NULL,
@@ -39,6 +40,8 @@ CREATE TABLE `user` (
`max_updates` int(11) unsigned NOT NULL DEFAULT '0',
`max_connections` int(11) unsigned NOT NULL DEFAULT '0',
`max_user_connections` int(11) unsigned NOT NULL DEFAULT '0',
`plugin` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
`authentication_string` text COLLATE utf8_bin NOT NULL,
PRIMARY KEY (`Host`,`User`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'