Bug 926109 - Bugzilla has suffered an internal error while retrieving many columns at once

1 files changed, 10 insertions, 1 deletions

diff --git a/buglist.cgi b/buglist.cgi
index 9c7281822..6ffbea94f 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -546,7 +546,16 @@ if (defined $params->param('columnlist')) {
     if ($params->param('columnlist') eq "all") {
         # If the value of the CGI parameter is "all", display all columns,
         # but remove the redundant "short_desc" column.
-        @displaycolumns = grep($_ ne 'short_desc', keys(%$columns));
+        # BMO: Skip tracking flag columns when retrieving all columns
+        # MySQL bombs on greater than 61 joins.
+        my @non_tf_columns;
+        foreach my $column (keys %$columns) {
+            next if $column eq 'short_desc';
+            next if ($column =~ /^cf_(blocking|tracking|status)/
+                     && $columns->{$column}->{name} =~ /^COALESCE/);
+            push(@non_tf_columns, $column);
+        }
+        @displaycolumns = @non_tf_columns;
     }
     else {
         @displaycolumns = split(/[ ,]+/, $params->param('columnlist'));