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 2018/01/24 23:44:19 UTC

[1/2] trafodion git commit: TRAFODION-2922 fix return incorrect affect row count

Repository: trafodion
Updated Branches:
  refs/heads/master 622e67bef -> 0edae9410


TRAFODION-2922 fix return incorrect affect row count


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

Branch: refs/heads/master
Commit: 53cacb8d98df64fb715c57cd75d09aedd2dae2e2
Parents: f06ea68
Author: Li Ze <ze...@esgyn.cn>
Authored: Mon Jan 22 17:00:13 2018 +0800
Committer: Li Ze <ze...@esgyn.cn>
Committed: Mon Jan 22 17:00:13 2018 +0800

----------------------------------------------------------------------
 .../src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafodion/blob/53cacb8d/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
index e5e4962..cda76d6 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java
@@ -354,7 +354,6 @@ public class TrafT4Statement extends TrafT4Handle implements java.sql.Statement
 				{};
 			}
 
-			batchRowCount_ = new int[batchCommands_.size()];
 			for (i = 0; i < batchCommands_.size(); i++) {
 				String sql = (String) batchCommands_.get(i);
 
@@ -397,7 +396,7 @@ public class TrafT4Statement extends TrafT4Handle implements java.sql.Statement
 
 					checkSQLWarningAndClose();
 
-					batchRowCount[i] = batchRowCount_[0]; // the member will
+					batchRowCount[i] = (int)ist_.getRowCount(); // the member will
 					// be set by
 					// execute...keep
 					// them in our local


[2/2] trafodion git commit: Merge remote branch 'origin/pr/1410/head' into merge_1410

Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1410/head' into merge_1410


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

Branch: refs/heads/master
Commit: 0edae94106569f793c2ee964be068c44d824033c
Parents: 622e67b 53cacb8
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Wed Jan 24 23:43:55 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Wed Jan 24 23:43:55 2018 +0000

----------------------------------------------------------------------
 .../src/main/java/org/trafodion/jdbc/t4/TrafT4Statement.java      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------