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 2017/08/15 16:20:31 UTC

[1/2] incubator-trafodion git commit: fix TRAFODION-2712

Repository: incubator-trafodion
Updated Branches:
  refs/heads/master 93bb3df75 -> 49f9681f0


fix TRAFODION-2712


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

Branch: refs/heads/master
Commit: 47de0e2c6a4bb5dcf8031f47532313ca445d5a1b
Parents: 802f3b0
Author: SuJinpei <87...@qq.com>
Authored: Mon Aug 14 20:29:27 2017 +0800
Committer: SuJinpei <87...@qq.com>
Committed: Mon Aug 14 20:29:27 2017 +0800

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


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/47de0e2c/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index 5ec4eb4..4db998c 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -3664,7 +3664,7 @@ Please note the fixed length '6' in strmicmp: SELECT/UPDATET/DELETE/INSERT have
                     }
                     pos += snprintf(&obuff[pos], obl - pos, "%s</%s>", os, (char *)&Ocnames[i*MAXCOL_LEN]);
                 }
-                pos += snprintf(&obuff[pos], obl - pos, "\n  <row>");
+                pos += snprintf(&obuff[pos], obl - pos, "\n  </row>");
             }
             break;
         case 3:                 /* Print Line Mode */
@@ -9686,7 +9686,7 @@ static void Oextract(int eid)
 #ifdef HDFS
         if ( etab[eid].fho ) {
             (*hdfswrite)(hfs, etab[eid].fho, (void *)xbuff, xbuffl);
-        } else if ( etab[eid].fho ) {
+        } else if ( etab[eid].fo ) {
             (void)fwrite ( xbuff, 1, xbuffl, etab[eid].fo );
         }
 #else
@@ -9910,7 +9910,7 @@ static void Oextract(int eid)
         }
 
         if ( etab[eid].flg2 & 04000000 ) {  /* initialize XML output buffer */
-            xbuffl = snprintf(xbuff, xbuffl, "\n<%s>\n",
+            xbuffl = snprintf(xbuff, xbuffl, "\n</%s>\n",
                 etab[eid].src ? etab[eid].src : "select" );
 #ifdef HDFS
             if ( etab[eid].fho ) {


[2/2] incubator-trafodion git commit: Merge [TRAFODION-2712] PR 1205 Fix odb extract problem to correct xml file

Posted by db...@apache.org.
Merge [TRAFODION-2712] PR 1205 Fix odb extract problem to correct xml file


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

Branch: refs/heads/master
Commit: 49f9681f09ce5421a9afa0813881f4bce586b549
Parents: 93bb3df 47de0e2
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Aug 15 16:19:48 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Aug 15 16:19:48 2017 +0000

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