summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2011-10-28 04:07:11 -0700
committerIgor Babaev <igor@askmonty.org>2011-10-28 04:07:11 -0700
commit4b4dfd57f570b25c87133f16ead3bd83e6c8f73b (patch)
tree1367ad13b5cc800dc9e1d436e0c5ff44da92cd73 /sql/handler.h
parent2162704829a08b3ebd41e2cdf6a6b5f7ea6bcc6d (diff)
parentadc1f2f4c939c15ad5efd37633332560456cd4fd (diff)
downloadmariadb-git-4b4dfd57f570b25c87133f16ead3bd83e6c8f73b.tar.gz
Merge.
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h
index ce10872867a..46f5beb45d2 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1723,6 +1723,7 @@ public:
DBUG_ENTER("ha_rnd_init");
DBUG_ASSERT(inited==NONE || (inited==RND && scan));
inited= (result= rnd_init(scan)) ? NONE: RND;
+ end_range= NULL;
DBUG_RETURN(result);
}
int ha_rnd_end()
@@ -1730,6 +1731,7 @@ public:
DBUG_ENTER("ha_rnd_end");
DBUG_ASSERT(inited==RND);
inited=NONE;
+ end_range= NULL;
DBUG_RETURN(rnd_end());
}
int ha_rnd_init_with_error(bool scan) __attribute__ ((warn_unused_result));