diff options
| author | tsmith@quadxeon.mysql.com <> | 2007-06-15 01:57:33 +0200 |
|---|---|---|
| committer | tsmith@quadxeon.mysql.com <> | 2007-06-15 01:57:33 +0200 |
| commit | 918090030b5556f84a163719cf58d7f5bcdbc449 (patch) | |
| tree | 4e46aab8d2631db6cd28c72c3633307314281d7e /mysys | |
| parent | 422d7999b5fa9cac2b92033fd0a0b177cd9327f5 (diff) | |
| parent | 5b221805864f78c4baf94d48efda842a84f9fa96 (diff) | |
| download | mariadb-git-918090030b5556f84a163719cf58d7f5bcdbc449.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 4c98882ac7e..473aabe0c01 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -325,6 +325,9 @@ static int keycache_pthread_cond_signal(pthread_cond_t *cond); #endif /* defined(KEYCACHE_DEBUG) */ #if !defined(DBUG_OFF) +#if defined(inline) +#undef inline +#endif #define inline /* disabled inline for easier debugging */ static int fail_block(BLOCK_LINK *block); static int fail_hlink(HASH_LINK *hlink); |