Bug 95426 - remove $onebug cruft. Patch by gerv; 2xr=timeless.

diff --git a/editkeywords.cgi b/editkeywords.cgi
index 51294206dcb11aef5d7ebb2a1d93084dc0d95f1a..1b8d6ef3078258586762bbefbb0d792996f69c47 100755 (executable)
--- a/editkeywords.cgi
+++ b/editkeywords.cgi
@@ -141,22 +141,14 @@ if ($action eq "") {
     my $max_table_size = 50;
 
     SendSQL("SELECT keyworddefs.id, keyworddefs.name, keyworddefs.description,
-                    COUNT(keywords.bug_id), keywords.bug_id
+                    COUNT(keywords.bug_id)
              FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id = keywords.keywordid
              GROUP BY keyworddefs.id
              ORDER BY keyworddefs.name");
     while (MoreSQLData()) {
-        my ($id, $name, $description, $bugs, $onebug) = FetchSQLData();
+        my ($id, $name, $description, $bugs) = FetchSQLData();
         $description ||= "<FONT COLOR=\"red\">missing</FONT>";
         $bugs ||= 'none';
-        if (!$onebug) {
-            # This is silly hackery for old versions of MySQL that seem to
-            # return a count() of 1 even if there are no matching.  So, we 
-            # ask for an actual bug number.  If it can't find any bugs that
-            # match the keyword, then we set the count to be zero, ignoring
-            # what it had responded.
-            $bugs = 'none';
-        }
         if ($line_count == $max_table_size) {
             print "</table>\n$tableheader";
             $line_count = 0;

diff --git a/queryhelp.cgi b/queryhelp.cgi
index 48a4e08552c3249163c50a6a62e111a59048d240..89db7b5cb314f05b26ab96ccd3ccd614d02809b1 100755 (executable)
--- a/queryhelp.cgi
+++ b/queryhelp.cgi
@@ -575,19 +575,14 @@ my $line_count = 0;
 my $max_table_size = 50;
 
 SendSQL("SELECT keyworddefs.name, keyworddefs.description, 
-                COUNT(keywords.bug_id), keywords.bug_id
+                COUNT(keywords.bug_id)
          FROM keyworddefs LEFT JOIN keywords ON keyworddefs.id=keywords.keywordid
          GROUP BY keyworddefs.id
          ORDER BY keyworddefs.name");
 
 while (MoreSQLData()) {
-    my ($name, $description, $bugs, $onebug) = FetchSQLData();
-    if ($bugs && $onebug) {
-        # This 'onebug' stuff is silly hackery for old versions of
-        # MySQL that seem to return a count() of 1 even if there are
-        # no matching.  So, we ask for an actual bug number.  If it
-        # can't find any bugs that match the keyword, then we set the
-        # count to be zero, ignoring what it had responded.
+    my ($name, $description, $bugs) = FetchSQLData();
+    if ($bugs) {
         my $q = url_quote($name);
         $bugs = qq{<A HREF="buglist.cgi?keywords=$q">$bugs</A>};
     } else {