From a819fbdb2377f33137d2f8af2312e035195eacff Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Mon, 27 Oct 2014 18:47:17 +0300 Subject: [PATCH] Check innodb in SHOW ENGINES (fix for MariaDB 10) --- Bugzilla/DB/Mysql.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm index 018cac84e..ccc3c37ee 100644 --- a/Bugzilla/DB/Mysql.pm +++ b/Bugzilla/DB/Mysql.pm @@ -331,9 +331,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 ($innodb_on) = grep { lc($_) eq 'innodb' } @{$self->selectcol_arrayref("SHOW ENGINES")}; + if (!$innodb_on) { print <