summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2010-10-29 18:59:39 -0700
committerIgor Babaev <igor@askmonty.org>2010-10-29 18:59:39 -0700
commitd48a8b60345c5b5f95c2ce590f7032a7c9f87c4b (patch)
tree3c10f2d351ab1de69754802a2c77df04da1a1cf0 /storage
parent8e7ebfbce89a472b3c5a6c30e6de101e567a8218 (diff)
downloadmariadb-git-d48a8b60345c5b5f95c2ce590f7032a7c9f87c4b.tar.gz
Fixed bug #665049.
The bug could cause wrong results for queries over Maria tables when index condition pushdown was used.
Diffstat (limited to 'storage')
-rw-r--r--storage/maria/ma_rnext_same.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_rnext_same.c b/storage/maria/ma_rnext_same.c
index 597d97fc78a..f67a76a366f 100644
--- a/storage/maria/ma_rnext_same.c
+++ b/storage/maria/ma_rnext_same.c
@@ -81,7 +81,7 @@ int maria_rnext_same(MARIA_HA *info, uchar *buf)
break;
}
/* Skip rows that are inserted by other threads since we got a lock */
- if ((info->s->row_is_visible)(info) ||
+ if ((info->s->row_is_visible)(info) &&
((icp_res= ma_check_index_cond(info, inx, buf)) != 0))
break;
}