summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deliveries/my.cnf3
-rw-r--r--ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql4
2 files changed, 3 insertions, 4 deletions
diff --git a/deliveries/my.cnf b/deliveries/my.cnf
index e06a211c..a4c8c3dc 100644
--- a/deliveries/my.cnf
+++ b/deliveries/my.cnf
@@ -180,7 +180,6 @@ quote-names
max_allowed_packet = 16M
[mysql]
-default_character_set = utf8
#no-auto-rehash # faster start of mysql but no tab completion
[isamchk]
@@ -190,4 +189,4 @@ key_buffer = 16M
# * IMPORTANT: Additional settings that can override those from this file!
# The files must end with '.cnf', otherwise they'll be ignored.
#
-#!includedir /etc/mysql/conf.d/ \ No newline at end of file
+#!includedir /etc/mysql/conf.d/
diff --git a/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql b/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql
index 024f067e..7469c60b 100644
--- a/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql
+++ b/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql
@@ -11,14 +11,14 @@
-- -----------------------------------------------------------------------------------------------------------------
set foreign_key_checks=1;
+create database portal;
+
SET GLOBAL character_set_client = utf8;
SET GLOBAL character_set_connection = utf8;
SET GLOBAL character_set_database = utf8;
SET GLOBAL character_set_results = utf8;
SET GLOBAL character_set_server = utf8;
-create database portal;
-
use portal;
-- ------------------ create table section