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
This commit is contained in:
unknown 2002-08-06 22:59:13 +03:00
commit a3edc742b9
29 changed files with 436 additions and 128 deletions

View file

@ -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);