Merge remote branch 'origin/pr/417/head' into merge_trafodion417
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/ff2b62c0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/ff2b62c0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/ff2b62c0 Branch: refs/heads/master Commit: ff2b62c01b3f48594c25495aaa504403a1f02466 Parents: 90b5c8f 54171f4 Author: Sandhya Sundaresan <sand...@apache.org> Authored: Wed Apr 6 22:19:40 2016 +0000 Committer: Sandhya Sundaresan <sand...@apache.org> Committed: Wed Apr 6 22:19:40 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 + 9 files changed, 139 insertions(+), 46 deletions(-) ----------------------------------------------------------------------
