From baf36f72baa2095b92b298fd45d9cbb522cdca87 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Mon, 22 Apr 2013 16:18:03 +0800
Subject: Bug 859315: lots of "Lock wait timeout exceeded" errors when updating
 cf_crash_signature

---
 Bugzilla/Bug.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'Bugzilla/Bug.pm')

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 08c347abe..a41da186b 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3845,7 +3845,7 @@ sub GetBugActivity {
                $datepart
                $attachpart
                $suppwhere
-      ORDER BY bugs_activity.bug_when";
+      ORDER BY bugs_activity.bug_when, bugs_activity.id";
 
     my $list = $dbh->selectall_arrayref($query, undef, @args);
 
@@ -3941,13 +3941,11 @@ sub _join_activity_entries {
     # We need to insert characters as these were removed by old
     # LogActivityEntry code.
 
-    if ($current_change eq '') {
-        return $new_change;
-    }
+    return $new_change if $current_change eq '';
 
     # Buglists and see_also need the comma restored
     if ($field eq 'dependson' || $field eq 'blocked' || $field eq 'see_also') {
-        if (substr($new_change, 0, 1) eq ',') {
+        if (substr($new_change, 0, 1) eq ',' || substr($new_change, 0, 1) eq ' ') {
             return $current_change . $new_change;
         } else {
             return $current_change . ', ' . $new_change;
-- 
cgit v1.2.3-24-g4f1b