diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-06-02 14:03:02 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-06-02 14:03:02 -0700 |
| commit | adc1f2f4c939c15ad5efd37633332560456cd4fd (patch) | |
| tree | 44249fb1aa8cbb723d31c2cb60bf967c456861c7 /sql/handler.h | |
| parent | 6dab04bda02cab4510f4c594c0625e0801a5a7b7 (diff) | |
| download | mariadb-git-adc1f2f4c939c15ad5efd37633332560456cd4fd.tar.gz | |
Applied the patch for bug 58837 (for the mysql-5.6 code line).
This patch fixed the crash in innodb_bug59307.
Diffstat (limited to 'sql/handler.h')
| -rw-r--r-- | sql/handler.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/handler.h b/sql/handler.h index 4707aabbd52..96cea68e1fb 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -1716,6 +1716,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() @@ -1723,6 +1724,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)); |