Commit 5f6b3f9c authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-13982 Server crashes in in ha_partition::engine_name

table might be NULL in ha_partition::engine_name()
(test case pushed into 5.5)
parent ce0e2c82
...@@ -558,8 +558,7 @@ class ha_partition :public handler ...@@ -558,8 +558,7 @@ class ha_partition :public handler
virtual THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to, virtual THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to,
enum thr_lock_type lock_type); enum thr_lock_type lock_type);
virtual int external_lock(THD * thd, int lock_type); virtual int external_lock(THD * thd, int lock_type);
LEX_CSTRING *engine_name() LEX_CSTRING *engine_name() { return hton_name(partition_ht()); }
{ return hton_name(table->part_info->default_engine_type); }
/* /*
When table is locked a statement is started by calling start_stmt When table is locked a statement is started by calling start_stmt
instead of external_lock instead of external_lock
......
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