You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2016/03/20 19:36:08 UTC
[2/6] incubator-trafodion git commit: Merge remote branch
'origin/master' into ansharma_fixes_br
Merge remote branch 'origin/master' into ansharma_fixes_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/046863e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/046863e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/046863e4
Branch: refs/heads/master
Commit: 046863e49c4a5ae39e755d67232dd952b004640d
Parents: 7c7ca5f 741e52a
Author: Cloud User <ce...@ansharma-2.novalocal>
Authored: Fri Mar 18 15:28:29 2016 +0000
Committer: Cloud User <ce...@ansharma-2.novalocal>
Committed: Fri Mar 18 15:28:29 2016 +0000
----------------------------------------------------------------------
core/sqf/monitor/linux/cluster.cxx | 11 +
core/sqf/monitor/linux/cmsh.cxx | 29 +-
core/sqf/monitor/linux/internal.h | 9 +
core/sqf/monitor/linux/makefile | 2 +
core/sqf/monitor/linux/mlio.cxx | 6 +-
core/sqf/monitor/linux/msgdef.h | 17 +
core/sqf/monitor/linux/phnode.h | 2 +
core/sqf/monitor/linux/pnode.cxx | 10 +
core/sqf/monitor/linux/pnode.h | 1 +
core/sqf/monitor/linux/pnodeconfig.cxx | 6 +
core/sqf/monitor/linux/pnodeconfig.h | 2 +-
core/sqf/monitor/linux/replicate.cxx | 56 +-
core/sqf/monitor/linux/replicate.h | 14 +
core/sqf/monitor/linux/reqnodename.cxx | 114 ++
core/sqf/monitor/linux/reqqueue.cxx | 60 +-
core/sqf/monitor/linux/reqqueue.h | 32 +-
core/sqf/monitor/linux/shell.cxx | 177 +-
core/sqf/monitor/linux/testpoint.h | 2 +-
core/sql/bin/SqlciErrors.txt | 3 +-
core/sql/cli/Cli.cpp | 3 +-
core/sql/comexe/ComQueue.h | 2 +-
core/sql/comexe/ComTdb.h | 1 +
core/sql/common/ComMisc.cpp | 13 +
core/sql/common/ComMisc.h | 8 +
core/sql/common/ComSmallDefs.h | 5 +
core/sql/common/NAString.cpp | 23 +
core/sql/common/NAString.h | 3 +
core/sql/common/OperTypeEnum.h | 1 +
core/sql/generator/Generator.cpp | 10 +-
core/sql/optimizer/BindItemExpr.cpp | 16 +-
core/sql/optimizer/NAFileSet.cpp | 2 +
core/sql/optimizer/NAFileSet.h | 7 +
core/sql/optimizer/NATable.cpp | 24 +-
core/sql/optimizer/NATable.h | 3 +-
core/sql/optimizer/RelExeUtil.cpp | 7 +-
core/sql/parser/ElemDDLNode.cpp | 6 +
core/sql/parser/ElemDDLNode.h | 3 +
.../sql/parser/StmtDDLAlterTableAlterColumn.cpp | 39 +-
core/sql/parser/StmtDDLAlterTableAlterColumn.h | 40 +-
core/sql/parser/sqlparser.y | 19 +-
core/sql/regress/charsets/DIFF012.KNOWN.SB | 2 +-
core/sql/regress/charsets/EXPECTED002 | 9 +-
core/sql/regress/charsets/EXPECTED003 | 11 +-
core/sql/regress/charsets/EXPECTED012 | 19 +-
.../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 2 +-
core/sql/regress/compGeneral/EXPECTED006.SB | 5 +-
core/sql/regress/core/EXPECTED001.SB | 6 +-
core/sql/regress/core/EXPECTED037.SB | 14 +-
core/sql/regress/core/EXPECTED061.SB | 13 +-
core/sql/regress/core/EXPECTED116 | 149 +-
core/sql/regress/core/TEST116 | 11 +-
core/sql/regress/executor/EXPECTED001 | 80 +-
core/sql/regress/executor/EXPECTED013.SB | 59 +-
core/sql/regress/executor/EXPECTED014.SB | 73 +-
core/sql/regress/executor/EXPECTED016.SB | 10 +-
core/sql/regress/executor/EXPECTED122 | 20 +-
core/sql/regress/hive/EXPECTED009 | 7 +
core/sql/regress/hive/EXPECTED017 | 3 +
core/sql/regress/privs1/EXPECTED132 | 96 +-
core/sql/regress/seabase/EXPECTED010 | 394 ++--
core/sql/regress/seabase/EXPECTED011 | 16 +-
core/sql/regress/seabase/EXPECTED012 | 5 +-
core/sql/regress/seabase/EXPECTED020 | 32 +-
core/sql/regress/seabase/EXPECTED022 | 12 +-
core/sql/regress/seabase/EXPECTED025 | 7 +-
core/sql/regress/seabase/EXPECTED027 | 499 ++++-
core/sql/regress/seabase/TEST020 | 8 +-
core/sql/regress/seabase/TEST027 | 85 +-
core/sql/sqlcat/desc.h | 1 +
core/sql/sqlcomp/CmpDescribe.cpp | 30 +-
core/sql/sqlcomp/CmpDescribe.h | 2 -
core/sql/sqlcomp/CmpSeabaseDDL.h | 70 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 72 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1932 ++++++++++++------
core/sql/sqlcomp/DefaultConstants.h | 8 +-
core/sql/sqlcomp/nadefaults.cpp | 28 +-
76 files changed, 3422 insertions(+), 1156 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/parser/sqlparser.y
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/regress/compGeneral/EXPECTED006.SB
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/046863e4/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------