1 files changed, 9 insertions, 0 deletions
diff --git a/heartbeat.cgi b/heartbeat.cgi
index 0597f1e3a..3edbed371 100755
--- a/heartbeat.cgi
+++ b/heartbeat.cgi
@@ -30,6 +30,15 @@ my $ok = eval {
     die "database not available"            unless $database_ok;
     die "memcached server(s) not available" unless $memcached_ok;
     die "mod_perl not configured?"          unless $ENV{MOD_PERL};
+    if ($dbh->isa('Bugzilla::DB::Mysql') && Bugzilla->params->{utf8} eq 'utf8mb4') {
+        my $mysql_var = $dbh->selectall_hashref(q{SHOW VARIABLES LIKE 'character_set%'}, 'Variable_name');
+        foreach my $name (qw( character_set_client character_set_connection character_set_database )) {
+            my $value = $mysql_var->{$name}{Value};
+            if ($value ne 'utf8mb4') {
+                die "Expected MySQL variable '$name' to be 'utf8mb4', found '$value'";
+            }
+        }
+    }
     1;
 };
 FATAL("heartbeat error: $@") if !$ok && $@;