diff options
| author | unknown <joerg@trift2.> | 2007-06-06 19:59:18 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-06 19:59:18 +0200 |
| commit | 92a46e05794ca134c8feb7190c7c21496c3134bf (patch) | |
| tree | d107f76384810baaf845921af162fd7858539c30 /mysys | |
| parent | 10a21ed042e39c8800893dbb8ba711d54daf4896 (diff) | |
| parent | d05a958056137ab0f5727a2b125a2fc02f71a4b9 (diff) | |
| download | mariadb-git-92a46e05794ca134c8feb7190c7c21496c3134bf.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
CMakeLists.txt:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932_binlog.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/sql_parse.cc:
Auto merged
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); |