diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-01-30 01:15:30 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-01-30 10:12:18 +0100 |
| commit | 2a4881800c6fa78a810d29ff2048956175fd0f6f (patch) | |
| tree | 3167b8ce5c472fc688093c8705bcfdd1d0899b0a | |
| parent | 9189284ba303cefc025b8e303619fcce2e49c6b0 (diff) | |
| download | mariadb-git-2a4881800c6fa78a810d29ff2048956175fd0f6f.tar.gz | |
InnoDB: don't pthread_join() a thread that wasn't created
this fixes the crash in innodb.101_compatibility test
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 9707e24390d..fd9702c727e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -4607,7 +4607,9 @@ innobase_end( } innobase_space_shutdown(); - pthread_join(thd_destructor_thread, NULL); + if (!srv_read_only_mode) { + pthread_join(thd_destructor_thread, NULL); + } mysql_mutex_destroy(&innobase_share_mutex); mysql_mutex_destroy(&commit_cond_m); |