Merge remote branch 'origin/master' into ddlxns2_br
Conflicts:
core/sql/generator/GenRelDCL.cpp
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/3ccf480c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/3ccf480c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/3ccf480c
Branch: refs/heads/master
Commit: 3ccf480c196d85a1b16b1afdb648b63907c4d930
Parents: 8f687dd 0dc85c0
Author: Anoop Sharma <[email protected]>
Authored: Tue Apr 26 23:02:15 2016 +0000
Committer: Anoop Sharma <[email protected]>
Committed: Tue Apr 26 23:02:15 2016 +0000
----------------------------------------------------------------------
README | 2 +-
core/sql/bin/SqlciErrors.txt | 1 +
core/sql/executor/ex_transaction.cpp | 7 +-
core/sql/exp/ExpErrorEnums.h | 1 +
core/sql/generator/GenPreCode.cpp | 2 +
core/sql/generator/GenRelDCL.cpp | 3 +
core/sql/regress/seabase/EXPECTED010 | 376 +++++++++++++++---------------
7 files changed, 201 insertions(+), 191 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3ccf480c/core/sql/bin/SqlciErrors.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/3ccf480c/core/sql/generator/GenPreCode.cpp
----------------------------------------------------------------------
diff --cc core/sql/generator/GenPreCode.cpp
index f8ff808,1591e9a..5ab0359
--- a/core/sql/generator/GenPreCode.cpp
+++ b/core/sql/generator/GenPreCode.cpp
@@@ -2838,9 -2838,9 +2838,11 @@@ short DDLExpr::ddlXnsInfo(NABoolean &is
// committed in the called methods.
if ((ddlXns()) &&
(
+ (initHbase()) ||
+ (dropHbase()) ||
(purgedataHbase()) ||
+ (initHbase()) ||
+ (dropHbase()) ||
(initAuthorization()) ||
(dropAuthorization()) ||
(upgradeRepos())
