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/10/02 22:48:21 UTC

[1/2] trafodion git commit: length return 0 when the source and target charset is same

Repository: trafodion
Updated Branches:
  refs/heads/master 9536c5e38 -> c52b07c14


length return 0 when the source and target charset is same


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

Branch: refs/heads/master
Commit: 71bf19d7c3fe340cba3e2850082b1aa842a0cf1d
Parents: fb269de
Author: Weixin-Xu <xw...@weixin-1.novalocal>
Authored: Thu Sep 27 11:10:10 2018 +0800
Committer: Weixin-Xu <xw...@weixin-1.novalocal>
Committed: Thu Sep 27 11:10:10 2018 +0800

----------------------------------------------------------------------
 core/conn/unixodbc/odbc/odbcclient/unixcli/cli/charsetconv.cpp | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/71bf19d7/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/charsetconv.cpp
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/charsetconv.cpp b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/charsetconv.cpp
index 2f96082..7ad21d1 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/charsetconv.cpp
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/charsetconv.cpp
@@ -298,6 +298,10 @@ int ICUConverter::UTF8ToFromMultiByte( int direction,
 		}
 		memcpy(outputStr, inputStr, inputSize);
 		outputStr[inputSize]=0;
+        if (charCount)
+        {
+            *charCount = inputSize;
+        }
 		return inputSize;
 	}
 	


[2/2] trafodion git commit: Merge [TRAFODION-3215] PR 1719 Length of 0 returned when in/out charsets same

Posted by db...@apache.org.
Merge [TRAFODION-3215] PR 1719 Length of 0 returned when in/out charsets same


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

Branch: refs/heads/master
Commit: c52b07c146a6739624db39d303fd61aa53e0c80b
Parents: 9536c5e 71bf19d
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Oct 2 22:47:44 2018 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Oct 2 22:47:44 2018 +0000

----------------------------------------------------------------------
 core/conn/unixodbc/odbc/odbcclient/unixcli/cli/charsetconv.cpp | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------