Merge branch 'master' of github.com:apache/incubator-trafodion into 
TRAFODION-2034


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ecde2b78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ecde2b78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ecde2b78

Branch: refs/heads/master
Commit: ecde2b786f2b35aaf077c4c1ecedb29c3b6a3011
Parents: af9c70e 0239792
Author: Amanda Moran <ama...@apache.com>
Authored: Wed Sep 14 18:10:21 2016 +0000
Committer: Amanda Moran <ama...@apache.com>
Committed: Wed Sep 14 18:10:21 2016 +0000

----------------------------------------------------------------------
 core/sql/common/ComSmallDefs.h           |  1 +
 core/sql/generator/GenExplain.cpp        |  3 +--
 core/sql/generator/GenRelScan.cpp        |  2 ++
 core/sql/optimizer/RelScan.h             |  5 +++++
 core/sql/regress/charsets/EXPECTED310    |  4 ++--
 core/sql/regress/charsets/EXPECTED311    |  4 ++--
 core/sql/regress/charsets/TEST310        |  4 ++--
 core/sql/regress/charsets/TEST311        |  4 ++--
 core/sql/sqlcomp/CmpSeabaseDDL.h         |  1 +
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp |  8 ++++++++
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 12 ++++++++----
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp  |  2 +-
 core/sql/ustat/hs_globals.cpp            |  2 +-
 13 files changed, 36 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


Reply via email to