Merge branch 'master' of https://github.com/apache/trafodion into TRAFODION-3026
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/ae17bf1f Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/ae17bf1f Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/ae17bf1f Branch: refs/heads/master Commit: ae17bf1febd58baa73429729a364f8f8f85614a1 Parents: 69433d4 8dbf5df Author: Liu Ming <ovis_p...@sina.com> Authored: Sat Jun 2 05:28:08 2018 -0400 Committer: Liu Ming <ovis_p...@sina.com> Committed: Sat Jun 2 05:28:08 2018 -0400 ---------------------------------------------------------------------- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 13 +- core/sqf/export/include/seabed/int/thread.inl | 3 + core/sqf/src/trafconf/Makefile | 3 + core/sql/bin/SqlciErrors.txt | 2 +- core/sql/comexe/ComTdbExeUtil.h | 4 + core/sql/executor/ExExeUtilGet.cpp | 244 +++++-- core/sql/exp/exp_bignum.cpp | 14 + core/sql/generator/GenRelExeUtil.cpp | 14 +- core/sql/optimizer/BindItemExpr.cpp | 162 +++-- core/sql/optimizer/ItemExpr.cpp | 18 +- core/sql/optimizer/ItemFunc.h | 3 + core/sql/optimizer/ValueDesc.cpp | 27 +- core/sql/parser/ParKeyWords.cpp | 2 - core/sql/parser/sqlparser.y | 358 +++------ .../sql/regress/compGeneral/DIFF006.KNOWN.SB.OS | 12 - core/sql/regress/compGeneral/EXPECTED006.SB | 53 +- core/sql/regress/compGeneral/EXPECTEDTOK | 3 +- core/sql/regress/compGeneral/EXPECTEDTOK2 | 3 +- core/sql/regress/compGeneral/TEST006 | 1 + core/sql/regress/core/EXPECTED037.SB | 39 +- core/sql/regress/core/EXPECTED116 | 197 +++-- core/sql/regress/core/TEST037 | 20 + core/sql/regress/executor/EXPECTED016.SB | 20 +- core/sql/regress/executor/TEST016 | 7 +- core/sql/regress/privs1/EXPECTED125 | 729 +++++++++++++++++++ core/sql/regress/privs1/TEST125 | 51 ++ core/sql/regress/privs2/EXPECTED144 | 301 +++++++- core/sql/regress/privs2/EXPECTED146 | 125 +++- core/sql/regress/privs2/TEST144 | 39 +- core/sql/regress/privs2/TEST146 | 7 + core/sql/sqlci/sqlci_lex.ll | 2 - core/sql/sqlci/sqlci_yacc.y | 11 - core/sql/sqlcomp/CmpSeabaseDDLauth.cpp | 69 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 2 + .../src/asciidoc/_chapters/binder_msgs.adoc | 17 + .../src/asciidoc/_chapters/sql_statements.adoc | 38 +- .../src/asciidoc/_chapters/sql_utilities.adoc | 2 +- install/python-installer/configs/version.json | 4 +- 38 files changed, 2061 insertions(+), 558 deletions(-) ----------------------------------------------------------------------
