Merge branch 'master' into kerberos

Conflicts:
        core/sqf/sql/scripts/sqcheck


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

Branch: refs/heads/master
Commit: db8c8655d582302679498d43e142406346a5fdc5
Parents: 18e404b 0e6728d
Author: Roberta Marton <[email protected]>
Authored: Tue Jun 14 22:21:08 2016 +0000
Committer: Roberta Marton <[email protected]>
Committed: Tue Jun 14 22:21:08 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |   2 +-
 Makefile                                        |   1 +
 RAT_README                                      |  16 +-
 README                                          |   4 +-
 core/Makefile                                   |  12 +-
 core/conn/jdbcT4/pom.xml                        |   7 +-
 .../jdbcT4/src/main/java/T4Messages.properties  |   4 +-
 core/conn/jdbc_type2/Makefile                   |   2 +-
 core/conn/jdbc_type2/build.xml                  |  11 +-
 core/conn/jdbc_type2/native/SQLMXDriver.cpp     |  38 +-
 core/conn/odbc/src/odbc/Makefile                |   8 +-
 .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp    |  59 ++
 core/conn/trafci/install/Installer.java         |   7 +-
 .../odbc/odbcclient/unixcli/makefile.lnx        |   8 +-
 .../odbc/odbcclient/unixcli/package/TRAFDSN     |   2 +-
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |   2 +
 .../unixcli/package/runconnect_test.sh          |  26 +
 core/dbsecurity/scripts/sqcertgen               |   5 -
 core/dbsecurity/scripts/update_auth             |   9 +-
 core/sqf/Makefile                               |   2 +
 core/sqf/samples/.gitignore                     |   4 +
 core/sqf/sqenvcom.sh                            |   1 -
 core/sqf/sql/scripts/dcscheck                   |  20 +-
 core/sqf/sql/scripts/install_traf_components    |   3 +-
 core/sqf/sql/scripts/sqcheck                    |  55 +-
 core/sqf/sqvers                                 |   2 +-
 core/sqf/src/seabed/test/t284.h                 |  52 +-
 core/sqf/src/seabed/test/t284cli.cpp            |   5 +
 core/sqf/src/seabed/test/t284cli.java           |  75 ++-
 core/sqf/src/seabed/test/t284clicom.h           |  58 ++
 core/sqf/src/seabed/test/t284lib.cpp            |  79 +++
 core/sqf/src/seabed/test/t284srv.cpp            | 250 ++++++++
 .../client/TrafParallelClientScanner.java.tmpl  |   7 +-
 .../transactional/TrxRegionEndpoint.java.tmpl   |  35 +-
 .../hbase/regionserver/transactional/IdTm.java  |  82 ++-
 core/sqf/src/seatrans/tm/hbasetmlib2/idtm.cpp   |  85 ++-
 .../src/seatrans/tm/hbasetmlib2/idtmclicom.h    |  70 +-
 core/sqf/src/seatrans/tm/hbasetmlib2/idtmjni.h  |  14 +
 .../trafodion/dtm/HBaseAuditControlPoint.java   |   4 +-
 .../java/org/trafodion/dtm/TmAuditTlog.java     | 101 ++-
 core/sqf/src/tm/idtmsrv.cpp                     | 350 +++++++++-
 core/sqf/src/tm/idtmsrv.h                       |  52 +-
 core/sql/arkcmp/CmpStatement.cpp                |  42 +-
 core/sql/bin/SqlciErrors.txt                    |   6 +-
 core/sql/cli/Cli.cpp                            |  49 +-
 core/sql/cli/CliExtern.cpp                      |   1 -
 core/sql/cli/Context.cpp                        |  90 ++-
 core/sql/cli/Context.h                          |   1 +
 core/sql/cli/ExSqlComp.cpp                      |  17 +-
 core/sql/cli/SessionDefaults.cpp                |   9 +-
 core/sql/cli/SessionDefaults.h                  |  13 +-
 core/sql/cli/sqlcli.h                           |   2 +
 core/sql/comexe/ComTdbExeUtil.cpp               |  29 +-
 core/sql/comexe/ComTdbExeUtil.h                 |  46 +-
 core/sql/comexe/ComTdbFastTransport.cpp         |   6 +-
 core/sql/comexe/ComTdbFastTransport.h           |   7 +-
 core/sql/comexe/ComTdbHdfsScan.cpp              |  62 +-
 core/sql/comexe/ComTdbHdfsScan.h                |  75 ++-
 core/sql/common/CharType.cpp                    |   4 +
 core/sql/common/CharType.h                      |   1 +
 core/sql/common/ComSmallDefs.h                  |   3 +
 core/sql/executor/ExExeUtil.h                   |  15 +-
 core/sql/executor/ExExeUtilCli.cpp              |   5 +-
 core/sql/executor/ExExeUtilGet.cpp              | 226 +++++--
 core/sql/executor/ExExeUtilLoad.cpp             |   2 +-
 core/sql/executor/ExExeUtilMisc.cpp             | 129 ++--
 core/sql/executor/ExFastTransport.cpp           | 117 +++-
 core/sql/executor/ExFastTransport.h             |   5 +
 core/sql/executor/ExHdfsScan.cpp                | 120 +++-
 core/sql/executor/ExHdfsScan.h                  |  13 +-
 core/sql/executor/hiveHook.cpp                  |  27 +-
 core/sql/exp/ExpErrorEnums.h                    |   1 +
 core/sql/exp/ExpLOB.cpp                         |  35 +-
 core/sql/exp/ExpLOB.h                           |  14 +-
 core/sql/exp/ExpLOBaccess.cpp                   | 294 +++++++--
 core/sql/exp/ExpLOBaccess.h                     |  81 ++-
 core/sql/exp/ExpLOBenums.h                      |   6 +-
 core/sql/exp/ExpLOBinterface.cpp                |  54 +-
 core/sql/exp/ExpLOBinterface.h                  |  10 +
 core/sql/generator/GenFastTransport.cpp         |  67 +-
 core/sql/generator/GenPreCode.cpp               |  41 +-
 core/sql/generator/GenRelExeUtil.cpp            |  20 +-
 core/sql/generator/GenRelScan.cpp               |  89 ++-
 core/sql/generator/Generator.cpp                |   3 +-
 core/sql/lib_mgmt/pom.xml                       |   2 +-
 core/sql/nskgmake/openssl_client/Makefile       |  80 ---
 core/sql/optimizer/BindRelExpr.cpp              | 146 +++--
 core/sql/optimizer/BindWA.h                     |   1 +
 core/sql/optimizer/HDFSHook.cpp                 |   6 +
 core/sql/optimizer/HDFSHook.h                   |  11 +
 core/sql/optimizer/ItemFunc.h                   |   5 +
 core/sql/optimizer/NAColumn.h                   |   2 +-
 core/sql/optimizer/NATable.cpp                  |  83 ++-
 core/sql/optimizer/NormRelExpr.cpp              |   4 +-
 core/sql/optimizer/RelExeUtil.cpp               |  39 +-
 core/sql/optimizer/RelExeUtil.h                 |   9 +-
 core/sql/optimizer/RelExpr.cpp                  |   2 +-
 core/sql/optimizer/RelFastTransport.cpp         |   2 +
 core/sql/optimizer/RelFastTransport.h           |  18 +-
 core/sql/optimizer/RelUpdate.h                  |   5 +
 core/sql/optimizer/ScanOptimizer.cpp            |   6 +
 core/sql/optimizer/hiveHook.h                   |  25 +-
 core/sql/parser/ElemDDLCol.cpp                  |   2 +-
 core/sql/parser/SqlParserGlobalsCmn.h           |  52 +-
 core/sql/parser/sqlparser.y                     |  33 +-
 core/sql/regress/core/EXPECTED162               |  22 +-
 core/sql/regress/executor/EXPECTED013.SB        |  42 +-
 core/sql/regress/executor/EXPECTED020           |   4 +
 core/sql/regress/executor/EXPECTED130           | 293 ++++++++-
 core/sql/regress/executor/EXPECTED140           | 317 +++++++---
 core/sql/regress/executor/FILTER140             |   4 +
 core/sql/regress/executor/TEST013               |   4 -
 core/sql/regress/executor/TEST130               |  50 +-
 core/sql/regress/executor/TEST130_argfile2      |   3 +
 core/sql/regress/executor/TEST140               |  94 ++-
 core/sql/regress/hive/EXPECTED001               |  22 +-
 core/sql/regress/hive/EXPECTED003               | 294 +++++----
 core/sql/regress/hive/EXPECTED004               | 240 +++----
 core/sql/regress/hive/EXPECTED005               | 212 +++++--
 core/sql/regress/hive/EXPECTED006               |  19 +-
 core/sql/regress/hive/EXPECTED015               |  71 +--
 core/sql/regress/hive/EXPECTED018               | 633 ++++++++++++-------
 core/sql/regress/hive/TEST003                   |  12 +-
 core/sql/regress/hive/TEST005                   |  48 +-
 core/sql/regress/hive/TEST005_a.hive.sql        |   8 +-
 core/sql/regress/hive/TEST006                   |   1 -
 core/sql/regress/hive/TEST015                   |   3 +-
 core/sql/regress/hive/TEST018                   |  58 +-
 .../hive/TEST018_create_hive_tables.hive        |  16 +-
 core/sql/regress/hive/tbl_type.data             |   2 +-
 core/sql/regress/privs1/EXPECTED133             | Bin 26383 -> 26390 bytes
 core/sql/regress/privs1/TEST133                 |   2 +-
 core/sql/regress/tools/runallsb                 |   2 +-
 core/sql/regress/tools/runregr_hive.ksh         |  39 +-
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDLauth.cpp          | 108 ++--
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        | 141 +++--
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |   9 +-
 core/sql/sqlcomp/DefaultConstants.h             |  14 +-
 core/sql/sqlcomp/NADefaults.h                   |   4 +-
 core/sql/sqlcomp/QCache.cpp                     |   4 +-
 core/sql/sqlcomp/nadefaults.cpp                 | 125 +++-
 core/sql/sqludr/sqludr.cpp                      |   6 +
 .../java/org/trafodion/sql/HBaseClient.java     |  17 +
 .../java/org/trafodion/sql/HBulkLoadClient.java |   3 +-
 .../java/org/trafodion/sql/udr/ColumnInfo.java  |   6 +
 core/sql/ustat/hs_const.h                       |   1 +
 core/sql/ustat/hs_globals.cpp                   | 145 +++--
 core/sql/ustat/hs_la.cpp                        |  36 +-
 core/sql/ustat/hs_la.h                          |  23 +-
 core/sql/ustat/hs_parser.cpp                    |  13 +
 dcs/pom.xml                                     |   8 +
 .../src/asciidoc/_chapters/sql_statements.adoc  |   3 +-
 docs/src/site/markdown/documentation.md         |  10 +-
 docs/src/site/markdown/download.md              | 161 ++---
 docs/src/site/markdown/release-notes-2-0-0.md   | 152 +++++
 docs/src/site/markdown/release-notes-2-0-1.md   |  40 ++
 docs/src/site/markdown/release-notes.md         |   4 +-
 install/Makefile                                |  18 +-
 install/installer/traf_cloudera_mods            |   1 -
 install/installer/traf_package_setup            |   2 +-
 install/installer/trafodion_install             |   5 +
 licenses/lic-clients-bin                        | 136 +---
 licenses/lic-server-bin                         | 560 +---------------
 licenses/lic-server-src                         |   3 +
 win-odbc64/odbcclient/drvr35/cconnect.cpp       |   9 +-
 166 files changed, 5537 insertions(+), 2746 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db8c8655/install/installer/traf_cloudera_mods
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/db8c8655/install/installer/trafodion_install
----------------------------------------------------------------------

Reply via email to