You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2016/03/17 02:54:14 UTC

[9/9] incubator-trafodion git commit: Merge [TRAFODION-1849] PR-381

Merge [TRAFODION-1849] PR-381


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

Branch: refs/heads/master
Commit: 616961db5e877975d5e31bd61be8ad637737ce1b
Parents: 2a9e9f2 71cd5ce
Author: Anoop Sharma <an...@edev06.esgyn.local>
Authored: Thu Mar 17 01:53:21 2016 +0000
Committer: Anoop Sharma <an...@edev06.esgyn.local>
Committed: Thu Mar 17 01:53:21 2016 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |    2 +-
 core/sql/cli/Cli.cpp                            |    3 +-
 core/sql/comexe/ComQueue.h                      |    2 +-
 core/sql/comexe/ComTdb.h                        |    1 +
 core/sql/common/ComMisc.cpp                     |    1 -
 core/sql/common/NAString.cpp                    |   23 +
 core/sql/common/NAString.h                      |    3 +
 core/sql/common/OperTypeEnum.h                  |    1 +
 core/sql/generator/Generator.cpp                |   10 +-
 core/sql/optimizer/BindItemExpr.cpp             |   16 +-
 core/sql/optimizer/NAFileSet.cpp                |    2 +
 core/sql/optimizer/NAFileSet.h                  |    7 +
 core/sql/optimizer/NATable.cpp                  |   24 +-
 core/sql/optimizer/NATable.h                    |    3 +-
 core/sql/optimizer/RelExeUtil.cpp               |    7 +-
 core/sql/parser/ElemDDLNode.cpp                 |    6 +
 core/sql/parser/ElemDDLNode.h                   |    3 +
 .../sql/parser/StmtDDLAlterTableAlterColumn.cpp |   39 +-
 core/sql/parser/StmtDDLAlterTableAlterColumn.h  |   40 +-
 core/sql/parser/sqlparser.y                     |   19 +-
 core/sql/regress/charsets/DIFF012.KNOWN.SB      |    2 +-
 core/sql/regress/charsets/EXPECTED002           |    9 +-
 core/sql/regress/charsets/EXPECTED003           |   11 +-
 core/sql/regress/charsets/EXPECTED012           |   19 +-
 core/sql/regress/core/EXPECTED001.SB            |    6 +-
 core/sql/regress/core/EXPECTED037.SB            |   14 +-
 core/sql/regress/core/EXPECTED061.SB            |   13 +-
 core/sql/regress/core/EXPECTED116               |  149 +-
 core/sql/regress/core/TEST116                   |   11 +-
 core/sql/regress/executor/EXPECTED001           |   80 +-
 core/sql/regress/executor/EXPECTED013.SB        |   59 +-
 core/sql/regress/executor/EXPECTED014.SB        |   73 +-
 core/sql/regress/executor/EXPECTED016.SB        |   10 +-
 core/sql/regress/executor/EXPECTED122           |   20 +-
 core/sql/regress/hive/EXPECTED009               |    7 +
 core/sql/regress/hive/EXPECTED017               |    3 +
 core/sql/regress/privs1/EXPECTED132             |   96 +-
 core/sql/regress/seabase/EXPECTED010            |  394 +++---
 core/sql/regress/seabase/EXPECTED011            |   16 +-
 core/sql/regress/seabase/EXPECTED012            |    5 +-
 core/sql/regress/seabase/EXPECTED020            |   19 +-
 core/sql/regress/seabase/EXPECTED022            |   12 +-
 core/sql/regress/seabase/EXPECTED025            |    7 +-
 core/sql/regress/seabase/EXPECTED027            |  435 +++++-
 core/sql/regress/seabase/TEST020                |    1 +
 core/sql/regress/seabase/TEST027                |   66 +-
 core/sql/sqlcat/desc.h                          |    1 +
 core/sql/sqlcomp/CmpDescribe.cpp                |   30 +-
 core/sql/sqlcomp/CmpDescribe.h                  |    2 -
 core/sql/sqlcomp/CmpSeabaseDDL.h                |   70 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   72 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         | 1297 ++++++++++++++----
 core/sql/sqlcomp/nadefaults.cpp                 |   28 +-
 53 files changed, 2444 insertions(+), 805 deletions(-)
----------------------------------------------------------------------