diff options
| author | unknown <heikki@hundin.mysql.fi> | 2004-06-17 13:25:06 +0300 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2004-06-17 13:25:06 +0300 |
| commit | a7139dd280e82a25ce2cbab80a10234b3911f215 (patch) | |
| tree | 717a0df66b78f8229972912ed8c3b2c072894942 /innobase/thr | |
| parent | 3414f67485dc7c6d55428691d8a62410bb8c630b (diff) | |
| download | mariadb-git-a7139dd280e82a25ce2cbab80a10234b3911f215.tar.gz | |
Cset exclude: marko@hundin.mysql.fi|ChangeSet|20040311211202|05613
innobase/trx/trx0sys.c:
Remove #ifdef UNIV_HOT_BACKUP: best to keep the codebase as uniform as possible
innobase/dict/dict0dict.c:
Exclude
innobase/dict/dict0mem.c:
Exclude
innobase/ha/hash0hash.c:
Exclude
innobase/include/data0data.h:
Exclude
innobase/include/dict0mem.h:
Exclude
innobase/include/hash0hash.h:
Exclude
innobase/include/hash0hash.ic:
Exclude
innobase/include/mtr0mtr.h:
Exclude
innobase/include/row0ins.h:
Exclude
innobase/include/row0upd.h:
Exclude
innobase/row/row0ins.c:
Exclude
innobase/row/row0upd.c:
Exclude
innobase/thr/thr0loc.c:
Exclude
Diffstat (limited to 'innobase/thr')
| -rw-r--r-- | innobase/thr/thr0loc.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/innobase/thr/thr0loc.c b/innobase/thr/thr0loc.c index a17d09fcca6..033bb22807f 100644 --- a/innobase/thr/thr0loc.c +++ b/innobase/thr/thr0loc.c @@ -46,12 +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 */ }; +#define THR_LOCAL_MAGIC_N 1231234 + /*********************************************************************** Returns the local storage struct for a thread. */ static @@ -170,9 +169,8 @@ 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); @@ -211,7 +209,7 @@ thr_local_free( mutex_exit(&thr_local_mutex); - ut_ad(local->magic_n == THR_LOCAL_MAGIC_N); + ut_a(local->magic_n == THR_LOCAL_MAGIC_N); mem_free(local); } |