diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-14 19:15:05 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-23 09:26:29 +0100 |
| commit | 5f6b3f9c07241a7f539dbe7c51bf3a9cd8800f26 (patch) | |
| tree | 42cd899bdf15c151538953204d3e055c015738fa /sql/ha_partition.h | |
| parent | ce0e2c82af66934caef159be422a599128f6b5ae (diff) | |
| download | mariadb-git-5f6b3f9c07241a7f539dbe7c51bf3a9cd8800f26.tar.gz | |
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)
Diffstat (limited to 'sql/ha_partition.h')
| -rw-r--r-- | sql/ha_partition.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index 30dd24b6014..7634f71c42d 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -558,8 +558,7 @@ public: virtual THR_LOCK_DATA **store_lock(THD * thd, THR_LOCK_DATA ** to, enum thr_lock_type lock_type); virtual int external_lock(THD * thd, int lock_type); - LEX_CSTRING *engine_name() - { return hton_name(table->part_info->default_engine_type); } + LEX_CSTRING *engine_name() { return hton_name(partition_ht()); } /* When table is locked a statement is started by calling start_stmt instead of external_lock |