Repository: ambari
Updated Branches:
  refs/heads/trunk 04b6f14be -> b933445cf


AMBARI-16240: Ambari operation history: Syntax error in 
Ambari-DDL-Postgres-CREATE.sql causes ambari-server setup to fail in 2.4.0.0-489


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b933445c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b933445c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b933445c

Branch: refs/heads/trunk
Commit: b933445cf7d7f79b7c754e788557f1476bb37689
Parents: 04b6f14
Author: Nahappan Somasundaram <[email protected]>
Authored: Tue May 3 20:29:18 2016 -0700
Committer: Nahappan Somasundaram <[email protected]>
Committed: Tue May 3 20:59:51 2016 -0700

----------------------------------------------------------------------
 ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql    | 2 +-
 ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/b933445c/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
index c902637..f5336bc 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
@@ -1089,7 +1089,7 @@ INSERT INTO ambari_sequences (sequence_name, 
sequence_value)
   union all
   select 'servicecomponent_history_id_seq', 0 FROM SYSIBM.SYSDUMMY1
   union all
-  select 'blueprint_setting_id_seq', 0 FROM SYSIBM.SYSDUMMY1;
+  select 'blueprint_setting_id_seq', 0 FROM SYSIBM.SYSDUMMY1
   union all
   select 'ambari_operation_history_id_seq', 0 FROM SYSIBM.SYSDUMMY1;
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/b933445c/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql 
b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
index 85cc0be..7fb8c31 100644
--- a/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
+++ b/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
@@ -1086,7 +1086,7 @@ INSERT INTO ambari_sequences (sequence_name, 
sequence_value)
   union all
   select 'servicecomponent_history_id_seq', 0
   union all
-  select 'blueprint_setting_id_seq', 0;
+  select 'blueprint_setting_id_seq', 0
   union all
   select 'ambari_operation_history_id_seq', 0;
 

Reply via email to