You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2017/06/20 04:08:32 UTC

[1/2] incubator-trafodion git commit: [TRAFODION-2337] odb on windows can not use parameter with absolute path

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 43681fb28 -> fcc4c4e01


[TRAFODION-2337] odb on windows can not use parameter with absolute path


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/78cabaea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/78cabaea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/78cabaea

Branch: refs/heads/master
Commit: 78cabaea772a7b11304484aeb54f5dd7f17522f2
Parents: a8d197a
Author: Weixin-Xu <we...@esgyn.cn>
Authored: Fri Jun 16 17:17:04 2017 +0800
Committer: Weixin-Xu <we...@esgyn.cn>
Committed: Fri Jun 16 17:17:04 2017 +0800

----------------------------------------------------------------------
 core/conn/odb/src/odb.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/78cabaea/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index 07dff8f..37c959e 100644
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -13133,7 +13133,11 @@ static int Otcol(int eid, SQLHDBC *Ocn)
                     j++; 
                     q = 1;
                 }
-                for ( l = j ; ( str[j] && str[j] != '\n' ) && ( q || str[j] != ':' ) ; j++) {
+#ifdef _WIN32
+                for (l = j; (str[j] && str[j] != '\n') && (q || str[j] != ':') || str[j + 1] == '/'; j++) {
+#else
+                for (l = j; (str[j] && str[j] != '\n') && (q || str[j] != ':'); j++) {
+#endif
                     if ( q ) {
                         if ( str[j] == ']' && ( str[j+1] == ':' || str[j+1] == 0 || isspace((int)str[j+1]) ) ) {
                             q = 0;


[2/2] incubator-trafodion git commit: Merge [TRAFODION-2337] PR-1123 odb on windows can not use parameter with absolute path

Posted by su...@apache.org.
Merge [TRAFODION-2337] PR-1123 odb on windows can not use parameter with absolute path


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/fcc4c4e0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/fcc4c4e0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/fcc4c4e0

Branch: refs/heads/master
Commit: fcc4c4e01510989b0fef62d48b75f39c9690c886
Parents: 43681fb 78cabae
Author: Suresh Subbiah <su...@apache.org>
Authored: Tue Jun 20 04:08:13 2017 +0000
Committer: Suresh Subbiah <su...@apache.org>
Committed: Tue Jun 20 04:08:13 2017 +0000

----------------------------------------------------------------------
 core/conn/odb/src/odb.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/fcc4c4e0/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --cc core/conn/odb/src/odb.c
index dfe4810,37c959e..83a1da9
mode 100755,100644..100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c