From 23fe8760712d01a4923eac29e896285dd0bf9e85 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 20 Mar 2013 13:07:04 +0100
Subject: Bug 852560: Bugzilla cannot be installed with MySQL 5.6, because the
 have_innodb variable no longer exists r=glob a=LpSolit

---
 Bugzilla/DB/Mysql.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index fad175eac..9ddb46622 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -325,9 +325,8 @@ sub bz_setup_database {
     # hard to fix later. We do this up here because none of the code below
     # works if InnoDB is off. (Particularly if we've already converted the
     # tables to InnoDB.)
-    my ($innodb_on) = @{$self->selectcol_arrayref(
-        q{SHOW VARIABLES LIKE '%have_innodb%'}, {Columns=>[2]})};
-    if ($innodb_on ne 'YES') {
+    my %engines = @{$self->selectcol_arrayref('SHOW ENGINES', {Columns => [1,2]})};
+    if (!$engines{InnoDB} || $engines{InnoDB} !~ /^(YES|DEFAULT)$/) {
         die install_string('mysql_innodb_disabled');
     }
 
-- 
cgit v1.2.3-24-g4f1b


From 28d7936f7c35e7bd795a44283332840a0e32a1aa Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 26 Mar 2013 12:07:25 +0100
Subject: Bug 854074: Remove all references to the uwinnipeg.ca PPM repository
 as it is no longer available r=glob a=LpSolit

---
 Bugzilla/Install/Requirements.pm | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 39cacedb0..83723b327 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -554,26 +554,6 @@ sub print_module_instructions {
         ( (!$output and @{$check_results->{missing}})
           or ($output and $check_results->{any_missing}) ) ? 1 : 0;
 
-    # We only print the PPM repository note if we have to.
-    my $perl_ver = sprintf('%vd', $^V);
-    if ($need_module_instructions && ON_ACTIVESTATE && vers_cmp($perl_ver, '5.12') < 0) {
-        # URL when running Perl 5.8.x.
-        my $url_to_theory58S = 'http://theoryx5.uwinnipeg.ca/ppms';
-        # Packages for Perl 5.10 are not compatible with Perl 5.8.
-        if (vers_cmp($perl_ver, '5.10') > -1) {
-            $url_to_theory58S = 'http://cpan.uwinnipeg.ca/PPMPackages/10xx/';
-        }
-        print colored(
-            install_string('ppm_repo_add', 
-                           { theory_url => $url_to_theory58S }),
-            COLOR_ERROR);
-
-        # ActivePerls older than revision 819 require an additional command.
-        if (ON_ACTIVESTATE < 819) {
-            print install_string('ppm_repo_up');
-        }
-    }
-
     if ($need_module_instructions or @{ $check_results->{apache} }) {
         # If any output was required, we want to close the "table"
         print "*" x TABLE_WIDTH . "\n";
-- 
cgit v1.2.3-24-g4f1b