Merge branch 'master' of git://git.apache.org/trafodion into TRAFODION-2157
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/3555983c Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/3555983c Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/3555983c Branch: refs/heads/master Commit: 3555983cdeb03059277913babd646400f5f319ff Parents: dbe4cac bd886c1 Author: Liu Ming <[email protected]> Authored: Wed Feb 14 08:58:30 2018 +0000 Committer: Liu Ming <[email protected]> Committed: Wed Feb 14 08:58:30 2018 +0000 ---------------------------------------------------------------------- core/conn/odb/Makefile | 2 +- core/conn/odb/src/odb.c | 59 +++-- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 85 ++++++ core/sqf/commonLogger/CommonLogger.cpp | 8 +- core/sqf/commonLogger/CommonLogger.h | 8 +- core/sqf/sql/scripts/analyzeULOG.py | 62 ++++- core/sql/cli/Cli.cpp | 47 +++- core/sql/comexe/ComTdbExeUtil.h | 15 +- core/sql/executor/ExExeUtil.h | 2 + core/sql/executor/ExExeUtilLoad.cpp | 85 +++++- core/sql/exp/ExpLOBaccess.cpp | 70 +++++ core/sql/exp/ExpLOBaccess.h | 2 + core/sql/exp/ExpLOBenums.h | 4 +- core/sql/exp/ExpLOBexternal.h | 5 +- core/sql/exp/ExpLOBinterface.cpp | 115 ++++++++ core/sql/exp/ExpLOBinterface.h | 21 ++ core/sql/exp/exp_function.cpp | 9 +- core/sql/generator/GenRelExeUtil.cpp | 12 +- core/sql/optimizer/RelExeUtil.h | 3 +- core/sql/parser/sqlparser.y | 53 ++++ core/sql/qmscommon/QRLogger.cpp | 98 ++++++- core/sql/qmscommon/QRLogger.h | 18 +- core/sql/regress/compGeneral/EXPECTED023 | 54 ++-- core/sql/regress/compGeneral/TEST023 | 4 + core/sql/regress/executor/EXPECTED130 | 96 ++++--- core/sql/regress/executor/TEST130 | 17 ++ core/sql/sqlcomp/DefaultConstants.h | 1 + core/sql/sqlcomp/nadefaults.cpp | 6 +- core/sql/ustat/hs_globals.cpp | 30 +-- core/sql/ustat/hs_lex.ll | 4 + core/sql/ustat/hs_log.cpp | 265 ++++++++++--------- core/sql/ustat/hs_log.h | 25 +- core/sql/ustat/hs_update.cpp | 11 +- core/sql/ustat/hs_yacc.y | 17 +- 34 files changed, 1019 insertions(+), 294 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/3555983c/core/sql/exp/exp_function.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/3555983c/core/sql/parser/sqlparser.y ----------------------------------------------------------------------
