summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2013-03-20 13:07:04 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2013-03-20 13:07:04 +0100
commit23fe8760712d01a4923eac29e896285dd0bf9e85 (patch)
tree2c5b97e945678417fa801a3f6f6359cc9a65f4b3
parentb1f72d1f57828abf8259a5712481315315c860db (diff)
downloadbugzilla-23fe8760712d01a4923eac29e896285dd0bf9e85.tar.gz
bugzilla-23fe8760712d01a4923eac29e896285dd0bf9e85.tar.xz
Bug 852560: Bugzilla cannot be installed with MySQL 5.6, because the have_innodb variable no longer exists
r=glob a=LpSolit
-rw-r--r--Bugzilla/DB/Mysql.pm5
1 files changed, 2 insertions, 3 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');
}