Repository: trafodion
Updated Branches:
  refs/heads/master b2717ecbe -> 6ab2cb933


fix trafodion-2939


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

Branch: refs/heads/master
Commit: 0d6ce6f6904f1e528e5502bbd51c013be573e6e9
Parents: 622e67b
Author: SuJinpei <[email protected]>
Authored: Thu Feb 1 14:57:23 2018 +0800
Committer: SuJinpei <[email protected]>
Committed: Thu Feb 1 14:57:23 2018 +0800

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


http://git-wip-us.apache.org/repos/asf/trafodion/blob/0d6ce6f6/core/conn/odb/src/odb.c
----------------------------------------------------------------------
diff --git a/core/conn/odb/src/odb.c b/core/conn/odb/src/odb.c
index 5f8db45..211623e 100755
--- a/core/conn/odb/src/odb.c
+++ b/core/conn/odb/src/odb.c
@@ -5494,6 +5494,8 @@ static void etabadd(char type, char *run, int id)
                     if ( etab[no].ps ){
                         etab[no].TotalMaxRecords = etab[no].mr;
                         etab[no].mr /= etab[no].ps; /* each thread will get a 
portion of the max record to fetch */
+                        if (etab[0].r > etab[0].mr) /* rowset size should not 
exceeds the max size */
+                            etab[0].r = etab[0].mr;
                     }
                     strmcpy(tabn, etab[no].src, sizeof(tabn));
                     if ( !SQL_SUCCEEDED(Oret=SQLAllocHandle(SQL_HANDLE_STMT, 
Oc, &Os))){

Reply via email to