You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ry...@apache.org on 2016/07/26 04:22:47 UTC
[1/2] incubator-trafodion git commit: Fix JIRA2116
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 11689d15b -> acf48e944
Fix JIRA2116
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/7d774479
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/7d774479
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/7d774479
Branch: refs/heads/master
Commit: 7d7744797c2a3b348d646623f6251c1bfa9d30e5
Parents: 81a455e
Author: ryzuo <jo...@gmail.com>
Authored: Wed Jul 20 07:45:17 2016 +0000
Committer: ryzuo <jo...@gmail.com>
Committed: Wed Jul 20 07:45:17 2016 +0000
----------------------------------------------------------------------
core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource.cpp | 6 +++---
.../unixodbc/odbc/odbcclient/unixcli/cli/cdatasource_drvr.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7d774479/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource.cpp
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource.cpp b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource.cpp
index f39f5a9..5413aec 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource.cpp
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource.cpp
@@ -107,7 +107,7 @@ CDataSource::CDataSource()
searchKey[sizeof(searchKey)-1]='\0';
retprofile=getAnyProfileString((LPCTSTR)searchKey,
- "HPDatabaseCertificateDir",
+ "CertificateDir",
"SYSTEM_DEFAULT",
m_DSCertificateDir,
sizeof(m_DSCertificateDir),
@@ -748,7 +748,7 @@ short CDataSource::readDSValues(char *DSName,CConnect* pConnection)
//
len = GetMyPrivateProfileString(
searchKey,
- "HPDatabaseCertificateDir",
+ "CertificateDir",
"SYSTEM_DEFAULT",
m_DSCertificateDir,
sizeof(m_DSCertificateDir),
@@ -855,7 +855,7 @@ short CDataSource::readDSValues(char *DSName,CConnect* pConnection)
strncpy(searchKey, (const char *)szODBC, sizeof(searchKey));
len = GetMyPrivateProfileString(
searchKey,
- "HPDatabaseCertificateDir",
+ "CertificateDir",
"SYSTEM_DEFAULT",
m_DSCertificateDir,
sizeof(m_DSCertificateDir),
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/7d774479/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource_drvr.cpp
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource_drvr.cpp b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource_drvr.cpp
index f534afa..d49b81d 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource_drvr.cpp
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource_drvr.cpp
@@ -89,7 +89,7 @@ CDataSource::CDataSource()
len = (gDrvrGlobal.fpSQLGetPrivateProfileString)(
searchKey,
- "HPDatabaseCertificateDir",
+ "CertificateDir",
"SYSTEM_DEFAULT",
m_DSCertificateDir,
sizeof(m_DSCertificateDir),
@@ -100,7 +100,7 @@ CDataSource::CDataSource()
strncpy(searchKey, (const char *)szODBC, sizeof(searchKey));
len = (gDrvrGlobal.fpSQLGetPrivateProfileString)(
searchKey,
- "HPDatabaseCertificateDir",
+ "CertificateDir",
"SYSTEM_DEFAULT",
m_DSCertificateDir,
sizeof(m_DSCertificateDir),
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2116] PR-611
The ODBC Driver DSN functionality still using 'HP' prefix for configuration
key name
Posted by ry...@apache.org.
Merge [TRAFODION-2116] PR-611 The ODBC Driver DSN functionality still using 'HP' prefix for configuration key name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/acf48e94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/acf48e94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/acf48e94
Branch: refs/heads/master
Commit: acf48e9445fcdc85cb7d52676cd6e31cd8a6c640
Parents: 11689d1 7d77447
Author: ryzuo <jo...@gmail.com>
Authored: Tue Jul 26 04:21:07 2016 +0000
Committer: ryzuo <jo...@gmail.com>
Committed: Tue Jul 26 04:21:07 2016 +0000
----------------------------------------------------------------------
core/conn/unixodbc/odbc/odbcclient/unixcli/cli/cdatasource.cpp | 6 +++---
.../unixodbc/odbc/odbcclient/unixcli/cli/cdatasource_drvr.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------