merge [TRAFODION-2952]
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c7d2301d Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c7d2301d Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c7d2301d Branch: refs/heads/master Commit: c7d2301d71db62488681ae523f9c35ef8ad8afba Parents: 5f230e2 a0357a0 Author: Liu Ming <ovis_p...@sina.com> Authored: Wed Sep 5 10:20:27 2018 +0000 Committer: Liu Ming <ovis_p...@sina.com> Committed: Wed Sep 5 10:20:27 2018 +0000 ---------------------------------------------------------------------- core/sql/cli/Cli.cpp | 11 +++++++---- core/sql/common/SequenceGeneratorAttributes.h | 15 ++++++++++++--- core/sql/exp/ExpSeqGen.cpp | 5 +++++ core/sql/exp/ExpSeqGen.h | 9 +++++++++ core/sql/exp/exp_function.cpp | 2 ++ core/sql/exp/exp_function.h | 7 ++++++- core/sql/generator/GenItemFunc.cpp | 2 ++ core/sql/sqlcomp/DefaultConstants.h | 6 ++++++ core/sql/sqlcomp/nadefaults.cpp | 2 ++ 9 files changed, 51 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
