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/07/19 16:09:18 UTC
[05/13] incubator-trafodion git commit: remove other jira changes
remove other jira changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/443b0c4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/443b0c4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/443b0c4a
Branch: refs/heads/master
Commit: 443b0c4abfcb8a4493deecb805b76568d8d1ed74
Parents: 6d08029
Author: traf <tr...@aven01.novalocal>
Authored: Thu Jun 30 10:08:32 2016 +0000
Committer: traf <tr...@aven01.novalocal>
Committed: Thu Jun 30 10:08:32 2016 +0000
----------------------------------------------------------------------
core/conn/jdbc_type2/native/CoreCommon.h | 2 --
core/conn/jdbc_type2/native/SQLMXConnection.cpp | 14 --------------
core/conn/jdbc_type2/native/SrvrOthers.cpp | 9 ---------
3 files changed, 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/443b0c4a/core/conn/jdbc_type2/native/CoreCommon.h
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/CoreCommon.h b/core/conn/jdbc_type2/native/CoreCommon.h
index c131173..92fc1c8 100644
--- a/core/conn/jdbc_type2/native/CoreCommon.h
+++ b/core/conn/jdbc_type2/native/CoreCommon.h
@@ -440,8 +440,6 @@ typedef struct _SRVR_GLOBAL_Def
#define CLEAR_SCHEMA 1013
#define CQD_DOOM_USER_TXN 1014
#define CQD_PCODE_OFF 1015
-#define BEGIN_SESSION 1016
-#define END_SESSION 1017
typedef struct tagDATE_TYPE
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/443b0c4a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SQLMXConnection.cpp b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
index e8fd2d1..b2d5ae4 100644
--- a/core/conn/jdbc_type2/native/SQLMXConnection.cpp
+++ b/core/conn/jdbc_type2/native/SQLMXConnection.cpp
@@ -591,20 +591,6 @@ JNIEXPORT void JNICALL Java_org_trafodion_jdbc_t2_SQLMXConnection_connectInit
}
- odbc_SQLSvc_SetConnectionOption_sme_(NULL, NULL,
- &setConnectException,
- dialogueId,
- BEGIN_SESSION,
- 0,
- NULL,
- &sqlWarning);
- if (setConnectException.exception_nr != CEE_SUCCESS)
- {
- throwSetConnectionException(jenv, &setConnectException);
- FUNCTION_RETURN_VOID(("BEGIN_SESSION - setConnectException.exception_nr(%s) is not CEE_SUCCESS",
- CliDebugSqlError(setConnectException.exception_nr)));
- }
-
if(blnDoomUsrTxn)
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/443b0c4a/core/conn/jdbc_type2/native/SrvrOthers.cpp
----------------------------------------------------------------------
diff --git a/core/conn/jdbc_type2/native/SrvrOthers.cpp b/core/conn/jdbc_type2/native/SrvrOthers.cpp
index 08d8a7c..16fa01e 100644
--- a/core/conn/jdbc_type2/native/SrvrOthers.cpp
+++ b/core/conn/jdbc_type2/native/SrvrOthers.cpp
@@ -1125,15 +1125,6 @@ odbc_SQLSvc_SetConnectionOption_sme_(
}
strcat(sqlString, schemaValueStr);
break;
- case BEGIN_SESSION:
- if(optionValueStr != NULL && strlen(optionValueStr) > 0)
- sprintf(sqlString,"SET SESSION DEFAULT SQL_SESSION 'BEGIN:%0.200s';",optionValueStr);
- else
- strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'BEGIN';");
- break;
- case END_SESSION:
- strcpy(sqlString, "SET SESSION DEFAULT SQL_SESSION 'END'");
- break;
case RESET_DEFAULTS:
strcpy(sqlString, "CONTROL QUERY DEFAULT * RESET");
break;