You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/03/15 21:20:04 UTC
[5/7] incubator-trafodion git commit: Merge remote-tracking branch
'origin/master' into TRAFODION-1851
Merge remote-tracking branch 'origin/master' into TRAFODION-1851
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ea2c1a0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ea2c1a0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ea2c1a0e
Branch: refs/heads/master
Commit: ea2c1a0e8af295aebb8898dd8fc2a54aecb92699
Parents: 8c33e75 87182d6
Author: Gunnar Tapper <gt...@esgyn.local>
Authored: Tue Mar 15 12:41:58 2016 -0600
Committer: Gunnar Tapper <gt...@esgyn.local>
Committed: Tue Mar 15 12:41:58 2016 -0600
----------------------------------------------------------------------
.rat-excludes | 1 +
core/sqf/monitor/linux/clio.cxx | 7 +
core/sqf/monitor/linux/monitor.cxx | 6 +
core/sqf/monitor/linux/shell.cxx | 6 +
core/sqf/src/seabed/src/msmon.cpp | 6 +
.../transactional/SplitBalanceHelper.java | 8 +-
core/sqf/src/tm/Makefile | 3 +
core/sqf/src/tm/tm.cpp | 33 +-
core/sqf/src/tm/tmaudit.cpp | 18 +-
core/sqf/src/tm/tmauditobj.cpp | 6 +-
core/sqf/src/tm/tmddlrequests.cpp | 12 +-
core/sqf/src/tm/tmlib.cpp | 13 +-
core/sqf/src/tm/tmpoolelement.h | 2 +-
core/sqf/src/tm/tmrecov.cpp | 3 +-
core/sqf/src/tm/tmregisterregion.cpp | 4 +-
core/sqf/src/tm/tmrmhbase.cpp | 3 -
core/sqf/src/tm/tmrmtse.cpp | 3 +-
core/sqf/src/tm/tmtime.h | 3 +-
core/sqf/src/tm/tmxarmmain.cpp | 2 +-
core/sqf/src/tm/tmxatxn.cpp | 4 +-
core/sqf/src/tm/tools/Makefile | 3 +
core/sqf/src/tm/tools/dtmci.cpp | 14 +-
core/sqf/src/tm/xarmapi.cpp | 5 +-
core/sqf/src/tm/xatmapi.cpp | 7 +-
core/sql/exp/exp_datetime.cpp | 1228 +++++++----------
core/sql/exp/exp_datetime.h | 186 ++-
core/sql/exp/exp_function.cpp | 28 +-
core/sql/generator/GenItemFunc.cpp | 134 +-
core/sql/optimizer/BindItemExpr.cpp | 584 ++++-----
core/sql/optimizer/ItemCache.cpp | 5 +-
core/sql/optimizer/ItemExpr.cpp | 52 +-
core/sql/optimizer/ItemFunc.h | 53 +-
core/sql/optimizer/QRDescGenerator.cpp | 19 +-
core/sql/optimizer/Stats.h | 8 +-
core/sql/optimizer/SynthType.cpp | 148 +--
core/sql/parser/ParKeyWords.cpp | 6 +-
core/sql/parser/sqlparser.y | 74 +-
core/sql/regress/compGeneral/DIFF006.KNOWN.SB | 4 -
.../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +-
core/sql/regress/compGeneral/EXPECTED006 | 1235 ------------------
core/sql/regress/compGeneral/EXPECTED006.SB | 19 +-
core/sql/regress/compGeneral/TEST006 | 12 +-
core/sql/regress/core/EXPECTED001.SB | 42 +-
core/sql/regress/core/TEST001 | 2 +
core/sql/regress/seabase/EXPECTED030 | 550 ++++++++
core/sql/regress/seabase/TEST030 | 110 ++
core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 86 +-
core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 6 +-
dcs/Makefile | 2 +
dcs/pom.xml | 6 +-
install/installer/checkHBase | 37 +
install/installer/parseHBaseSite.py | 25 +-
install/installer/traf_add_sudoAccess | 3 +-
install/installer/traf_cloudera_mods98 | 40 +-
install/installer/traf_config_check | 48 +-
install/installer/traf_config_setup | 3 +-
install/installer/traf_getHadoopNodes | 21 +-
install/installer/traf_hortonworks_mods98 | 68 +-
install/installer/traf_package_setup | 2 +-
install/installer/trafodion_install | 88 +-
licenses/lic-dcs-bin | 651 ++++++++-
licenses/not-dcs-bin | 20 +
62 files changed, 2767 insertions(+), 3012 deletions(-)
----------------------------------------------------------------------