summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2003-01-17 16:56:30 +0200
committerunknown <monty@mashka.mysql.fi>2003-01-17 16:56:30 +0200
commitaec8aeaab869e8553123ad1aefd8a5ab2c5f3ea7 (patch)
treebb16b2f803042c89a754e128271969aebdb3823b
parentecdbdeddade483dcdb37c1b82f7e45db46caca0f (diff)
parent380115abd7221d5c5ddd8b8e13060d5f5a92cada (diff)
downloadmariadb-git-aec8aeaab869e8553123ad1aefd8a5ab2c5f3ea7.tar.gz
Merge work:/my/mysql-4.0 into mashka.mysql.fi:/home/my/mysql-4.0
-rw-r--r--innobase/page/page0cur.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/innobase/page/page0cur.c b/innobase/page/page0cur.c
index bb49e9080ce..1ea6e3e3018 100644
--- a/innobase/page/page0cur.c
+++ b/innobase/page/page0cur.c
@@ -253,7 +253,8 @@ page_cur_search_with_match(
up_matched_bytes = cur_matched_bytes;
}
- } else if ((mode == PAGE_CUR_G) || (mode == PAGE_CUR_LE)) {
+ } else if (mode == PAGE_CUR_G || mode == PAGE_CUR_LE
+ || mode == PAGE_CUR_LE_OR_EXTENDS) {
low = mid;
low_matched_fields = cur_matched_fields;
low_matched_bytes = cur_matched_bytes;
@@ -308,7 +309,8 @@ page_cur_search_with_match(
up_matched_fields = cur_matched_fields;
up_matched_bytes = cur_matched_bytes;
}
- } else if ((mode == PAGE_CUR_G) || (mode == PAGE_CUR_LE)) {
+ } else if (mode == PAGE_CUR_G || mode == PAGE_CUR_LE
+ || mode == PAGE_CUR_LE_OR_EXTENDS) {
low_rec = mid_rec;
low_matched_fields = cur_matched_fields;
low_matched_bytes = cur_matched_bytes;