diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-04-22 10:18:03 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-04-22 10:18:03 +0200 |
| commit | baf36f72baa2095b92b298fd45d9cbb522cdca87 (patch) | |
| tree | c4f478fb058ea6b92094cd6a6a85bedfe09d7d04 | |
| parent | d6c95940eb4a0e7dc66725d29b099fc75f17fa23 (diff) | |
| download | bugzilla-baf36f72baa2095b92b298fd45d9cbb522cdca87.tar.gz bugzilla-baf36f72baa2095b92b298fd45d9cbb522cdca87.tar.xz | |
Bug 859315: lots of "Lock wait timeout exceeded" errors when updating cf_crash_signature
| -rw-r--r-- | Bugzilla/Bug.pm | 8 | ||||
| -rw-r--r-- | Bugzilla/Util.pm | 6 |
2 files changed, 6 insertions, 8 deletions
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; diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm index e8d1438f3..e12882215 100644 --- a/Bugzilla/Util.pm +++ b/Bugzilla/Util.pm @@ -477,11 +477,11 @@ sub find_wrap_point { if (!$string) { return 0 } if (length($string) < $maxpos) { return length($string) } my $wrappoint = rindex($string, ",", $maxpos); # look for comma - if ($wrappoint < 0) { # can't find comma + if ($wrappoint <= 0) { # can't find comma $wrappoint = rindex($string, " ", $maxpos); # look for space - if ($wrappoint < 0) { # can't find space + if ($wrappoint <= 0) { # can't find space $wrappoint = rindex($string, "-", $maxpos); # look for hyphen - if ($wrappoint < 0) { # can't find hyphen + if ($wrappoint <= 0) { # can't find hyphen $wrappoint = $maxpos; # just truncate it } else { $wrappoint++; # leave hyphen on the left side |