diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-04-04 06:55:18 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-04-04 06:55:18 +0200 |
| commit | a99582f977670f776f3eaf587db0107407738722 (patch) | |
| tree | 76e10c0877e43f80a24e8721ddcbddbdd26b421b /Bugzilla/DB | |
| parent | c62be4691146572b582dab517d44e4e40bc8abfc (diff) | |
| parent | 28d7936f7c35e7bd795a44283332840a0e32a1aa (diff) | |
| download | bugzilla-a99582f977670f776f3eaf587db0107407738722.tar.gz bugzilla-a99582f977670f776f3eaf587db0107407738722.tar.xz | |
merge with bugzilla/4.2
Diffstat (limited to 'Bugzilla/DB')
| -rw-r--r-- | Bugzilla/DB/Mysql.pm | 5 |
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'); } |