diff options
| author | unknown <guilhem@gbichot4.local> | 2007-07-27 12:06:39 +0200 |
|---|---|---|
| committer | unknown <guilhem@gbichot4.local> | 2007-07-27 12:06:39 +0200 |
| commit | a3d2ae4648d739a7ec7820e22c05373fde65b770 (patch) | |
| tree | 1c7c807fa27f54c3bc16968151fcc79e1f8b4667 /mysys/mf_keycache.c | |
| parent | 662002fc8f6301ec78d2eca14c5f991212d4f67f (diff) | |
| download | mariadb-git-a3d2ae4648d739a7ec7820e22c05373fde65b770.tar.gz | |
merging MyISAM changes into Maria (not done in 5.1->maria merge of
Jul 7th). "maria.test" and "ps_maria.test" still fail;
"ma_test_all" starts failing (MyISAM has the same issue see BUG#30094).
include/maria.h:
merging MyISAM changes into Maria
mysys/mf_keycache.c:
mi_test_all showed "floating point exception", this was already
fixed in the latest 5.1, importing fix.
sql/item_xmlfunc.cc:
compiler warning (already fixed in latest 5.1)
storage/maria/ha_maria.cc:
merging MyISAM changes into Maria. See #ifdef ASK_MONTY.
storage/maria/ha_maria.h:
merging MyISAM changes into Maria
storage/maria/ma_cache.c:
merging MyISAM changes into Maria
storage/maria/ma_check.c:
merging MyISAM changes into Maria
storage/maria/ma_create.c:
merging MyISAM changes into Maria
storage/maria/ma_dynrec.c:
merging MyISAM changes into Maria
storage/maria/ma_extra.c:
merging MyISAM changes into Maria
storage/maria/ma_ft_boolean_search.c:
merging MyISAM changes into Maria
storage/maria/ma_ft_nlq_search.c:
merging MyISAM changes into Maria
storage/maria/ma_info.c:
merging MyISAM changes into Maria
storage/maria/ma_key.c:
merging MyISAM changes into Maria
storage/maria/ma_loghandler.c:
compiler warning (part->length is size_t)
storage/maria/ma_open.c:
merging MyISAM changes into Maria
storage/maria/ma_preload.c:
merging MyISAM changes into Maria
storage/maria/ma_range.c:
merging MyISAM changes into Maria
storage/maria/ma_rkey.c:
merging MyISAM changes into Maria
storage/maria/ma_rt_index.c:
merging MyISAM changes into Maria
storage/maria/ma_rt_key.c:
merging MyISAM changes into Maria
storage/maria/ma_rt_split.c:
merging MyISAM changes into Maria
storage/maria/ma_search.c:
merging MyISAM changes into Maria
storage/maria/ma_sort.c:
merging MyISAM changes into Maria
storage/maria/maria_def.h:
merging MyISAM changes into Maria
Diffstat (limited to 'mysys/mf_keycache.c')
| -rw-r--r-- | mysys/mf_keycache.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 6845e63dc33..4a8ab5b6719 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -2522,10 +2522,8 @@ uchar *key_cache_read(KEY_CACHE *keycache, int error=0; uchar *start= buff; DBUG_ENTER("key_cache_read"); - DBUG_PRINT("enter", ("fd: %u pos: %lu page: %lu length: %u", - (uint) file, (ulong) filepos, - (ulong) (filepos / keycache->key_cache_block_size), - length)); + DBUG_PRINT("enter", ("fd: %u pos: %lu length: %u", + (uint) file, (ulong) filepos, length)); if (keycache->key_cache_inited) { @@ -2979,10 +2977,10 @@ int key_cache_write(KEY_CACHE *keycache, int error=0; DBUG_ENTER("key_cache_write"); DBUG_PRINT("enter", - ("fd: %u pos: %lu page: %lu length: %u block_length: %u", - (uint) file, (ulong) filepos, - (ulong) (filepos / keycache->key_cache_block_size), - length, block_length)); + ("fd: %u pos: %lu length: %u block_length: %u key_block_length: + %u", + (uint) file, (ulong) filepos, length, block_length, + keycache ? keycache->key_cache_block_size : 0)); if (!dont_write) { |