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/08 06:05:41 UTC

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

Merge remote branch 'origin/pr/102/head' into mrg_60


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

Branch: refs/heads/master
Commit: ba61c39ef59d0481923194053672b965f435346b
Parents: 0618e6e cefbb9b
Author: Suresh Subbiah <su...@apache.org>
Authored: Thu Oct 8 04:05:16 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Thu Oct 8 04:05:16 2015 +0000

----------------------------------------------------------------------
 core/sql/generator/GenPreCode.cpp           |  47 +-
 core/sql/optimizer/BindRelExpr.cpp          |   9 +
 core/sql/optimizer/CostMethod.h             |  70 +--
 core/sql/optimizer/OptPhysRelExpr.cpp       |  28 ++
 core/sql/optimizer/RelUpdate.h              |  10 +-
 core/sql/optimizer/ScmCostMethod.cpp        | 566 ++++++++++++++++++++++-
 core/sql/optimizer/TransRule.cpp            |   9 +
 core/sql/regress/compGeneral/EXPECTED013.SB |  18 +-
 core/sql/regress/compGeneral/EXPECTED071    |  10 +-
 core/sql/regress/executor/EXPECTED015.SB    |   2 +-
 core/sql/regress/seabase/EXPECTED010        | 472 +++++++++----------
 core/sql/regress/seabase/EXPECTED011        |  66 +--
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp   |  25 +
 core/sql/sqlcomp/DefaultConstants.h         |  10 +-
 core/sql/sqlcomp/PrivMgrPrivileges.cpp      |   9 +-
 core/sql/sqlcomp/nadefaults.cpp             |  12 +
 16 files changed, 1020 insertions(+), 343 deletions(-)
----------------------------------------------------------------------