diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-04-10 14:23:17 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-04-10 14:23:17 +0300 |
| commit | e6704d116db65ff1a723fe6a1c394dffeeac80b4 (patch) | |
| tree | 2238a3d5fa70dcbe2a1e176ceef8ce7394842463 /mysys | |
| parent | 0409d6c05fd3ff268f253ed1d27a0078b9f72f8e (diff) | |
| parent | 8465e5cf8827bb3ad937d2a238c3f8dbf98a31f0 (diff) | |
| download | mariadb-git-e6704d116db65ff1a723fe6a1c394dffeeac80b4.tar.gz | |
merge mysql-5.5->mysql-5.5-security
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/lf_alloc-pin.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysys/lf_alloc-pin.c b/mysys/lf_alloc-pin.c index 22887d17c07..7af87bca111 100644 --- a/mysys/lf_alloc-pin.c +++ b/mysys/lf_alloc-pin.c @@ -211,13 +211,16 @@ void _lf_pinbox_put_pins(LF_PINS *pins) LF_PINBOX *pinbox= pins->pinbox; uint32 top_ver, nr; nr= pins->link; -#ifdef MY_LF_EXTRA_DEBUG + +#ifndef DBUG_OFF { + /* This thread should not hold any pin. */ int i; for (i= 0; i < LF_PINBOX_PINS; i++) DBUG_ASSERT(pins->pin[i] == 0); } -#endif +#endif /* DBUG_OFF */ + /* XXX this will deadlock if other threads will wait for the caller to do something after _lf_pinbox_put_pins(), |