update
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fcc02bc9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fcc02bc9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fcc02bc9 Branch: refs/heads/master Commit: fcc02bc909db81460615241ba5ebc058808c4242 Parents: 1af3985 Author: mashengchen <[email protected]> Authored: Wed Mar 23 08:50:00 2016 +0000 Committer: mashengchen <[email protected]> Committed: Wed Mar 23 08:50:00 2016 +0000 ---------------------------------------------------------------------- core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fcc02bc9/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp ---------------------------------------------------------------------- diff --git a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp index b01b580..158ab70 100644 --- a/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp +++ b/core/sql/sqlcomp/CmpSeabaseDDLschema.cpp @@ -61,7 +61,7 @@ static bool dropOneTable( const char * schemaName, const char * objectName, bool isVolatile, - bool ifExists, +// bool ifExists, bool ddlXns); static bool transferObjectPrivs( @@ -553,7 +553,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode) dirtiedMetadata = TRUE; if (dropOneTable(cliInterface,(char*)catName.data(), (char*)schName.data(),(char*)objName.data(), - isVolatile, FALSE,dropSchemaNode->ddlXns())) + isVolatile ,dropSchemaNode->ddlXns())) someObjectsCouldNotBeDropped = true; } } @@ -679,7 +679,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode) dirtiedMetadata = TRUE; if (dropOneTable(cliInterface,(char*)catName.data(), (char*)schName.data(),(char*)objName.data(), - isVolatile, FALSE,dropSchemaNode->ddlXns())) + isVolatile, dropSchemaNode->ddlXns())) someObjectsCouldNotBeDropped = true; } } @@ -709,7 +709,7 @@ void CmpSeabaseDDL::dropSeabaseSchema(StmtDDLDropSchema * dropSchemaNode) // happen to have the same name patterns. if (dropOneTable(cliInterface,(char*)catName.data(), (char*)schName.data(),(char*)objName.data(), - isVolatile,TRUE, dropSchemaNode->ddlXns())) + isVolatile, dropSchemaNode->ddlXns())) someObjectsCouldNotBeDropped = true; } } @@ -1221,7 +1221,7 @@ static bool dropOneTable( const char * schemaName, const char * objectName, bool isVolatile, - bool ifExists, +// bool ifExists, bool ddlXns) { @@ -1239,8 +1239,8 @@ Lng32 cliRC = 0; if (isVolatile) strcpy(volatileString,"VOLATILE"); - if (ifExists) - strcpy(ifExistsString,"IF EXISTS"); +// if (ifExists) +// strcpy(ifExistsString,"IF EXISTS"); if (ComIsTrafodionExternalSchemaName(schemaName)) str_sprintf(buf,"DROP EXTERNAL TABLE \"%s\" FOR \"%s\".\"%s\".\"%s\" CASCADE", @@ -1266,8 +1266,8 @@ ULng32 savedParserFlags = Get_SqlParser_Flags(0xFFFFFFFF); } // Restore parser flags settings to what they originally were - Set_SqlParser_Flags(INTERNAL_QUERY_FROM_EXEUTIL); - + Assign_SqlParser_Flags(savedParserFlags); + if (cliRC < 0 && cliRC != -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION) someObjectsCouldNotBeDropped = true;
