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 <[email protected]> Authored: Thu Nov 16 12:04:33 2017 +0800 Committer: eedy <[email protected]> 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 {
