Merged fix-1062563-1063912-ptc-pxc-bugs

bin/pt-kill

@@ -2475,16 +2475,20 @@ $Data::Dumper::Indent    = 1;
 $Data::Dumper::Sortkeys  = 1;
 $Data::Dumper::Quotekeys = 0;
 
+local $EVAL_ERROR;
+eval {
+   require Quoter;
+};
+
 sub new {
    my ( $class, %args ) = @_;
-   my @required_args = qw(Quoter);
-   foreach my $arg ( @required_args ) {
-      die "I need a $arg argument" unless $args{$arg};
-   }
    my $self = { %args };
+   $self->{Quoter} ||= Quoter->new();
    return bless $self, $class;
 }
 
+sub Quoter { shift->{Quoter} }
+
 sub get_create_table {
    my ( $self, $dbh, $db, $tbl ) = @_;
    die "I need a dbh parameter" unless $dbh;
@@ -4812,21 +4816,6 @@ sub name {
    return $self->{hostname} || $self->{dsn_name} || 'unknown host';
 }
 
-sub is_cluster_node {
-   my ($self) = @_;
-   return $self->{is_cluster_node} if defined $self->{is_cluster_node};
-   
-   my $sql = "SHOW VARIABLES LIKE 'wsrep_on'";
-   PTDEBUG && _d($sql);
-   my $row = $self->{dbh}->selectrow_arrayref($sql);
-   PTDEBUG && _d(defined $row ? @$row : 'undef');
-   $self->{is_cluster_node} = $row && $row->[1]
-                            ? ($row->[1] eq 'ON' || $row->[1] eq '1')
-                            : 0;
-  
-   return $self->{is_cluster_node};
-}
-
 sub DESTROY {
    my ($self) = @_;
    if ( $self->{dbh}