diff options
| author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-22 12:00:59 +0300 |
|---|---|---|
| committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-04-22 12:00:59 +0300 |
| commit | f875041fadb3c61b0a4809d636f1b65da5d9dcc7 (patch) | |
| tree | fbb178d578d46acb1b7384fca880e57450b96a9b /storage/innobase/que | |
| parent | 7b653d649a07c6236980b3ed4baa443d5000e020 (diff) | |
| parent | 4b0bd332ec241b9c0400ab5951da07936decda25 (diff) | |
| download | mariadb-git-f875041fadb3c61b0a4809d636f1b65da5d9dcc7.tar.gz | |
Merge from innodb-branches-innodb+
Diffstat (limited to 'storage/innobase/que')
| -rw-r--r-- | storage/innobase/que/que0que.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/que/que0que.c b/storage/innobase/que/que0que.c index 2fe046fa9b8..83c71dc5b18 100644 --- a/storage/innobase/que/que0que.c +++ b/storage/innobase/que/que0que.c @@ -29,7 +29,6 @@ Created 5/27/1996 Heikki Tuuri #include "que0que.ic" #endif -#include "srv0que.h" #include "usr0sess.h" #include "trx0trx.h" #include "trx0roll.h" @@ -311,7 +310,9 @@ que_thr_end_wait_no_next_thr( /* In MySQL we let the OS thread (not just the query thread) to wait for the lock to be released: */ - srv_release_mysql_thread_if_suspended(thr); + if (thr != NULL) { + srv_release_mysql_thread_if_suspended(thr); + } /* srv_que_task_enqueue_low(thr); */ } |