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 2016/10/27 15:13:27 UTC

[3/9] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch

Merge branch 'master' of github.com:apache/incubator-trafodion into wrkbrnch


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

Branch: refs/heads/master
Commit: 1605595e6da911c379698a0b8ef8e1b79a2437cc
Parents: c3c4736 5cd718a
Author: Anuradha Hegde <an...@esgyn.com>
Authored: Thu Oct 6 19:08:03 2016 +0000
Committer: Anuradha Hegde <an...@esgyn.com>
Committed: Thu Oct 6 19:08:03 2016 +0000

----------------------------------------------------------------------
 core/conn/jdbc_type2/native/SQLMXDriver.cpp     |  13 --
 core/sqf/commonLogger/CommonLogger.cpp          |   5 +-
 core/sqf/commonLogger/CommonLogger.h            |   2 +
 core/sql/cli/CliExtern.cpp                      |  15 +-
 core/sql/cli/ExSqlComp.cpp                      |   2 +-
 core/sql/common/Ipc.cpp                         |  22 ++-
 core/sql/common/Ipc.h                           |   2 +-
 core/sql/executor/ex_frag_rt.cpp                |  30 +---
 core/sql/exp/exp_conv.cpp                       |   2 +-
 core/sql/generator/GenRelUpdate.cpp             | 150 ++-----------------
 core/sql/optimizer/NormRelExpr.cpp              |  29 ++--
 core/sql/optimizer/RelExpr.cpp                  |   8 +
 core/sql/optimizer/RelJoin.h                    |   2 +-
 core/sql/optimizer/RelMisc.h                    |   1 +
 core/sql/qmscommon/QRLogger.cpp                 |   8 +-
 core/sql/regress/compGeneral/EXPECTED011.SB     |  22 ++-
 core/sql/regress/seabase/EXPECTED020            |  23 +++
 core/sql/regress/seabase/TEST020                |  10 ++
 core/sql/sqlmxevents/logmxevent_traf.cpp        |   8 +-
 core/sql/ustat/hs_globals.cpp                   |   2 +-
 docs/src/site/markdown/index.md                 |  21 +--
 .../site/resources/images/carousel/meetup.png   | Bin 81640 -> 0 bytes
 docs/src/site/site.xml                          |   2 +-
 install/installer/traf_cloudera_mods            |  11 +-
 .../phoenix/end2end/MultiCfQueryExecTest.java   |   9 --
 .../end2end/SaltedTableUpsertSelectTest.java    |   2 +-
 26 files changed, 149 insertions(+), 252 deletions(-)
----------------------------------------------------------------------