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/bb8bedb5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/bb8bedb5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/bb8bedb5 Branch: refs/heads/master Commit: bb8bedb5a1486a7ff9fef3c5568e7e5de92ff3a4 Parents: 788fd9c c7f6525 Author: Amanda Moran <[email protected]> Authored: Thu Apr 21 18:45:44 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Thu Apr 21 18:45:44 2016 +0000 ---------------------------------------------------------------------- .../sqf/conf/log4cxx.trafodion.masterexe.config | 1 + core/sql/cli/Cli.cpp | 130 ++-- core/sql/cli/Cli.h | 9 +- core/sql/cli/CliExtern.cpp | 18 +- core/sql/cli/SQLCLIdev.h | 7 - core/sql/cli/SessionDefaults.cpp | 1 - core/sql/cli/Statement.cpp | 2 +- core/sql/cli/sqlcli.h | 6 + core/sql/comexe/ComTdb.cpp | 8 +- core/sql/comexe/ComTdb.h | 1 + core/sql/comexe/ComTdbExeUtil.cpp | 74 +++ core/sql/comexe/ComTdbExeUtil.h | 122 ++++ core/sql/executor/ExComTdb.cpp | 8 + core/sql/executor/ExExeUtil.h | 176 ++++++ core/sql/executor/ExExeUtilGet.cpp | 586 ++++++++++++++++++- core/sql/executor/ExExeUtilLoad.cpp | 4 +- core/sql/exp/ExpLOBaccess.cpp | 441 ++++++++++---- core/sql/exp/ExpLOBaccess.h | 10 +- core/sql/exp/ExpLOBexternal.h | 9 +- core/sql/exp/ExpLOBprocess.cpp | 4 +- core/sql/export/ComDiags.cpp | 8 +- core/sql/generator/GenRelExeUtil.cpp | 161 ++++- core/sql/optimizer/NATable.cpp | 2 +- core/sql/optimizer/RelExeUtil.cpp | 119 ++++ core/sql/optimizer/RelExeUtil.h | 42 ++ core/sql/parser/sqlparser.y | 23 +- core/sql/regress/executor/EXPECTED130 | 161 ++++- core/sql/regress/executor/FILTER130 | 4 + core/sql/regress/executor/TEST130 | 38 ++ core/sql/sqlci/SqlciEnv.cpp | 8 +- core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 6 +- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 16 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 12 +- core/sql/sqlmxevents/logmxevent_traf.cpp | 8 +- core/sql/sqlmxevents/logmxevent_traf.h | 2 +- 35 files changed, 2006 insertions(+), 221 deletions(-) ----------------------------------------------------------------------
