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/09/25 23:13:26 UTC

[13/13] incubator-trafodion git commit: Merge remote branch 'origin/pr/89/head' into mrg_54

Merge remote branch 'origin/pr/89/head' into mrg_54


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

Branch: refs/heads/master
Commit: 0a8da29871c7ed9c7feccc54791a8fb40c01eb92
Parents: 079056f 5b5e8f3
Author: Suresh Subbiah <su...@apache.org>
Authored: Fri Sep 25 21:12:21 2015 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Fri Sep 25 21:12:21 2015 +0000

----------------------------------------------------------------------
 core/sql/cli/Cli.cpp                       |    5 +-
 core/sql/cli/Cli.h                         |    3 +-
 core/sql/cli/CliExtern.cpp                 |    5 +-
 core/sql/comexe/ComTdbExeUtil.h            |    8 +-
 core/sql/executor/ExExeUtil.h              |    4 +-
 core/sql/executor/ExExeUtilLoad.cpp        |  134 +--
 core/sql/exp/ExpLOB.cpp                    |   42 +-
 core/sql/exp/ExpLOB.h                      |   13 +-
 core/sql/exp/ExpLOBaccess.cpp              | 1235 +++++++++++++----------
 core/sql/exp/ExpLOBaccess.h                |   51 +-
 core/sql/exp/ExpLOBenums.h                 |    9 +
 core/sql/exp/ExpLOBexternal.h              |    3 +-
 core/sql/exp/ExpLOBinterface.cpp           |   42 +-
 core/sql/exp/ExpLOBinterface.h             |   25 +-
 core/sql/generator/GenItemFunc.cpp         |    2 +
 core/sql/generator/GenRelExeUtil.cpp       |    6 +-
 core/sql/optimizer/ItemFunc.h              |   11 +-
 core/sql/optimizer/NATable.cpp             |    2 +-
 core/sql/optimizer/RelExeUtil.h            |    4 +-
 core/sql/parser/sqlparser.y                |   41 +-
 core/sql/regress/executor/EXPECTED130      |  435 +++++++-
 core/sql/regress/executor/TEST130          |  307 +++++-
 core/sql/regress/executor/anoush.jpg       |  Bin 0 -> 230150 bytes
 core/sql/regress/executor/deep.jpg         |  Bin 0 -> 159018 bytes
 core/sql/regress/executor/lob_input_a1.txt |    1 +
 core/sql/regress/executor/lob_input_b1.txt |    1 +
 core/sql/regress/executor/lob_input_c1.txt |    1 +
 core/sql/regress/executor/lob_input_d1.txt |    4 +
 core/sql/regress/executor/lob_input_e1.txt |    4 +
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp  |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp    |   12 +-
 core/sql/sqlcomp/DefaultConstants.h        |    3 +-
 core/sql/sqlcomp/nadefaults.cpp            |   14 +-
 33 files changed, 1659 insertions(+), 770 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a8da298/core/sql/optimizer/NATable.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0a8da298/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------