diff options
| author | marko@hundin.mysql.fi <> | 2004-03-11 23:12:02 +0200 |
|---|---|---|
| committer | marko@hundin.mysql.fi <> | 2004-03-11 23:12:02 +0200 |
| commit | 5b5d749294edbf57b461eaf11812c29b196c98b7 (patch) | |
| tree | 148175ce29b93ab6acaa2a1ca244b9b09575a98a /innobase/thr | |
| parent | 4c89512f9df21cce8af4d0aeb836de8f6b0c29bb (diff) | |
| download | mariadb-git-5b5d749294edbf57b461eaf11812c29b196c98b7.tar.gz | |
More consistent handling of magic numbers
Diffstat (limited to 'innobase/thr')
| -rw-r--r-- | innobase/thr/thr0loc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/innobase/thr/thr0loc.c b/innobase/thr/thr0loc.c index 839cb024f25..5da1d7dfb41 100644 --- a/innobase/thr/thr0loc.c +++ b/innobase/thr/thr0loc.c @@ -46,10 +46,11 @@ struct thr_local_struct{ ibool in_ibuf;/* TRUE if the the thread is doing an ibuf operation */ hash_node_t hash; /* hash chain node */ +#ifdef UNIV_DEBUG ulint magic_n; -}; - #define THR_LOCAL_MAGIC_N 1231234 +#endif /* UNIV_DEBUG */ +}; /*********************************************************************** Returns the local storage struct for a thread. */ @@ -167,8 +168,9 @@ thr_local_create(void) local->id = os_thread_get_curr_id(); local->handle = os_thread_get_curr(); +#ifdef UNIV_DEBUG local->magic_n = THR_LOCAL_MAGIC_N; - +#endif /* UNIV_DEBUG */ local->in_ibuf = FALSE; mutex_enter(&thr_local_mutex); @@ -207,7 +209,7 @@ thr_local_free( mutex_exit(&thr_local_mutex); - ut_a(local->magic_n == THR_LOCAL_MAGIC_N); + ut_ad(local->magic_n == THR_LOCAL_MAGIC_N); mem_free(local); } |