diff options
| author | Jimmy Yang <jimmy.yang@oracle.com> | 2010-10-14 04:39:42 -0700 |
|---|---|---|
| committer | Jimmy Yang <jimmy.yang@oracle.com> | 2010-10-14 04:39:42 -0700 |
| commit | 4bd55cd67be4c8df342e3c39e5b0084afac07779 (patch) | |
| tree | 991e4c2265e45d6ea5fb81335843ddccbbfc6692 /storage/innobase/srv | |
| parent | ebf1ac2bff718749134a82942d200711b6e701ae (diff) | |
| parent | 0fb4d49795ed753fb3c6c7911a320f8e8c36b029 (diff) | |
| download | mariadb-git-4bd55cd67be4c8df342e3c39e5b0084afac07779.tar.gz | |
Merge from mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'storage/innobase/srv')
| -rw-r--r-- | storage/innobase/srv/srv0start.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c index 9bf18b8db9e..67586de736c 100644 --- a/storage/innobase/srv/srv0start.c +++ b/storage/innobase/srv/srv0start.c @@ -477,7 +477,6 @@ io_handler_thread( the aio array */ { ulint segment; - ulint i; segment = *((ulint*)arg); @@ -490,7 +489,7 @@ io_handler_thread( pfs_register_thread(io_handler_thread_key); #endif /* UNIV_PFS_THREAD */ - for (i = 0;; i++) { + while (srv_shutdown_state != SRV_SHUTDOWN_EXIT_THREADS) { fil_aio_wait(segment); mutex_enter(&ios_mutex); @@ -498,8 +497,6 @@ io_handler_thread( mutex_exit(&ios_mutex); } - thr_local_free(os_thread_get_curr_id()); - /* We count the number of threads in os_thread_exit(). A created thread should always use that to exit and not use return() to exit. The thread actually never comes here because it is exited in an |