diff options
| author | unknown <heikki@hundin.mysql.fi> | 2002-08-06 22:59:13 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2002-08-06 22:59:13 +0300 |
| commit | a3edc742b94a94ff455ff549d7e2a9f5faa346a0 (patch) | |
| tree | 0ed7a5d28436450a6e79787357c337dfae761d1d /innobase/thr | |
| parent | cbb0dc14ccd3ff932edf5a29aa6af0ac210be4b9 (diff) | |
| download | mariadb-git-a3edc742b94a94ff455ff549d7e2a9f5faa346a0.tar.gz | |
Many files:
Merge InnoDB-3.23.52d
innobase/btr/btr0sea.c:
Merge InnoDB-3.23.52d
innobase/buf/buf0buf.c:
Merge InnoDB-3.23.52d
innobase/buf/buf0lru.c:
Merge InnoDB-3.23.52d
innobase/include/buf0buf.h:
Merge InnoDB-3.23.52d
innobase/include/ha0ha.h:
Merge InnoDB-3.23.52d
innobase/include/log0log.h:
Merge InnoDB-3.23.52d
innobase/include/os0file.h:
Merge InnoDB-3.23.52d
innobase/include/os0thread.h:
Merge InnoDB-3.23.52d
innobase/include/ha0ha.ic:
Merge InnoDB-3.23.52d
innobase/include/os0sync.ic:
Merge InnoDB-3.23.52d
innobase/include/srv0start.h:
Merge InnoDB-3.23.52d
innobase/include/sync0rw.ic:
Merge InnoDB-3.23.52d
innobase/include/sync0sync.ic:
Merge InnoDB-3.23.52d
innobase/include/ut0dbg.h:
Merge InnoDB-3.23.52d
innobase/include/univ.i:
Merge InnoDB-3.23.52d
innobase/lock/lock0lock.c:
Merge InnoDB-3.23.52d
innobase/log/log0log.c:
Merge InnoDB-3.23.52d
innobase/mem/mem0pool.c:
Merge InnoDB-3.23.52d
innobase/os/os0file.c:
Merge InnoDB-3.23.52d
innobase/os/os0thread.c:
Merge InnoDB-3.23.52d
innobase/srv/srv0srv.c:
Merge InnoDB-3.23.52d
innobase/srv/srv0start.c:
Merge InnoDB-3.23.52d
innobase/sync/sync0arr.c:
Merge InnoDB-3.23.52d
innobase/sync/sync0rw.c:
Merge InnoDB-3.23.52d
innobase/sync/sync0sync.c:
Merge InnoDB-3.23.52d
innobase/thr/thr0loc.c:
Merge InnoDB-3.23.52d
innobase/trx/trx0trx.c:
Merge InnoDB-3.23.52d
innobase/configure.in:
Merge InnoDB-3.23.52d
sql/ha_innobase.cc:
Merge InnoDB-3.23.52d
Diffstat (limited to 'innobase/thr')
| -rw-r--r-- | innobase/thr/thr0loc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/innobase/thr/thr0loc.c b/innobase/thr/thr0loc.c index d3d7a58d313..fbf3e3a1dad 100644 --- a/innobase/thr/thr0loc.c +++ b/innobase/thr/thr0loc.c @@ -69,8 +69,8 @@ try_again: local = NULL; - HASH_SEARCH(hash, thr_local_hash, os_thread_conv_id_to_ulint(id), - local, local->id == id); + HASH_SEARCH(hash, thr_local_hash, os_thread_pf(id), + local, os_thread_eq(local->id, id)); if (local == NULL) { mutex_exit(&thr_local_mutex); @@ -173,7 +173,7 @@ thr_local_create(void) mutex_enter(&thr_local_mutex); HASH_INSERT(thr_local_t, hash, thr_local_hash, - os_thread_conv_id_to_ulint(os_thread_get_curr_id()), + os_thread_pf(os_thread_get_curr_id()), local); mutex_exit(&thr_local_mutex); @@ -193,8 +193,8 @@ thr_local_free( /* Look for the local struct in the hash table */ - HASH_SEARCH(hash, thr_local_hash, os_thread_conv_id_to_ulint(id), - local, local->id == id); + HASH_SEARCH(hash, thr_local_hash, os_thread_pf(id), + local, os_thread_eq(local->id, id)); if (local == NULL) { mutex_exit(&thr_local_mutex); @@ -202,7 +202,7 @@ thr_local_free( } HASH_DELETE(thr_local_t, hash, thr_local_hash, - os_thread_conv_id_to_ulint(id), local); + os_thread_pf(id), local); mutex_exit(&thr_local_mutex); |