You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2018/05/30 17:30:45 UTC
[1/3] trafodion git commit: fix JIRA bug 3039,
SendEventMsg is used in a wrong way
Repository: trafodion
Updated Branches:
refs/heads/master b04bfda91 -> 0f5f8a7a3
fix JIRA bug 3039, SendEventMsg is used in a wrong way
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/cdd1e324
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/cdd1e324
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/cdd1e324
Branch: refs/heads/master
Commit: cdd1e324e3cddbd4f52b06ea7c6556f4a2940a47
Parents: b06e0dc
Author: Kenny <xi...@esgyn.cn>
Authored: Mon Apr 23 07:13:38 2018 +0000
Committer: Kenny <xi...@esgyn.cn>
Committed: Mon Apr 23 07:13:38 2018 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/cdd1e324/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
index 423b0a6..9936969 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -6533,6 +6533,8 @@ odbc_SQLSrvr_ExtractLob_sme_(
if (retcode == SQL_ERROR)
{
ERROR_DESC_def *p_buffer = QryLobExtractSrvrStmt->sqlError.errorList._buffer;
+ char errNumStr[128];
+ sprintf(errNumStr, "%d", p_buffer->sqlcode);
strncpy(RequestError, p_buffer->errorText, sizeof(RequestError) - 1);
SendEventMsg(MSG_SQL_ERROR,
@@ -6541,7 +6543,7 @@ odbc_SQLSrvr_ExtractLob_sme_(
ODBCMX_SERVER,
srvrGlobal->srvrObjRef,
2,
- p_buffer->sqlcode,
+ errNumStr,
RequestError);
exception_->exception_nr = odbc_SQLsrvr_ExtractLob_ParamError_exn_;
@@ -6616,6 +6618,9 @@ odbc_SQLSrvr_UpdateLob_sme_(
if (retcode == SQL_ERROR)
{
ERROR_DESC_def * p_buffer = QryLobUpdateSrvrStmt->sqlError.errorList._buffer;
+ char errNumStr[128];
+ sprintf(errNumStr, "%d", p_buffer->sqlcode);
+
strncpy(RequestError, p_buffer->errorText, sizeof(RequestError) - 1);
SendEventMsg(MSG_SQL_ERROR,
@@ -6624,7 +6629,7 @@ odbc_SQLSrvr_UpdateLob_sme_(
ODBCMX_SERVER,
srvrGlobal->srvrObjRef,
2,
- p_buffer->sqlcode,
+ errNumStr,
RequestError);
exception_->exception_nr = odbc_SQLSvc_UpdateLob_ParamError_exn_;
exception_->u.SQLError.errorList._length = QryLobUpdateSrvrStmt->sqlError.errorList._length;
[2/3] trafodion git commit: fix JIRA bug 3039,
SendEventMsg is used in a wrong way
Posted by db...@apache.org.
fix JIRA bug 3039, SendEventMsg is used in a wrong way
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/4f253964
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/4f253964
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/4f253964
Branch: refs/heads/master
Commit: 4f253964411e95fd0b0122b386293efd42e276fd
Parents: cdd1e32
Author: Kenny <xi...@esgyn.cn>
Authored: Tue May 29 01:51:46 2018 +0000
Committer: Kenny <xi...@esgyn.cn>
Committed: Tue May 29 01:51:46 2018 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/4f253964/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
index 9936969..b4ca5c4 100644
--- a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
+++ b/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp
@@ -5242,6 +5242,8 @@ odbc_SQLSvc_GetSQLCatalogs_sme_(
if (retcode == SQL_ERROR)
{
ERROR_DESC_def *p_buffer = QryCatalogSrvrStmt->sqlError.errorList._buffer;
+ char errNumStr[128] = {0};
+ sprintf(errNumStr, "%d", (int)p_buffer->sqlcode);
strncpy(RequestError, p_buffer->errorText,sizeof(RequestError) -1);
RequestError[sizeof(RequestError) - 1] = '\0';
@@ -5251,7 +5253,7 @@ odbc_SQLSvc_GetSQLCatalogs_sme_(
ODBCMX_SERVER,
srvrGlobal->srvrObjRef,
2,
- p_buffer->sqlcode,
+ errNumStr,
RequestError);
exception_->exception_nr = odbc_SQLSvc_GetSQLCatalogs_ParamError_exn_;
@@ -6533,8 +6535,8 @@ odbc_SQLSrvr_ExtractLob_sme_(
if (retcode == SQL_ERROR)
{
ERROR_DESC_def *p_buffer = QryLobExtractSrvrStmt->sqlError.errorList._buffer;
- char errNumStr[128];
- sprintf(errNumStr, "%d", p_buffer->sqlcode);
+ char errNumStr[128] = {0};
+ sprintf(errNumStr, "%d", (int)p_buffer->sqlcode);
strncpy(RequestError, p_buffer->errorText, sizeof(RequestError) - 1);
SendEventMsg(MSG_SQL_ERROR,
@@ -6618,8 +6620,8 @@ odbc_SQLSrvr_UpdateLob_sme_(
if (retcode == SQL_ERROR)
{
ERROR_DESC_def * p_buffer = QryLobUpdateSrvrStmt->sqlError.errorList._buffer;
- char errNumStr[128];
- sprintf(errNumStr, "%d", p_buffer->sqlcode);
+ char errNumStr[128] = {0};
+ sprintf(errNumStr, "%d", (int)p_buffer->sqlcode);
strncpy(RequestError, p_buffer->errorText, sizeof(RequestError) - 1);
[3/3] trafodion git commit: Merge [TRAFODION-3039] PR 1582 Fix issue
with SendEventMsg calls
Posted by db...@apache.org.
Merge [TRAFODION-3039] PR 1582 Fix issue with SendEventMsg calls
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/0f5f8a7a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/0f5f8a7a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/0f5f8a7a
Branch: refs/heads/master
Commit: 0f5f8a7a3e26cce335f6469b53201282b0fea35a
Parents: b04bfda 4f25396
Author: Dave Birdsall <db...@apache.org>
Authored: Wed May 30 17:30:13 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Wed May 30 17:30:13 2018 +0000
----------------------------------------------------------------------
core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------