Fix for bug 73249: perl warnings under 5.6.0.

Patch by Chris Yeh <Chris.Yeh@nokia.com>
r= justdave@syndicomm.com

diff --git a/contrib/mysqld-watcher.pl b/contrib/mysqld-watcher.pl
index d867c62c884ec87f6bc0e1cdf913575f812dbae8..29e322771eaa52f39d18d4146fd0dbac91a9585d 100755 (executable)
--- a/contrib/mysqld-watcher.pl
+++ b/contrib/mysqld-watcher.pl
@@ -68,19 +68,6 @@ while ( <STDIN> ) {
     }
 }
 
-# if we found anything, kill the database thread and send mail about it
-#
-if ($LONGEST[6] != 0) {
-
-    system ("/usr/bonsaitools/bin/mysqladmin", "kill", $LONGEST[1]);
-
-    # fire off an email telling the maintainer that we had to kill a thread
-    #
-    sendEmail($mail_from, Param("maintainer"), 
-            "long running MySQL thread killed",
-            join(" ", @LONGEST) . "\n");
-}
-
 # send an email message
 #
 # should perhaps be moved to somewhere more global for use in bugzilla as a 
@@ -100,3 +87,16 @@ sub sendEmail($$$$) {
     close(MTA);
    
 }
+
+# if we found anything, kill the database thread and send mail about it
+#
+if ($LONGEST[6] != 0) {
+
+    system ("/usr/bonsaitools/bin/mysqladmin", "kill", $LONGEST[1]);
+
+    # fire off an email telling the maintainer that we had to kill a thread
+    #
+    sendEmail($mail_from, Param("maintainer"), 
+            "long running MySQL thread killed",
+            join(" ", @LONGEST) . "\n");
+}