You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/11/17 01:01:35 UTC
[1/2] incubator-trafodion git commit: new COMMENT-ON SQL statement:
resolve merge conflict
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 7694a63ed -> 997b86318
new COMMENT-ON SQL statement: resolve merge conflict
1. resolve enum type conflict while merging to esgyn
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ad6d7350
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ad6d7350
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ad6d7350
Branch: refs/heads/master
Commit: ad6d7350cef85de36e4af0cf035f1e557054aec4
Parents: c5519b4
Author: eedy <cq...@gmail.com>
Authored: Thu Nov 16 12:04:33 2017 +0800
Committer: eedy <cq...@gmail.com>
Committed: Thu Nov 16 12:04:33 2017 +0800
----------------------------------------------------------------------
core/sql/common/ComSmallDefs.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad6d7350/core/sql/common/ComSmallDefs.h
----------------------------------------------------------------------
diff --git a/core/sql/common/ComSmallDefs.h b/core/sql/common/ComSmallDefs.h
index 3e25a79..b6baf11 100644
--- a/core/sql/common/ComSmallDefs.h
+++ b/core/sql/common/ComSmallDefs.h
@@ -664,7 +664,7 @@ enum ComTextType {COM_VIEW_TEXT = 0,
COM_STORED_DESC_TEXT = 7,
COM_VIEW_REF_COLS_TEXT = 8,
COM_OBJECT_COMMENT_TEXT = COM_TABLE_COMMENT_TEXT,
- COM_COLUMN_COMMENT_TEXT = 9
+ COM_COLUMN_COMMENT_TEXT = 12
};
enum ComColumnDirection { COM_UNKNOWN_DIRECTION
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/ad6d7350/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
----------------------------------------------------------------------
diff --git a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
index 7178fd1..e2bf7a5 100644
--- a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
+++ b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp
@@ -1517,7 +1517,7 @@ short CmpSeabaseDDL::createMetadataViews(ExeCliInterface * cliInterface)
param_[8] = getSystemCatalog();
param_[9] = SEABASE_MD_SCHEMA;
param_[10] = SEABASE_TEXT;
- param_[11] = "9";//COM_COLUMN_COMMENT_TEXT
+ param_[11] = "12";//COM_COLUMN_COMMENT_TEXT
}
else
{
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2803] PR 1301
Fix a merge conflict
Posted by db...@apache.org.
Merge [TRAFODION-2803] PR 1301 Fix a merge conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/997b8631
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/997b8631
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/997b8631
Branch: refs/heads/master
Commit: 997b86318c4c9ada2a8a6caef10d0b3fbcc92b39
Parents: 7694a63 ad6d735
Author: Dave Birdsall <db...@apache.org>
Authored: Fri Nov 17 00:59:53 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Fri Nov 17 00:59:53 2017 +0000
----------------------------------------------------------------------
core/sql/common/ComSmallDefs.h | 2 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------