summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-09-07 13:24:12 +0200
committerunknown <joreland@mysql.com>2004-09-07 13:24:12 +0200
commit6d26e972aca872c542c6f7dcd8c675c93acb36d3 (patch)
tree6ff14addaa6c7d67c357cdaf3bc9deb1b29f9184 /ndb
parentb306777f73cd26a33955742e407e82adc6180742 (diff)
downloadmariadb-git-6d26e972aca872c542c6f7dcd8c675c93acb36d3.tar.gz
Fix scan with keyinfo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Dont't use signal->theData for checking as it is overwritten when using keyinfo
Diffstat (limited to 'ndb')
-rw-r--r--ndb/src/kernel/blocks/dblqh/DblqhMain.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
index 71d5dd8e193..3b05a133bbb 100644
--- a/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
+++ b/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
@@ -8134,8 +8134,8 @@ void Dblqh::scanTupkeyConfLab(Signal* signal)
ndbrequire(scanptr.p->m_curr_batch_size_rows < MAX_PARALLEL_OP_PER_SCAN);
scanptr.p->m_curr_batch_size_bytes+= tdata4;
scanptr.p->m_curr_batch_size_rows++;
- scanptr.p->m_last_row = conf->lastRow;
- if (scanptr.p->check_scan_batch_completed() | conf->lastRow){
+ scanptr.p->m_last_row = tdata5;
+ if (scanptr.p->check_scan_batch_completed() | tdata5){
if (scanptr.p->scanLockHold == ZTRUE) {
jam();
scanptr.p->scanState = ScanRecord::WAIT_SCAN_NEXTREQ;