From: Ole John Aske
Date: November 10 2010 12:02pm
Subject: bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch
 (ole.john.aske:3358)
List-Archive: http://lists.mysql.com/commits/123398
Message-Id: <20101110120230.AAA7D222@fimafeng09.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3961355041666241693=="

--===============3961355041666241693==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///net/fimafeng09/export/home/tmp/oleja/mysql/mysql-5.1-telco-7.0-spj-scan-scan/ based on revid:jonas@stripped

 3358 Ole John Aske	2010-11-10
      spj-svs: NdbQueryImpl::handleBatchComplete() should not return 'resume==true' for an ordered scan 
      until all pending fragments has completed.
      
      This will reduce sporious wakeup of application threads for ordered scans.

    modified:
      storage/ndb/src/ndbapi/NdbQueryOperation.cpp
=== modified file 'storage/ndb/src/ndbapi/NdbQueryOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2010-11-10 08:01:00 +0000
+++ b/storage/ndb/src/ndbapi/NdbQueryOperation.cpp	2010-11-10 12:02:26 +0000
@@ -1932,7 +1932,10 @@ NdbQueryImpl::handleBatchComplete(Uint32
     if (getQueryDef().isScanQuery())
     {
       root.handleBatchComplete(fragNo);  // Only required for scans
-      resume = (m_pendingFrags==0) || true;
+
+      // Only ordered scans has to wait until all pending completed
+      resume = (m_pendingFrags==0) ||
+               (root.m_ordering==NdbQueryOptions::ScanOrdering_unordered);
     }
     else
     {


--===============3961355041666241693==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/ole.john.aske@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: ole.john.aske@stripped\
#   xkmij792yqg0ilhv
# target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\
#   /mysql-5.1-telco-7.0-spj-scan-scan/
# testament_sha1: f9568013999fe541a8e451d5d4e6f5b5712298c7
# timestamp: 2010-11-10 13:02:30 +0100
# source_branch: bzr+ssh://oaske@stripped/bzrroot/server\
#   /mysql-5.1-telco-7.0-spj/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVrVuyEAAZTfgBAYUOP//3sx
rAC////0UAQjPcM6gdrabHYSSICZGjEyE9NBoEmJoGTTR6h6gSkjTRp6gNE9U2kANDQ0DQAABJIB
CYQ0BqZQ8oNoQ0ADI0DmATTAJkMAATBMAAAElIak/UeVNqfpTeppPUeo0NPUaBpoMgB6h5Rir02t
65upVXP5f6Ihq1RINEjqNMD4cwezJPTsV9nnczMQ/Y6wRsTTQugaD6Ebbtvsfr09eseDvftC811t
1yRTEM6rcRq7G8kxRbXEWGfHNXu9+4cwsmtmOd3SSqknOoi/JFVyU9XaeHjDKlsNfqE+nOUKJWhq
ScsnJW8u7bvnhOAr99vdCCOhww6oKAhkAwsaLipuxGW0JqPSR5bZy9IuBSO+KGVaHA4GCGC0uI56
BDRE9EwoYJsdNew+kq005GeIx7L1NUuKQKlwyXMCOEyZCGgxErITUpS0Cx9rAXXOn2UCUTY9UuGt
1IyOM+ho/dwlLS0vdYl9YOuoTCQzYixiZBuKOKJ4abEuSYWgkglJNKS3tzlU7CSQutKxuhOeZ4i1
VEFWSFiQm2h96jFWOpw80FVXWKIW2q3YYx1R1mGlqZ1cOL9N9ULpPT5UobXknsKKrzccU4sKdNJ0
v0OlbyYtbVuvi6mCHGhpvTUaEfMEkrePxKS+oms72OlW6J5y8N8QQpTNOyYb13uxeEiuzc+BdxUL
KoZ3I815fdEqueG7aNll/vXzSuI5WwFuTeJ0tK6a3sRZnKqDlQiEkDvSsObS4k/PTprH2GG1EHDZ
HzIZ2H3g0Y8x6j9stNXYbU/QzJdLUifUOWMgYOTV5cfwU2NQLg7wUC6p5KxZt4vpsFbxN5CD4ZsX
DywsNd1z0lZzwrH4Z+48czzPkKEs0pkyPbIjlblKGI6YAdodfsjnbTwpNr/PNa1no4ovVBGrXKBV
l+l8aeGNh1yL5SU1Ju5glUF9VC0z3khoGnIvvhw0sHFmlngNYozKwT2Iz87DMGJ4yJ+5AG+JXmFU
rJyWVrI9N6aVpp3ZCgOXMXueY7UYVFrN9OGyNNTJk0vRyDquWG5Ks3xZDlLkqQ4bTCBC6wP5LV0b
pSuzQjWuYIBC4Kmp7S5UsyTr2jTCalOukwmaQRG1mzWo8TU6JzaLKucTyeneIQrp53y3DOek5Dm5
sFj5BwPt8371EjeLdsurnjI5CAZSMDLnxvuhVWLt3pcaSkbR0mBf1igCQPN056DZi5KlGVYasIk0
KgtNc2iKg28t6x52ZUExjeWstcYAxXTzPbB+G0kJyNRAc1eCqKAUr5yVIornANFaPD9vu7XHJT1s
WBo39kdeM5yZORdshk+vJ/e3VEJa8OsYs6YqGeOYHf2tKtX+ylVXFFWYgEXDnVaM2DuUH95nfU9i
lFfadjTsssMxANkrURDwabJa4Df5Nh6FnIpjXvq3CfiQ8xlyOB1L0ZERqWxYh0sKRaUV+hlHXw/x
dyRThQkFrVuyEA==


--===============3961355041666241693==--