From 2ccf81dec1fbe4e215ea47700a4e006420318621 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sun, 15 Mar 2015 13:50:28 +0100
Subject: Bug 902395: Enforce utf8 = true for all installations and remove the
 utf8 parameter r=dkl a=sgreen

---
 Bugzilla/DB/Schema/Mysql.pm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'Bugzilla/DB/Schema/Mysql.pm')

diff --git a/Bugzilla/DB/Schema/Mysql.pm b/Bugzilla/DB/Schema/Mysql.pm
index 1dc408654..db01e971d 100644
--- a/Bugzilla/DB/Schema/Mysql.pm
+++ b/Bugzilla/DB/Schema/Mysql.pm
@@ -148,12 +148,7 @@ sub _get_create_index_ddl {
 
 sub get_create_database_sql {
     my ($self, $name) = @_;
-    # We only create as utf8 if we have no params (meaning we're doing
-    # a new installation) or if the utf8 param is on.
-    my $create_utf8 = Bugzilla->params->{'utf8'} 
-                      || !defined Bugzilla->params->{'utf8'};
-    my $charset = $create_utf8 ? "CHARACTER SET utf8" : '';
-    return ("CREATE DATABASE `$name` $charset");
+    return ("CREATE DATABASE `$name` CHARACTER SET utf8");
 }
 
 # MySQL has a simpler ALTER TABLE syntax than ANSI.
-- 
cgit v1.2.3-24-g4f1b