diff options
| author | unknown <jani@hynda.mysql.fi> | 2007-07-02 20:45:15 +0300 |
|---|---|---|
| committer | unknown <jani@hynda.mysql.fi> | 2007-07-02 20:45:15 +0300 |
| commit | 631ecaabea7336a8f28367c0d1c291f0433f7e88 (patch) | |
| tree | 2eb68f1f6af5e60c4bcdd8fcfa7e14f3650de830 /storage/maria/ma_preload.c | |
| parent | cfdd73369c0c2d57908af8dc727de33567fe9e0b (diff) | |
| download | mariadb-git-631ecaabea7336a8f28367c0d1c291f0433f7e88.tar.gz | |
Merged with mysql-5.1 main tree.
BUILD/compile-pentium-debug-max:
Added definition after macro was removed from main tree. This will
be fixed back in main tree later.
Diffstat (limited to 'storage/maria/ma_preload.c')
| -rw-r--r-- | storage/maria/ma_preload.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/maria/ma_preload.c b/storage/maria/ma_preload.c index 44fc12f8571..35ae8868ee7 100644 --- a/storage/maria/ma_preload.c +++ b/storage/maria/ma_preload.c @@ -76,7 +76,7 @@ int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves) /* Read the next block of index file into the preload buffer */ if ((my_off_t) length > (key_file_length-pos)) length= (ulong) (key_file_length-pos); - if (my_pread(share->kfile.file, (byte*) buff, length, pos, + if (my_pread(share->kfile.file, (uchar*) buff, length, pos, MYF(MY_FAE|MY_FNABP))) goto err; @@ -91,7 +91,7 @@ int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves) if (pagecache_write(share->pagecache, &share->kfile, pos / block_length, DFLT_INIT_HITS, - (byte*) buff, + (uchar*) buff, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, PAGECACHE_PIN_LEFT_UNPINNED, @@ -108,7 +108,7 @@ int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves) if (pagecache_write(share->pagecache, &share->kfile, pos / block_length, DFLT_INIT_HITS, - (byte*) buff, + (uchar*) buff, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, PAGECACHE_PIN_LEFT_UNPINNED, |