Return-Path: X-Original-To: apmail-trafodion-commits-archive@www.apache.org Delivered-To: apmail-trafodion-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C89D218DB0 for ; Thu, 18 Feb 2016 23:29:04 +0000 (UTC) Received: (qmail 25390 invoked by uid 500); 18 Feb 2016 23:29:04 -0000 Delivered-To: apmail-trafodion-commits-archive@trafodion.apache.org Received: (qmail 25362 invoked by uid 500); 18 Feb 2016 23:29:04 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 25353 invoked by uid 99); 18 Feb 2016 23:29:04 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2016 23:29:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 45A50C110F for ; Thu, 18 Feb 2016 23:29:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.226 X-Spam-Level: X-Spam-Status: No, score=-3.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id jEdXVxTCdRTs for ; Thu, 18 Feb 2016 23:29:01 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with SMTP id A903D5FB94 for ; Thu, 18 Feb 2016 23:29:00 +0000 (UTC) Received: (qmail 25039 invoked by uid 99); 18 Feb 2016 23:28:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Feb 2016 23:28:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ACECFE0AD3; Thu, 18 Feb 2016 23:28:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: amanda@apache.org To: commits@trafodion.incubator.apache.org Date: Thu, 18 Feb 2016 23:29:01 -0000 Message-Id: In-Reply-To: <2fba6464dea543629fceeb056c34992e@git.apache.org> References: <2fba6464dea543629fceeb056c34992e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/7] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/f54a60d5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/f54a60d5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/f54a60d5 Branch: refs/heads/master Commit: f54a60d509ff7d45432f5bf4b644628477f37ca6 Parents: 9cdd07b 152367d Author: Amanda Moran Authored: Thu Feb 18 19:44:32 2016 +0000 Committer: Amanda Moran Committed: Thu Feb 18 19:44:32 2016 +0000 ---------------------------------------------------------------------- .gitattributes | 2 - LICENSE | 4 + core/bldenvchk.sh | 2 +- .../java/org/trafodion/rest/ServerResource.java | 57 +- .../org/trafodion/rest/VersionResource.java | 25 +- core/sqf/Makefile | 6 +- core/sqf/export/lib/Parse/RecDescent.pm | 6009 ------------------ core/sqf/sqenvcom.sh | 8 +- core/sqf/sql/scripts/dcscheck | 10 +- core/sqf/sql/scripts/dcsstart | 4 +- .../transactional/TransactionManager.java | 50 +- core/sqf/src/seatrans/tm/hbasetmlib2/Makefile | 4 +- core/sql/bin/SqlciErrors.txt | 5 +- core/sql/common/str.cpp | 152 + core/sql/common/str.h | 3 + core/sql/executor/ExSequence.cpp | 2 + core/sql/executor/ExStats.cpp | 24 +- core/sql/executor/MdamPoint.cpp | 152 +- core/sql/executor/MdamPoint.h | 5 +- core/sql/exp/ExpAtp.cpp | 71 + core/sql/exp/ExpAtp.h | 9 + core/sql/exp/ExpCriDesc.cpp | 18 + core/sql/exp/ExpCriDesc.h | 3 + core/sql/exp/ExpSqlTupp.cpp | 12 + core/sql/exp/ExpSqlTupp.h | 4 + core/sql/exp/exp_tuple_desc.cpp | 22 + core/sql/exp/exp_tuple_desc.h | 3 + core/sql/optimizer/RelExeUtil.cpp | 7 + core/sql/parser/SqlParserAux.cpp | 4 + core/sql/parser/SqlParserAux.h | 1 + core/sql/parser/StmtDDLCreateRoutine.h | 4 + core/sql/parser/StmtDDLDropRoutine.h | 5 + core/sql/parser/sqlparser.y | 88 +- core/sql/regress/core/EXPECTEDRTS | 1227 ++-- core/sql/regress/hive/EXPECTED009 | 6 +- core/sql/regress/privs1/EXPECTED132 | 263 +- core/sql/regress/privs1/EXPECTED133 | 12 +- core/sql/regress/privs1/EXPECTED141 | Bin 92809 -> 113222 bytes core/sql/regress/privs1/TEST132 | 60 +- core/sql/regress/privs2/EXPECTED138 | 84 +- core/sql/regress/privs2/EXPECTED140 | 324 +- core/sql/regress/privs2/TEST140 | 2 +- core/sql/regress/seabase/EXPECTED002 | 146 +- core/sql/regress/seabase/EXPECTED026 | 34 +- core/sql/regress/seabase/FILTER002 | 1 + core/sql/regress/tools/runregr_core.ksh | 2 +- core/sql/regress/tools/runregr_privs1.ksh | 2 +- core/sql/sqlcomp/CmpDDLCatErrorCodes.h | 4 +- core/sql/sqlcomp/CmpSeabaseDDL.h | 9 + core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 33 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 16 +- core/sql/sqlcomp/CmpSeabaseDDLindex.cpp | 6 +- core/sql/sqlcomp/CmpSeabaseDDLmd.h | 11 + core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 10 +- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 521 +- core/sql/sqlcomp/PrivMgrMD.cpp | 14 +- core/sql/sqlcomp/nadefaults.cpp | 2 +- core/sql/ustat/hs_cli.cpp | 118 +- core/sql/ustat/hs_const.h | 1 + core/sql/ustat/hs_update.cpp | 9 + dcs/bin/stop-dcs.sh | 5 +- .../org/trafodion/dcs/server/ServerManager.java | 15 +- docs/client_install/pom.xml | 10 +- .../src/asciidoc/_chapters/about.adoc | 5 +- docs/client_install/src/asciidoc/index.adoc | 2 +- docs/command_interface/pom.xml | 11 +- .../src/asciidoc/_chapters/about.adoc | 2 + docs/install_guide/pom.xml | 226 - .../src/asciidoc/_chapters/about.adoc | 131 - .../src/asciidoc/_chapters/requirements.adoc | 96 - docs/install_guide/src/asciidoc/index.adoc | 64 - docs/messages_guide/pom.xml | 21 +- .../src/asciidoc/_chapters/about.adoc | 3 +- docs/odb_user/pom.xml | 10 +- docs/odb_user/src/asciidoc/_chapters/about.adoc | 3 +- docs/provisioning_guide/pom.xml | 289 + .../src/asciidoc/_chapters/about.adoc | 197 + .../src/asciidoc/_chapters/activate.adoc | 147 + .../src/asciidoc/_chapters/enable_security.adoc | 491 ++ .../src/asciidoc/_chapters/introduction.adoc | 466 ++ .../src/asciidoc/_chapters/prepare.adoc | 379 ++ .../src/asciidoc/_chapters/recipe_install.adoc | 29 + .../src/asciidoc/_chapters/recipe_upgrade.adoc | 30 + .../src/asciidoc/_chapters/requirements.adoc | 510 ++ .../src/asciidoc/_chapters/script_install.adoc | 511 ++ .../src/asciidoc/_chapters/script_remove.adoc | 118 + .../src/asciidoc/_chapters/script_upgrade.adoc | 442 ++ docs/provisioning_guide/src/asciidoc/index.adoc | 73 + docs/shared/trafodion-manuals.css | 2 +- docs/sql_reference/pom.xml | 12 +- .../src/asciidoc/_chapters/about.adoc | 3 +- docs/src/site/markdown/documentation.md | 6 + docs/src/site/markdown/download.md | 14 +- .../site/markdown/enable-secure-trafodion.md | 210 +- docs/src/site/markdown/index.md | 2 +- docs/src/site/markdown/install-preparation.md | 138 - docs/src/site/markdown/install-troubleshoot.md | 21 - docs/src/site/markdown/install.md | 202 - docs/src/site/markdown/ldapcheck.md | 28 +- docs/src/site/markdown/ldapconfigcheck.md | 36 +- docs/src/site/markdown/port-assignment.md | 134 - docs/src/site/markdown/uninstall.md | 176 - .../site/resources/images/logos/egg-logo.gif | Bin 3296 -> 0 bytes .../site/resources/images/logos/egg-logo.png | Bin 0 -> 7241 bytes docs/src/site/site.xml | 33 +- licenses/LICENSE-bsd4 | 3 + licenses/LICENSE-jquery | 1 + licenses/LICENSE-js | 1 + pom.xml | 46 +- 109 files changed, 5889 insertions(+), 9157 deletions(-) ----------------------------------------------------------------------