You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2016/05/19 23:34:50 UTC
[4/4] incubator-trafodion git commit: Merge [TRAFODION-1956] PR 488
Timeout for tdm_arkcmp process
Merge [TRAFODION-1956] PR 488 Timeout for tdm_arkcmp process
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d02fe478
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d02fe478
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d02fe478
Branch: refs/heads/master
Commit: d02fe4781fe8bb4096b6c104009ef4f950097a47
Parents: 444cd9c 7066f18
Author: Dave Birdsall <db...@apache.org>
Authored: Thu May 19 23:33:47 2016 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu May 19 23:33:47 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Context.cpp | 26 +++++++++++++++++++++-----
core/sql/cli/Context.h | 1 +
core/sql/cli/ExSqlComp.cpp | 5 ++++-
core/sql/cli/ExSqlComp.h | 2 ++
core/sql/cli/SessionDefaults.cpp | 9 +++++++++
core/sql/cli/SessionDefaults.h | 12 +++++++++++-
core/sql/cli/Statement.cpp | 2 +-
core/sql/executor/ex_control.cpp | 12 ++++++++++++
core/sql/regress/executor/EXPECTED020 | 1 +
core/sql/sqlcomp/DefaultConstants.h | 1 +
core/sql/sqlcomp/nadefaults.cpp | 2 ++
11 files changed, 65 insertions(+), 8 deletions(-)
----------------------------------------------------------------------