diff options
| author | unknown <guilhem@gbichot3.local> | 2006-12-20 18:58:35 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2006-12-20 18:58:35 +0100 |
| commit | 714f3b73e513f2d12fb45e8256fa6299e60cd5a2 (patch) | |
| tree | 760f67854bfdcd407feba1aebfc7c9f3ddbccafd /mysys/mf_keycache.c | |
| parent | 8b998d1199d53baf002f6ad725fa69e4b2f6813b (diff) | |
| download | mariadb-git-714f3b73e513f2d12fb45e8256fa6299e60cd5a2.tar.gz | |
merge of recent MyISAM changes into Maria.
Only failure is ndb_restore - could have been worse!!
include/pagecache.h:
LSN->lsn
mysys/mf_keycache.c:
page_status is int
mysys/mf_pagecache.c:
merge of recent key cache changes
sql/mysqld.cc:
post-merge fixes
sql/set_var.cc:
post-merge fixes
storage/maria/ha_maria.cc:
merge of recent MyISAM changes into Maria
storage/maria/ha_maria.h:
merge of recent MyISAM changes into Maria
storage/maria/ma_close.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_create.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_delete.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_dynrec.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_ft_boolean_search.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_key.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_keycache.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_open.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_page.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_rsamepos.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_statrec.c:
merge of recent MyISAM changes into Maria
storage/maria/ma_unique.c:
merge of recent MyISAM changes into Maria
storage/maria/maria_chk.c:
merge of recent MyISAM changes into Maria
storage/maria/maria_pack.c:
merge of recent MyISAM changes into Maria
storage/myisam/myisampack.c:
compiler warning
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 111a28d01a4..12be01184b6 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1642,9 +1642,9 @@ restart: KEYCACHE_DBUG_ASSERT(page_status != -1); *page_st=page_status; KEYCACHE_DBUG_PRINT("find_key_block", - ("fd: %d pos: %lu block->status: %u page_status: %u", + ("fd: %d pos: %lu block->status: %u page_status: %d", file, (ulong) filepos, block->status, - (uint) page_status)); + page_status)); #if !defined(DBUG_OFF) && defined(EXTRA_DEBUG) DBUG_EXECUTE("check_keycache2", |