Merge remote branch 'origin/pr/1588/head' into merge_1588

Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/1ee3de70
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/1ee3de70
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/1ee3de70

Branch: refs/heads/master
Commit: 1ee3de706f07414a5ff3b4588e401163397230b7
Parents: 98b3ac3 32c92c3
Author: Sandhya Sundaresan <sand...@apache.org>
Authored: Wed Jun 13 17:53:38 2018 +0000
Committer: Sandhya Sundaresan <sand...@apache.org>
Committed: Wed Jun 13 17:53:38 2018 +0000

----------------------------------------------------------------------
 .../jdbc/t4/CONNECTION_CONTEXT_def.java         |   1 +
 .../jdbc/t4/InitializeDialogueMessage.java      |   3 +-
 .../trafodion/jdbc/t4/InterfaceConnection.java  |   5 +
 .../trafodion/jdbc/t4/InterfaceResultSet.java   | 103 ++++++++++++---
 .../org/trafodion/jdbc/t4/T4DSProperties.java   |   3 +
 .../org/trafodion/jdbc/t4/T4Properties.java     |  32 +++--
 .../java/org/trafodion/jdbc/t4/TRANSPORT.java   |   1 +
 .../org/trafodion/jdbc/t4/TrafT4Statement.java  |   4 +-
 core/conn/odbc/src/odbc/Common/Global.h         |   3 +
 .../odbc/Krypton/generated_incs/odbcCommon.h    |   1 +
 .../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp   |   1 +
 core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp |   1 +
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    | 124 ++++++++++++++++++-
 13 files changed, 251 insertions(+), 31 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/1ee3de70/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
----------------------------------------------------------------------

Reply via email to