Fixes for regression tests and expected files
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/4528a100 Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/4528a100 Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/4528a100 Branch: refs/heads/master Commit: 4528a10009f8f704c8516d1f42a7451ae7deafe6 Parents: 8058e14 Author: Sandhya Sundaresan <[email protected]> Authored: Wed Nov 7 19:41:43 2018 +0000 Committer: Sandhya Sundaresan <[email protected]> Committed: Wed Nov 7 19:41:43 2018 +0000 ---------------------------------------------------------------------- core/sql/optimizer/UdfDllInteraction.cpp | 2 +- core/sql/regress/compGeneral/EXPECTED072 | 20 +-- core/sql/regress/executor/EXPECTED130 | 108 +++++++-------- core/sql/regress/privs2/EXPECTED143 | 173 +++++++++++++++++++++++++ core/sql/regress/privs2/TEST143 | 95 ++++++++++++++ core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 7 +- 6 files changed, 328 insertions(+), 77 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/4528a100/core/sql/optimizer/UdfDllInteraction.cpp ---------------------------------------------------------------------- diff --git a/core/sql/optimizer/UdfDllInteraction.cpp b/core/sql/optimizer/UdfDllInteraction.cpp index b7444cb..368a477 100644 --- a/core/sql/optimizer/UdfDllInteraction.cpp +++ b/core/sql/optimizer/UdfDllInteraction.cpp @@ -161,7 +161,7 @@ NABoolean TMUDFDllInteraction::describeParamsAndMaxOutputs( NAString cachedFullName = cachedLibPath+"/"+cachedLibName; char errString[200]; NAString errNAString; - sprintf(errString , "Error %d creating directory :",err); + sprintf(errString , "Error %d creating directory :",errno); errNAString = errString; errNAString += cachedFullName; *CmpCommon::diags() << DgSqlCode(-4316) http://git-wip-us.apache.org/repos/asf/trafodion/blob/4528a100/core/sql/regress/compGeneral/EXPECTED072 ---------------------------------------------------------------------- diff --git a/core/sql/regress/compGeneral/EXPECTED072 b/core/sql/regress/compGeneral/EXPECTED072 index 9a0fb32..f52da89 100644 --- a/core/sql/regress/compGeneral/EXPECTED072 +++ b/core/sql/regress/compGeneral/EXPECTED072 @@ -237,7 +237,7 @@ COMMENT ON COLUMN TRAFODION.T072SCH_COMMENT.T072VIEW1.COL3 IS --- SQL operation complete. >>showddl library t072sch_comment.t072ddl; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS @@ -245,7 +245,7 @@ COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS --- SQL operation complete. >>showddl library t072sch_comment.t072jar; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR IS @@ -501,7 +501,7 @@ COMMENT ON COLUMN TRAFODION.T072SCH_COMMENT.T072VIEW1.COL3 IS --- SQL operation complete. >>showddl library t072sch_comment.t072ddl; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS @@ -509,7 +509,7 @@ COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS --- SQL operation complete. >>showddl library t072sch_comment.t072jar; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR IS @@ -687,7 +687,7 @@ COMMENT ON INDEX TRAFODION.T072SCH_COMMENT.T072IDX1 IS --- SQL operation complete. >>showddl library t072sch_comment.t072ddl; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS @@ -695,7 +695,7 @@ COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS --- SQL operation complete. >>showddl library t072sch_comment.t072jar; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR IS @@ -860,7 +860,7 @@ COMMENT ON COLUMN TRAFODION.T072SCH_COMMENT.T072T1.COL5 IS --- SQL operation complete. >>showddl library t072sch_comment.t072ddl; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS @@ -868,7 +868,7 @@ COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS --- SQL operation complete. >>showddl library t072sch_comment.t072jar; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar' ; --- SQL operation complete. @@ -1058,7 +1058,7 @@ COMMENT ON COLUMN TRAFODION.T072SCH_COMMENT.T072T1.COL5 IS --- SQL operation complete. >>showddl library t072sch_comment.t072ddl; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE '$rundir/compGeneral/TEST072.dll' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL FILE 'TEST072.dll' ; COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS @@ -1066,7 +1066,7 @@ COMMENT ON LIBRARY TRAFODION.T072SCH_COMMENT.T072DDL IS --- SQL operation complete. >>showddl library t072sch_comment.t072jar; -CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE '$rundir/compGeneral/TEST072.jar' +CREATE LIBRARY TRAFODION.T072SCH_COMMENT.T072JAR FILE 'TEST072.jar' ; --- SQL operation complete.
