You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sv...@apache.org on 2016/04/21 23:47:57 UTC
[09/13] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into installbugfixes
Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fed3bbd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fed3bbd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fed3bbd7
Branch: refs/heads/master
Commit: fed3bbd794cef41f78155f8434248de50481dc70
Parents: 68eb74d 79552f0
Author: Amanda Moran <am...@apache.com>
Authored: Wed Apr 20 22:00:48 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Wed Apr 20 22:00:48 2016 +0000
----------------------------------------------------------------------
.rat-excludes | 2 +
core/conn/jdbc_type2/native/SqlInterface.cpp | 2 -
core/conn/odb/odb.sln | 28 ++++
core/conn/odb/odb/odb.vcxproj | 165 ++++++++++++++++++++++
core/conn/odb/odb/odb.vcxproj.filters | 36 +++++
core/conn/odb/odb/odb.vcxproj.user | 4 +
core/conn/odb/src/memcpy_wrapper.c | 2 +
core/conn/odb/src/odb.c | 1 +
core/conn/odb/src/verslib.h | 3 +
core/conn/odb/src/versodb.c | 2 +
core/sqf/sql/scripts/ilh_cleanhb | 31 ++--
core/sql/arkcmp/CmpContext.h | 1 +
core/sql/arkcmp/NATableSt.cpp | 30 ++--
core/sql/common/ComResWords.cpp | 1 -
core/sql/optimizer/NATable.cpp | 23 ++-
core/sql/optimizer/NATable.h | 4 +
core/sql/parser/ParKeyWords.cpp | 1 -
core/sql/regress/core/EXPECTED005.SB | 8 +-
core/sql/regress/core/EXPECTED037.SB | 9 +-
core/sql/regress/core/TEST005 | 2 +-
core/sql/regress/hive/EXPECTED009 | 2 +-
core/sql/regress/hive/TEST009 | 2 +-
22 files changed, 322 insertions(+), 37 deletions(-)
----------------------------------------------------------------------