You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/10 06:42:00 UTC

[6/6] incubator-trafodion git commit: Merge remote branch 'origin/pr/111/head' into mrg_61

Merge remote branch 'origin/pr/111/head' into mrg_61


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

Branch: refs/heads/master
Commit: df76babe98897990fe34370bf2fc7416a88af864
Parents: a751675 dd15115
Author: Suresh Subbiah <su...@apache.org>
Authored: Sat Oct 10 04:41:33 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Sat Oct 10 04:41:33 2015 +0000

----------------------------------------------------------------------
 .../trafodion/dcs/servermt/ServerConstants.java |  64 +-
 .../serverDriverInputOutput/Descriptor2.java    | 260 +++---
 .../Descriptor2List.java                        | 269 +++---
 .../SQLWarningOrError.java                      |   7 +-
 .../serverDriverInputOutput/Version.java        |  18 +
 .../serverHandler/ServerApiGetCatalogs.java     | 175 ++--
 .../serverHandler/ServerApiSqlExecDirect.java   | 182 ++--
 .../serverHandler/ServerApiSqlExecute.java      | 864 ++++++++++++-------
 .../serverHandler/ServerApiSqlFetch.java        | 627 +++++---------
 .../serverHandler/ServerApiSqlPrepare.java      | 207 ++---
 .../ServerApiSqlSetConnectAttr.java             |  39 +-
 .../dcs/servermt/serverSql/TrafConnection.java  | 137 +--
 .../dcs/servermt/serverSql/TrafResultSet.java   | 154 ++++
 .../dcs/servermt/serverSql/TrafStatement.java   | 212 +++--
 .../java/org/trafodion/dcs/util/SqlUtils.java   | 348 +++++++-
 15 files changed, 2029 insertions(+), 1534 deletions(-)
----------------------------------------------------------------------