Merge remote branch 'origin/master' into ddlxns_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/9b779ccb Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/9b779ccb Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/9b779ccb Branch: refs/heads/master Commit: 9b779ccbc7276d2aed3316faed6d745357d2f753 Parents: ba6a1f2 b7ecf18 Author: Cloud User <[email protected]> Authored: Thu Apr 7 14:31:19 2016 +0000 Committer: Cloud User <[email protected]> Committed: Thu Apr 7 14:31:19 2016 +0000 ---------------------------------------------------------------------- .../src/org/trafodion/jdbc/t4/HPT4Desc.java | 8 +- .../trafodion/jdbc/t4/InterfaceResultSet.java | 10 +++ .../trafodion/jdbc/t4/InterfaceStatement.java | 8 +- .../jdbc/t4/TrafT4PreparedStatement.java | 32 +------- .../org/trafodion/jdbc/t4/TrafT4ResultSet.java | 19 ++++- core/conn/odbc/src/odbc/Common/DrvrSrvr.cpp | 2 + core/conn/odbc/src/odbc/Common/nskieee.cpp | 18 ++++ .../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 86 +++++++++++++++++--- core/conn/odbc/src/odbc/nsksrvrcore/srvrkds.cpp | 2 + install/installer/rest_installer | 1 - install/installer/traf_hortonworks_mods98 | 24 +++--- 11 files changed, 151 insertions(+), 59 deletions(-) ----------------------------------------------------------------------
