You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by li...@apache.org on 2018/04/13 12:38:58 UTC
[18/32] trafodion git commit: Merge remote branch
'origin/pr/1240/head' into merge_1240
Merge remote branch 'origin/pr/1240/head' into merge_1240
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/e26ec04a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/e26ec04a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/e26ec04a
Branch: refs/heads/master
Commit: e26ec04a7815cb46f3d10d9816398c10ad13df67
Parents: 42b2b0b 1ade420
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Sep 25 04:32:50 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Sep 25 04:32:50 2017 +0000
----------------------------------------------------------------------
.../trafodion/jdbc/t4/ExtractLobMessage.java | 13 +--
.../org/trafodion/jdbc/t4/ExtractLobReply.java | 23 +++--
.../org/trafodion/jdbc/t4/T4Properties.java | 28 +++++-
.../java/org/trafodion/jdbc/t4/TrafT4Blob.java | 11 ---
.../java/org/trafodion/jdbc/t4/TrafT4Clob.java | 13 ---
.../java/org/trafodion/jdbc/t4/TrafT4Lob.java | 39 ++++++--
.../nsksrvr/Interface/marshalingsrvr_srvr.cpp | 48 +++++++---
.../nsksrvr/Interface/marshalingsrvr_srvr.h | 6 +-
.../src/odbc/nsksrvr/Interface/odbcs_srvr.cpp | 11 ++-
.../odbc/nsksrvr/Interface/odbcs_srvr_res.cpp | 18 ++--
.../src/odbc/nsksrvr/Interface/odbcs_srvr_res.h | 6 +-
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 20 +++--
core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.h | 3 +-
.../conn/odbc/src/odbc/nsksrvrcore/srvrcommon.h | 5 +-
.../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 94 +++++++-------------
.../org/trafodion/jdbc_test/JdbcCommon.java | 27 ++++--
.../java/org/trafodion/jdbc_test/PropTest.java | 9 +-
.../java/org/trafodion/jdbc_test/TestBlob.java | 16 ++--
.../org/trafodion/jdbc_test/TestBlobBatch.java | 12 ++-
.../java/org/trafodion/jdbc_test/TestClob.java | 17 +++-
.../org/trafodion/jdbc_test/TestClobBatch.java | 15 ++--
.../org/trafodion/jdbc_test/TestForeignKey.java | 87 +++++++++++-------
.../trafodion/jdbc_test/TestGetIndexInfo.java | 24 +++--
23 files changed, 335 insertions(+), 210 deletions(-)
----------------------------------------------------------------------