Fix for the check PR failures with commit ba2f69cc9fa7ca7e2264068fd2c39ecd0a128c94
diff --git a/core/sqf/src/tm/tmtx.cpp b/core/sqf/src/tm/tmtx.cpp
index 28d341b..6bbf325 100644
--- a/core/sqf/src/tm/tmtx.cpp
+++ b/core/sqf/src/tm/tmtx.cpp
@@ -298,12 +298,6 @@
case XA_OK:
{
iv_tx_state = TM_TX_STATE_FORGETTING;
- if (pp_msg->replyPending())
- // For HBase branches we need to reply here if there were no other branches.
- // This is the early reply for commit. However, we still need to wait for the
- // HBase library to complete commit processing before we can forget the transaction.
- pp_msg->reply(FEOK);
- // Now wait for the HBase library to complete it's work.
lv_error = branches()->completeRequest_branches(this);
break;
}
diff --git a/core/sql/cli/Cli.cpp b/core/sql/cli/Cli.cpp
index fd59639..b4f16d3 100644
--- a/core/sql/cli/Cli.cpp
+++ b/core/sql/cli/Cli.cpp
@@ -10561,7 +10561,7 @@
cliRC = cqdCliInterface->beginWork();
if (cliRC < 0)
{
- if (myDiags != NULL)
+ if (myDiags == NULL)
myDiags = ComDiagsArea::allocate(exHeap);
cqdCliInterface->retrieveSQLDiagnostics(myDiags);
diags.mergeAfter(*myDiags);
diff --git a/core/sql/executor/ExExeUtilCli.cpp b/core/sql/executor/ExExeUtilCli.cpp
index 434e4dd..5928088 100644
--- a/core/sql/executor/ExExeUtilCli.cpp
+++ b/core/sql/executor/ExExeUtilCli.cpp
@@ -2087,7 +2087,7 @@
Lng32 ExeCliInterface::commitWork()
{
- return executeImmediate("commit work waited;");
+ return executeImmediate("commit work;");
}
Lng32 ExeCliInterface::rollbackWork()
diff --git a/core/sql/sqlci/SqlciCmd.cpp b/core/sql/sqlci/SqlciCmd.cpp
index 621022f..fa0f3d1 100644
--- a/core/sql/sqlci/SqlciCmd.cpp
+++ b/core/sql/sqlci/SqlciCmd.cpp
@@ -634,7 +634,7 @@
{
case 'y':
case 'Y':
- SqlCmd::executeQuery("COMMIT WORK WAITED;", sqlci_env);
+ SqlCmd::executeQuery("COMMIT WORK;", sqlci_env);
sqlci_env->get_logfile()->WriteAll("Transaction committed."); //##I18N
retval = -1;
break;
