diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-11 15:13:52 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2010-11-11 15:13:52 +0200 |
| commit | a8266151de28bb0afaaef4b73d386035c1525091 (patch) | |
| tree | 22878cce63bccbf4ca278664045ecaf95eb53068 /storage | |
| parent | 631b5ef05e973337b94aafd4943adce4c6174ea5 (diff) | |
| parent | 4bb4eb800e11aa1cf27ce9b5773aefc923f7c67e (diff) | |
| download | mariadb-git-a8266151de28bb0afaaef4b73d386035c1525091.tar.gz | |
Merge mysql-5.1-innodb to mysql-5.5-innodb.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/thr/thr0loc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/innobase/thr/thr0loc.c b/storage/innobase/thr/thr0loc.c index 36b18684829..2bd3e4b1c43 100644 --- a/storage/innobase/thr/thr0loc.c +++ b/storage/innobase/thr/thr0loc.c @@ -87,7 +87,8 @@ thr_local_validate( const thr_local_t* local) /*!< in: data to validate */ { ut_ad(local->magic_n == THR_LOCAL_MAGIC_N); - ut_ad(local->slot_no < OS_THREAD_MAX_N); + ut_ad(local->slot_no == ULINT_UNDEFINED + || local->slot_no < OS_THREAD_MAX_N); ut_ad(local->in_ibuf == FALSE || local->in_ibuf == TRUE); return(TRUE); } @@ -211,7 +212,7 @@ thr_local_create(void) local->id = os_thread_get_curr_id(); local->handle = os_thread_get_curr(); local->magic_n = THR_LOCAL_MAGIC_N; - + local->slot_no = ULINT_UNDEFINED; local->in_ibuf = FALSE; mutex_enter(&thr_local_mutex); |