Merge branch 'master' of https://github.com/apache/trafodion into TRAFODION-3136
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/f6aa8769 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/f6aa8769 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/f6aa8769 Branch: refs/heads/master Commit: f6aa8769a0f45db1a5c8c49af0383d3640115385 Parents: 2e26003 4582582 Author: zlei929 <[email protected]> Authored: Wed Jul 18 11:13:49 2018 +0800 Committer: zlei929 <[email protected]> Committed: Wed Jul 18 11:13:49 2018 +0800 ---------------------------------------------------------------------- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 66 +++- core/sql/parser/sqlparser.y | 20 +- core/sql/regress/core/EXPECTED002.LINUX | 57 ++++ core/sql/regress/core/TEST002 | 25 ++ core/sql/ustat/hs_globals.cpp | 11 +- core/sql/ustat/hs_la.cpp | 5 +- core/sql/ustat/hs_read.cpp | 268 +--------------- core/sql/ustat/hs_update.cpp | 29 -- .../src/asciidoc/_chapters/introduction.adoc | 2 +- .../sql_functions_and_expressions.adoc | 4 +- .../_chapters/sql_language_elements.adoc | 6 +- docs/src/site/markdown/index.md | 15 +- docs/src/site/site.xml | 2 +- win-odbc64/Common/TransportBase.h | 2 + win-odbc64/Common/marshalingdrvr_drvr.cpp | 123 ++++++++ win-odbc64/Common/marshalingdrvr_drvr.h | 27 ++ win-odbc64/Krypton/generated_incs/odbc_cl.h | 52 ++++ .../odbcclient/drvr35/Interface/odbcs_drvr.cpp | 227 ++++++++++++++ .../odbcclient/drvr35/Interface/odbcs_drvr.h | 24 ++ win-odbc64/odbcclient/drvr35/cconnect.cpp | 3 + win-odbc64/odbcclient/drvr35/cconnect.h | 4 + win-odbc64/odbcclient/drvr35/cdesc.cpp | 24 +- win-odbc64/odbcclient/drvr35/cstmt.cpp | 309 +++++++++++++++++++ win-odbc64/odbcclient/drvr35/cstmt.h | 27 ++ win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 12 + win-odbc64/odbcclient/drvr35/drvr35_os.vcxproj | 4 +- .../odbcclient/drvr35/drvr35_os.vcxproj.filters | 6 + win-odbc64/odbcclient/drvr35/drvrglobal.cpp | 5 +- win-odbc64/odbcclient/drvr35/drvrnet.cpp | 12 + win-odbc64/odbcclient/drvr35/drvrnet.h | 21 ++ win-odbc64/odbcclient/drvr35/lob.cpp | 88 ++++++ win-odbc64/odbcclient/drvr35/lob.h | 38 +++ win-odbc64/odbcclient/drvr35/netstmt.cpp | 95 ++++++ win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 28 +- win-odbc64/odbcclient/drvr35/sqltocconv.h | 4 +- win-odbc64/sql/cli/sqlcli.h | 4 + 36 files changed, 1336 insertions(+), 313 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/f6aa8769/core/sql/parser/sqlparser.y ----------------------------------------------------------------------
