From: justdave%syndicomm.com <>
Date: Fri, 1 Jun 2001 15:34:45 +0000 (+0000)
Subject: Fix for bug 73249: perl warnings under 5.6.0.
X-Git-Tag: bugzilla-2.14~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca200b83bb5c0a15cde04399f3364600d5ce57e1;p=thirdparty%2Fbugzilla.git

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 d867c62c88..29e322771e 100755
--- 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");
+}