database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-24 07:13:33 +03:00
Code Activity

Merge mysql-5.1-innodb to mysql-5.5-innodb.

Browse Source
This commit is contained in:
Marko Mäkelä
2010-11-11 15:13:52 +02:00
parent 631b5ef05e 4bb4eb800e
commit a8266151de
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/innobase/thr/thr0loc.c
View File

@@ -87,7 +87,8 @@ thr_local_validate(
const thr_local_t* local) /*!< in: data to validate */ const thr_local_t* local) /*!< in: data to validate */
{ {
ut_ad(local->magic_n == THR_LOCAL_MAGIC_N); 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); ut_ad(local->in_ibuf == FALSE || local->in_ibuf == TRUE);
return(TRUE); return(TRUE);
} }
@@ -211,7 +212,7 @@ thr_local_create(void)
local->id = os_thread_get_curr_id(); local->id = os_thread_get_curr_id();
local->handle = os_thread_get_curr(); local->handle = os_thread_get_curr();
local->magic_n = THR_LOCAL_MAGIC_N; local->magic_n = THR_LOCAL_MAGIC_N;
local->slot_no = ULINT_UNDEFINED;
local->in_ibuf = FALSE; local->in_ibuf = FALSE;
mutex_enter(&thr_local_mutex); mutex_enter(&thr_local_mutex);