svn commit: r1485459 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/wizard/step8_controller.js

[yusaku]

Author: yusaku
Date: Wed May 22 22:03:17 2013
New Revision: 1485459

URL: http://svn.apache.org/r1485459
Log:
AMBARI-2179. Fix JDBC URLs for Oozie connecting to MySQL server. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485459&r1=1485458&r2=1485459&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 22 22:03:17 2013
@@ -882,6 +882,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2179. Fix JDBC URLs for Oozie connecting to MySQL server. (yusaku)
+
  AMBARI-2178. Fix JDBC URLs for connecting to Oracle from Hive Metastore and
  Oozie Server. (yusaku)
 

Modified: 
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js
URL: 
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js?rev=1485459&r1=1485458&r2=1485459&view=diff
==============================================================================
--- 
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js 
(original)
+++ 
incubator/ambari/trunk/ambari-web/app/controllers/wizard/step8_controller.js 
Wed May 22 22:03:17 2013
@@ -1513,10 +1513,10 @@ App.WizardStep8Controller = Em.Controlle
         oozieProperties["oozie.service.JPAService.jdbc.url"] = 
"jdbc:derby:${oozie.data.dir}/${oozie.db.schema.name}-db;create=true";
         oozieProperties["oozie.service.JPAService.jdbc.driver"] = 
"org.apache.derby.jdbc.EmbeddedDriver";
       }else if (oozieDb.value === 'New MySQL Database') {
-        oozieProperties["oozie.service.JPAService.jdbc.url"] = "jdbc:mysql://" 
+ oozieHost + "/" + oozieDbName + "?createDatabaseIfNotExist=true";
+        oozieProperties["oozie.service.JPAService.jdbc.url"] = "jdbc:mysql://" 
+ oozieHost + "/" + oozieDbName;
         oozieProperties["oozie.service.JPAService.jdbc.driver"] = 
"com.mysql.jdbc.Driver";
       } else if (oozieDb.value === 'Existing MySQL Database'){
-        oozieProperties["oozie.service.JPAService.jdbc.url"] = "jdbc:mysql://" 
+ oozieHost + "/" + oozieDbName + "?createDatabaseIfNotExist=true";
+        oozieProperties["oozie.service.JPAService.jdbc.url"] = "jdbc:mysql://" 
+ oozieHost + "/" + oozieDbName;
         oozieProperties["oozie.service.JPAService.jdbc.driver"] = 
"com.mysql.jdbc.Driver";
       } else { //existing oracle database
         oozieProperties["oozie.service.JPAService.jdbc.url"] = 
"jdbc:oracle:thin:@//" + oozieHost + ":1521/" + oozieDbName;