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

Merge pull request #110 from percona/BUG-1517155

Browse Source 
BUG-1517155 Added --create-table-engine param to pt-heartbeat
This commit is contained in:
Carlos Salguero
2016-07-07 13:00:29 -03:00
committed by GitHub
parent 642ac72d6a 5c42d84c95
commit b3af1b6d91
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/pt-heartbeat
View File

@@ -5821,7 +5821,16 @@ sub main {
my $sql = $o->read_para_after(__FILE__, qr/MAGIC_create_heartbeat/);
$sql =~ s/heartbeat/IF NOT EXISTS $db_tbl/;
PTDEBUG && _d($sql);
$dbh->do($sql);
if ($o->get('create-table-engine')) {
my $engine = $o->get('create-table-engine');
$sql =~ s/;$/ ENGINE=$engine;/;
PTDEBUG && _d("Using engine $engine");
PTDEBUG && _d($sql);
}
eval { $dbh->do($sql); };
if ( $EVAL_ERROR ) {
die "Error creating heartbeat table:". $EVAL_ERROR;
}
# Now we insert first row.
# Some caveats:
@@ -6664,6 +6673,13 @@ The tool automatically detects if the heartbeat table is legacy.
See also L<"MULTI-SLAVE HIERARCHY">.
=item --create-table-engine
type: string
Sets the engine to be used for the heartbeat table.
The default storage engine is InnoDB as of MySQL 5.5.5.
=item --daemonize
Fork to the background and detach from the shell. POSIX operating systems only.

17
t/pt-heartbeat/basics.t
View File

@@ -166,6 +166,23 @@ is(
'--create-table creates heartbeat table'
) or diag($output, Dumper($row));
$master_dbh->do('drop table if exists test.heartbeat');
$sb->wait_for_slaves;
$output = output(
sub { pt_heartbeat::main('-F', $cnf,
qw(--update --run-time 1s --database test --table heartbeat),
qw(--create-table --create-table-engine MEMORY)) },
stderr => 1,
);
$master_dbh->do('use test');
$row = $master_dbh->selectrow_hashref("SHOW TABLE STATUS LIKE 'heartbeat'");
is(
uc($row->{engine}),
'MEMORY',
'--create-table-engine creates heartbeat table using a non-default engine'
) or diag($output, Dumper($row));
# #############################################################################
# Issue 352: Add port to mk-heartbeat --check output
# #############################################################################