summaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2013-04-04 06:55:18 +0200
committerByron Jones <bjones@mozilla.com>2013-04-04 06:55:18 +0200
commita99582f977670f776f3eaf587db0107407738722 (patch)
tree76e10c0877e43f80a24e8721ddcbddbdd26b421b /Bugzilla
parentc62be4691146572b582dab517d44e4e40bc8abfc (diff)
parent28d7936f7c35e7bd795a44283332840a0e32a1aa (diff)
downloadbugzilla-a99582f977670f776f3eaf587db0107407738722.tar.gz
bugzilla-a99582f977670f776f3eaf587db0107407738722.tar.xz
merge with bugzilla/4.2
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/DB/Mysql.pm5
-rw-r--r--Bugzilla/Install/Requirements.pm20
2 files changed, 2 insertions, 23 deletions
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');
}
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";