Merge "Change default character to utf8 for portal db"

diff --git a/deliveries/my.cnf b/deliveries/my.cnf
index 9734067..e06a211 100644 (file)
--- a/deliveries/my.cnf
+++ b/deliveries/my.cnf
@@ -180,6 +180,7 @@ quote-names
 max_allowed_packet      = 16M
 
 [mysql]
+default_character_set = utf8
 #no-auto-rehash # faster start of mysql but no tab completion
 
 [isamchk]

diff --git a/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql b/ecomp-portal-DB-common/PortalDDLMySql_2_1_Common.sql
index 7469c60..024f067 100644 (file)
--- 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