Merge remote branch 'origin/pr/1230/head' into merge_1230
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/42b2b0b4 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/42b2b0b4 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/42b2b0b4 Branch: refs/heads/master Commit: 42b2b0b4a56e9b125d15eaa227976d11dcec1b3c Parents: 615b8dd e8c09eb Author: Sandhya Sundaresan <sand...@apache.org> Authored: Tue Sep 12 17:51:49 2017 +0000 Committer: Sandhya Sundaresan <sand...@apache.org> Committed: Tue Sep 12 17:51:49 2017 +0000 ---------------------------------------------------------------------- core/sql/cli/Cli.cpp | 48 ++++++++++++++++------------ core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 5 ++- 2 files changed, 31 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
