diff options
| -rwxr-xr-x | Bugzilla/Bug.pm | 4 | ||||
| -rwxr-xr-x | checksetup.pl | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index b9206b9a0..e050d2211 100755 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -177,7 +177,7 @@ sub initBug { $dbh->sql_date_format('deadline', '%Y-%m-%d') . " FROM bugs LEFT JOIN votes - USING (bug_id) + ON bugs.bug_id = votes.bug_id INNER JOIN components ON components.id = bugs.component_id INNER JOIN products @@ -1011,7 +1011,7 @@ sub RemoveVotes { "products.votesperuser, products.maxvotesperbug " . "FROM profiles " . "LEFT JOIN votes ON profiles.userid = votes.who " . - "LEFT JOIN bugs USING(bug_id) " . + "LEFT JOIN bugs ON votes.bug_id = bugs.bug_id " . "LEFT JOIN products ON products.id = bugs.product_id " . "WHERE votes.bug_id = ? " . $whopart); $sth->execute($id); diff --git a/checksetup.pl b/checksetup.pl index 3f4a68b78..225a3341e 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -2445,7 +2445,7 @@ if (!($sth->fetchrow_arrayref()->[0])) { $sth = $dbh->prepare( "SELECT longdescs.bug_id, thetext " . "FROM longdescs " . - "LEFT JOIN bugs using(bug_id) " . + "LEFT JOIN bugs ON longdescs.bug_id = bugs.bug_id " . "WHERE (" . $dbh->sql_regexp("thetext", "'[.*.]{3} This bug has been marked as a duplicate of [[:digit:]]+ [.*.]{3}'") . ") " . "AND (resolution = 'DUPLICATE') " . |