Commit adc1f2f4 authored by Igor Babaev's avatar Igor Babaev

Applied the patch for bug 58837 (for the mysql-5.6 code line).

This patch fixed the crash in innodb_bug59307.
parent 6dab04bd
...@@ -1716,6 +1716,7 @@ public: ...@@ -1716,6 +1716,7 @@ public:
DBUG_ENTER("ha_rnd_init"); DBUG_ENTER("ha_rnd_init");
DBUG_ASSERT(inited==NONE || (inited==RND && scan)); DBUG_ASSERT(inited==NONE || (inited==RND && scan));
inited= (result= rnd_init(scan)) ? NONE: RND; inited= (result= rnd_init(scan)) ? NONE: RND;
end_range= NULL;
DBUG_RETURN(result); DBUG_RETURN(result);
} }
int ha_rnd_end() int ha_rnd_end()
...@@ -1723,6 +1724,7 @@ public: ...@@ -1723,6 +1724,7 @@ public:
DBUG_ENTER("ha_rnd_end"); DBUG_ENTER("ha_rnd_end");
DBUG_ASSERT(inited==RND); DBUG_ASSERT(inited==RND);
inited=NONE; inited=NONE;
end_range= NULL;
DBUG_RETURN(rnd_end()); DBUG_RETURN(rnd_end());
} }
int ha_rnd_init_with_error(bool scan) __attribute__ ((warn_unused_result)); int ha_rnd_init_with_error(bool scan) __attribute__ ((warn_unused_result));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment