From: Dylan Hardison <dylan@hardison.net>
Date: Sun, 21 Jun 2020 14:58:06 +0000 (-0400)
Subject: assume utf8mb4 is always supported
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4397fb565ded254174ccf827a25f8a4fd10864b;p=thirdparty%2Fbugzilla.git

assume utf8mb4 is always supported
---

diff --git a/Bugzilla/DB/Mysql.pm b/Bugzilla/DB/Mysql.pm
index 74feb4c17..f64f778d0 100644
--- a/Bugzilla/DB/Mysql.pm
+++ b/Bugzilla/DB/Mysql.pm
@@ -332,10 +332,7 @@ sub bz_setup_database {
   if ($self->utf8_charset eq 'utf8mb4') {
     my %global = map {@$_}
       @{$self->selectall_arrayref(q(SHOW GLOBAL VARIABLES LIKE 'innodb_%'))};
-    my $utf8mb4_supported
-      = $global{innodb_file_format} eq 'Barracuda'
-      && $global{innodb_file_per_table} eq 'ON'
-      && $global{innodb_large_prefix} eq 'ON';
+    my $utf8mb4_supported = 1;
 
     die install_string('mysql_innodb_settings') unless $utf8mb4_supported;