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

Merged mysql-5.6-test-fixes and resolved conflicts

Browse Source
This commit is contained in:
Brian Fraser
2012-12-19 13:47:54 -03:00
parent 8b2f6bbd14 ea526799d3
commit 42484ecd10
41 changed files with 1231 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bin/pt-upgrade
View File

@@ -11980,13 +11980,23 @@ sub main {
# ########################################################################
# Do the version-check
# ########################################################################
if ( $o->get('version-check') ne 'off' && (!$o->has('quiet') || !$o->get('quiet')) ) {
if ( $o->get('version-check') ne 'off'
&& (!$o->has('quiet') || !$o->get('quiet')) ) {
Pingback::version_check(
instances => [ map({ +{ dbh => $_->{dbh}, dsn => $_->{dsn} } } @$hosts) ],
protocol => $o->get('version-check'),
);
}
# ########################################################################
# Disable the query cache.
# ########################################################################
if ( $o->get('disable-query-cache') ) {
foreach my $host ( @$hosts ) {
disable_query_cache($host);
}
}
# ########################################################################
# Short version: do it! Long version: this callback does the main work.
# The big picture is:
@@ -12385,6 +12395,31 @@ sub get_cxn {
return $dbh;
}
sub disable_query_cache {
my ($host) = @_;
die "I need a host argument" unless $host;
my ($dbh, $host_name) = @{$host}{qw(dbh name)};
my $sql = 'SELECT @@query_cache_type';
PTDEBUG && _d($host_name, $sql);
my ($query_cache_type) = $dbh->selectrow_array($sql);
PTDEBUG && _d($host_name, $query_cache_type);
return if ($query_cache_type || '') =~ m/OFF|0/;
$sql = q/SET SESSION query_cache_type = OFF/;
eval {
PTDEBUG && _d($host_name, $sql);
$dbh->do($sql);
};
if ( $EVAL_ERROR ) {
warn $EVAL_ERROR;
die "Failed to $sql on $host_name. Disable the query cache "
. "manually, or specify --no-disable-query-cache.\n";
}
return;
}
# Catches signals so we can exit gracefully.
sub sig_int {
my ( $signal ) = @_;
@@ -12693,6 +12728,12 @@ C<SELECT col FROM tbl WHERE id=1>.
Fork to the background and detach from the shell. POSIX
operating systems only.
=item --[no]disable-query-cache
default: yes
C<SET SESSION query_cache_type = OFF> to disable the query cache.
=item --explain-hosts
Print connection information and exit.
@@ -12861,7 +12902,7 @@ interrupt with CTRL-C).
=item --set-vars
type: string; default: wait_timeout=10000,query_cache_type=0
type: string; default: wait_timeout=10000
Set these MySQL variables. Immediately after connecting to MySQL, this
string will be appended to SET and executed.