merge [TRAFODION-2999]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/3edf1f6c Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/3edf1f6c Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/3edf1f6c Branch: refs/heads/master Commit: 3edf1f6c026b97595c0c8f884cf6ee966da787ee Parents: 659e8ec c41cb45 Author: Liu Ming <ovis_p...@sina.com> Authored: Wed Apr 4 05:14:51 2018 +0000 Committer: Liu Ming <ovis_p...@sina.com> Committed: Wed Apr 4 05:14:51 2018 +0000 ---------------------------------------------------------------------- core/sql/common/ComResWords.cpp | 2 -- core/sql/parser/sqlparser.y | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/3edf1f6c/core/sql/parser/sqlparser.y ----------------------------------------------------------------------
