You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2016/03/09 19:44:08 UTC
[10/11] incubator-trafodion git commit: Removing change to ignore
error on drop. This causes inconsistencies in some instances like "drop
schema cascade".Will rework with JIRA-1883.
Removing change to ignore error on drop. This causes inconsistencies in some instances like "drop schema cascade".Will rework with JIRA-1883.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/0ba0df93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/0ba0df93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/0ba0df93
Branch: refs/heads/master
Commit: 0ba0df936ecd881a81aeea5bc31bd7643ed8ec11
Parents: f3cbc3c
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed Mar 9 00:47:25 2016 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed Mar 9 00:47:25 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Cli.cpp | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/0ba0df93/core/sql/cli/Cli.cpp
----------------------------------------------------------------------
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index 145b42f..82f1f19 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -9572,8 +9572,7 @@ Lng32 SQLCLI_LOBcliInterface
cliRC = cliInterface->executeImmediate(query);
currContext.resetSqlParserFlags(0x1);
- if (cliRC == -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION)
- cliRC = 0;
+
if (cliRC < 0)
{
cliInterface->retrieveSQLDiagnostics(myDiags);
@@ -9591,8 +9590,6 @@ Lng32 SQLCLI_LOBcliInterface
currContext.resetSqlParserFlags(0x1);
- if (cliRC == -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION)
- cliRC = 0;
if (cliRC < 0)
{
@@ -9622,11 +9619,6 @@ Lng32 SQLCLI_LOBcliInterface
if (cliRC < 0)
{
cliInterface->retrieveSQLDiagnostics(myDiags);
- if (myDiags->containsError(-CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION))
- {
- cliRC = 0;
- break;
- }
goto error_return;
}
@@ -9643,11 +9635,6 @@ Lng32 SQLCLI_LOBcliInterface
if (cliRC < 0)
{
cliInterface->retrieveSQLDiagnostics(myDiags);
- if (myDiags->containsError(-CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION))
- {
- cliRC = 0;
- break;
- }
goto error_return;
}
cliRC = 0;
@@ -10685,8 +10672,7 @@ Lng32 SQLCLI_LOBddlInterface
cliRC = cliInterface->executeImmediate(query);
currContext.resetSqlParserFlags(0x1);
- if (cliRC == -CAT_OBJECT_DOES_NOT_EXIST_IN_TRAFODION)
- cliRC = 0;
+
if (cliRC < 0)
{
cliInterface->retrieveSQLDiagnostics(&diags);