bevhost / rpms / mysql-mmm

Forked from rpms/mysql-mmm 6 years ago
Clone
2bf967d
diff -rup mysql-mmm-2.2.1.orig/lib/Agent/Helpers/Network.pm mysql-mmm-2.2.1/lib/Agent/Helpers/Network.pm
2bf967d
--- mysql-mmm-2.2.1.orig/lib/Agent/Helpers/Network.pm	2010-05-07 07:55:50.000000000 +0000
2bf967d
+++ mysql-mmm-2.2.1/lib/Agent/Helpers/Network.pm	2014-12-02 17:02:38.234674563 +0000
2bf967d
@@ -133,7 +133,7 @@ sub send_arp($$) {
2bf967d
 
2bf967d
 	if ($OSNAME eq 'linux' || $OSNAME eq 'freebsd') {
2bf967d
 		my $mac = '';
2bf967d
-		if ($Net::ARP::VERSION < 1.0) {
2bf967d
+		if ($Net::ARP::VERSION =~ /^0/) { # VERSION < 1.0 check that even works for 1.0.8, etc.
2bf967d
 			Net::ARP::get_mac($if, $mac);
2bf967d
 		}
2bf967d
 		else {
2bf967d
diff -rup mysql-mmm-2.2.1.orig/lib/Agent/Helpers.pm mysql-mmm-2.2.1/lib/Agent/Helpers.pm
2bf967d
--- mysql-mmm-2.2.1.orig/lib/Agent/Helpers.pm	2010-05-07 07:55:50.000000000 +0000
2bf967d
+++ mysql-mmm-2.2.1/lib/Agent/Helpers.pm	2014-12-02 00:52:26.454298472 +0000
2bf967d
@@ -168,8 +168,8 @@ sub _execute($$$) {
2bf967d
 	my $config_file		= $main::agent->config_file;
2bf967d
 	$params = '' unless defined($params);
2bf967d
 
2bf967d
-	DEBUG "Executing $path $params";
2bf967d
-	my $res = `$path $config_file $params`;
2bf967d
+	DEBUG "Executing $path $config_file $params";
2bf967d
+	my $res = `$path $config_file $params 2>&1;;
2bf967d
 
2bf967d
 	unless ($return_all) {
2bf967d
 		my @lines = split /\n/, $res;