Changed DB script back to Dublin

Issue-ID: PORTAL-700

Signed-off-by: Welch, Lorraine (lb2391) <lb2391@att.com>
Change-Id: Ib4587a01b72ff48e7e45967cb202d6acf153d9b6

diff --git a/deliveries/my.cnf b/deliveries/my.cnf
index e06a211..a4c8c3d 100644 (file)
--- 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 024f067..7469c60 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