Repository: trafodion Updated Branches: refs/heads/master a6512c05c -> 66499100c
http://git-wip-us.apache.org/repos/asf/trafodion/blob/6f0f102a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp index b28d2cf..29ef68e 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp +++ b/core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp @@ -1597,9 +1597,9 @@ short CmpSeabaseDDL::createSeabaseLibmgr(ExeCliInterface * cliInterface) Lng32 cliRC = 0; if ((CmpCommon::context()->isUninitializedSeabase()) && - (CmpCommon::context()->uninitializedSeabaseErrNum() == -1393)) + (CmpCommon::context()->uninitializedSeabaseErrNum() == -TRAF_NOT_INITIALIZED)) { - *CmpCommon::diags() << DgSqlCode(-1393); + *CmpCommon::diags() << DgSqlCode(-TRAF_NOT_INITIALIZED); return -1; } http://git-wip-us.apache.org/repos/asf/trafodion/blob/6f0f102a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp index f422b2d..4fafe44 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp +++ b/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp @@ -13595,7 +13595,7 @@ TrafDesc * CmpSeabaseDDL::getSeabaseTableDesc(const NAString &catName, if ((CmpCommon::context()->isUninitializedSeabase()) && (!Get_SqlParser_Flags(INTERNAL_QUERY_FROM_EXEUTIL))) { - if (CmpCommon::context()->uninitializedSeabaseErrNum() == -1398) + if (CmpCommon::context()->uninitializedSeabaseErrNum() == -TRAF_HBASE_ACCESS_ERROR) *CmpCommon::diags() << DgSqlCode(CmpCommon::context()->uninitializedSeabaseErrNum()) << DgInt0(CmpCommon::context()->hbaseErrNum()) << DgString0(CmpCommon::context()->hbaseErrStr()); @@ -13643,7 +13643,7 @@ TrafDesc * CmpSeabaseDDL::getSeabaseTableDesc(const NAString &catName, if ((CmpCommon::context()->isUninitializedSeabase()) && (!Get_SqlParser_Flags(INTERNAL_QUERY_FROM_EXEUTIL))) { - if (CmpCommon::context()->uninitializedSeabaseErrNum() == -1398) + if (CmpCommon::context()->uninitializedSeabaseErrNum() == -TRAF_HBASE_ACCESS_ERROR) *CmpCommon::diags() << DgSqlCode(CmpCommon::context()->uninitializedSeabaseErrNum()) << DgInt0(CmpCommon::context()->hbaseErrNum()) << DgString0(CmpCommon::context()->hbaseErrStr()); http://git-wip-us.apache.org/repos/asf/trafodion/blob/6f0f102a/core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp b/core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp index 6556d7e..eb68813 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp +++ b/core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp @@ -525,7 +525,7 @@ short CmpSeabaseMDupgrade::executeSeabaseMDupgrade(CmpDDLwithStatusInfo *mdui, deallocEHI(ehi); if ((retcode == 0) || - (retcode == -1393) || + (retcode == -TRAF_NOT_INITIALIZED) || (retcode == -1395)) { // no version mismatch detected between system and expected software. @@ -985,12 +985,12 @@ short CmpSeabaseMDupgrade::executeSeabaseMDupgrade(CmpDDLwithStatusInfo *mdui, // // initialize trafodion CmpCommon::context()->setIsUninitializedSeabase(TRUE); - CmpCommon::context()->uninitializedSeabaseErrNum() = -1393; // MD doesn't exist + CmpCommon::context()->uninitializedSeabaseErrNum() = -TRAF_NOT_INITIALIZED; // MD doesn't exist // Use "initialize trafodion, minimal" so we only create the metadata // tables. The other tables (repository and privilege manager) already // exist; we will upgrade them later in this method. - str_sprintf(buf, "initialize trafodion, minimal;"); + str_sprintf(buf, "initialize trafodion, minimal, no return status;"); cliRC = cliInterface.executeImmediate(buf); if (cliRC < 0) http://git-wip-us.apache.org/repos/asf/trafodion/blob/6f0f102a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp index 0b8372c..49e0bf9 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLview.cpp +++ b/core/sql/sqlcomp/CmpSeabaseDDLview.cpp @@ -1612,7 +1612,6 @@ short CmpSeabaseDDL::dropMetadataViews(ExeCliInterface * cliInterface) return 0; } - // ***************************************************************************** // * * // * Function: checkAccessPrivileges *
