diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 09:35:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 09:57:17 +0200 |
| commit | 34841d2305b6bbe2c0b496add905b1dd478dafbe (patch) | |
| tree | 85b31de5caf44a9024d73e41fbdbdadb29ff5526 /sql/threadpool_common.cc | |
| parent | 62eaf7b657fd25bb4457049c81fb929314d6eb1d (diff) | |
| parent | a285e68018018ef3959f6381aa61347b73902997 (diff) | |
| download | mariadb-git-34841d2305b6bbe2c0b496add905b1dd478dafbe.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'sql/threadpool_common.cc')
| -rw-r--r-- | sql/threadpool_common.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/threadpool_common.cc b/sql/threadpool_common.cc index 486a829c645..fb9e61f9a05 100644 --- a/sql/threadpool_common.cc +++ b/sql/threadpool_common.cc @@ -250,7 +250,7 @@ static THD* threadpool_add_connection(CONNECT *connect, void *scheduler_data) } delete connect; add_to_active_threads(thd); - thd->mysys_var= mysys_var; + thd->set_mysys_var(mysys_var); thd->event_scheduler.data= scheduler_data; /* Create new PSI thread for use with the THD. */ @@ -477,11 +477,11 @@ void tp_timeout_handler(TP_connection *c) if (c->state != TP_STATE_IDLE) return; THD *thd=c->thd; - mysql_mutex_lock(&thd->LOCK_thd_data); + mysql_mutex_lock(&thd->LOCK_thd_kill); thd->set_killed(KILL_WAIT_TIMEOUT); c->priority= TP_PRIORITY_HIGH; post_kill_notification(thd); - mysql_mutex_unlock(&thd->LOCK_thd_data); + mysql_mutex_unlock(&thd->LOCK_thd_kill); } |