From 36d28f210a34b665ee4e6c09c3eea6d019f872e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 24 Apr 2018 11:53:04 +0300 Subject: [PATCH] MDEV-15865 Crash in dict_index_set_merge_threshold() on CREATE TABLE Apply the contributed patch from MySQL Bug #89126 create table panic on innobase_parse_hint_from_comment by Yan Huang. --- storage/innobase/handler/ha_innodb.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9eb924b6595..c331de3770c 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -12948,10 +12948,9 @@ create_table_info_t::create_table_update_dict() dict_table_autoinc_unlock(innobase_table); } - dict_table_close(innobase_table, FALSE, FALSE); - innobase_parse_hint_from_comment(m_thd, innobase_table, m_form->s); + dict_table_close(innobase_table, FALSE, FALSE); DBUG_RETURN(0); }