From 308e61197deec5a4f9f01e86beae67bb463ed2d2 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 20 Mar 2013 13:03:08 +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/DB')

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 78d0908fa..908e12721 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -308,9 +308,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