Index: scripts/agent-local/mysql.cnf
===================================================================
--- scripts/agent-local/mysql.cnf	(revision 4735)
+++ scripts/agent-local/mysql.cnf	(working copy)
@@ -11,6 +11,19 @@
   $mysql_user = $mysql_cnf['client']['user'];
   $mysql_pass = $mysql_cnf['client']['password'];
 }
+elseif (file_exists('/root/.my.cnf'))
+{
+  $mysql_cnf = parse_ini_file('/root/.my.cnf', TRUE);
+  $mysql_user = $mysql_cnf['client']['user'];
+  if ($mysql_cnf['client']['password'] != '')
+  {
+  	$mysql_pass = $mysql_cnf['client']['password'];
+  }
+  else
+  {
+  	$mysql_pass = $mysql_cnf['client']['pass'];
+  }
+}
 else
 {
   $mysql_user = '';