summaryrefslogtreecommitdiff
path: root/storage/maria/ma_preload.c
diff options
context:
space:
mode:
authorMichael Widenius <monty@mysql.com>2009-01-09 06:23:25 +0200
committerMichael Widenius <monty@mysql.com>2009-01-09 06:23:25 +0200
commit7eda7f1337e633d473e432e9c74b3d2383b2f938 (patch)
tree70470ac755485cb1e7ed003c1828d7c213ebb88d /storage/maria/ma_preload.c
parentd6bdf03375977d89bf66c64b5ce72b67ec35c36d (diff)
downloadmariadb-git-7eda7f1337e633d473e432e9c74b3d2383b2f938.tar.gz
Code cleanup:
- Removed not needed casts - Indentation fixes - Changed some buffer variables to uchar, to be able to remove casts storage/maria/ma_bitmap.c: Removed not needed casts storage/maria/ma_blockrec.c: Removed not needed casts storage/maria/ma_check.c: Removed not needed casts. Changed type of buffers to be able to remove casts storage/maria/ma_create.c: Removed not needed casts storage/maria/ma_delete.c: Removed not needed casts storage/maria/ma_dynrec.c: Removed not needed casts storage/maria/ma_extra.c: Removed not needed casts storage/maria/ma_ft_boolean_search.c: Removed not needed casts storage/maria/ma_ft_nlq_search.c: Removed not needed casts storage/maria/ma_ft_parser.c: Removed not needed casts storage/maria/ma_loghandler.c: Removed not needed casts storage/maria/ma_open.c: Removed not needed casts storage/maria/ma_packrec.c: Removed not needed casts storage/maria/ma_pagecache.c: Removed not needed casts storage/maria/ma_preload.c: Removed not needed casts Removed not needed initialization storage/maria/ma_rnext_same.c: Removed not needed casts storage/maria/ma_rt_index.c: Removed not needed casts storage/maria/ma_search.c: Removed not needed casts storage/maria/ma_sort.c: Removed not needed casts Removed not needed if Fixed indentation storage/maria/ma_statrec.c: Removed not needed casts storage/maria/ma_test2.c: Removed not needed casts storage/maria/ma_write.c: Removed not needed casts Indentation fixes storage/maria/maria_chk.c: Removed not needed casts storage/maria/maria_pack.c: Removed not needed casts
Diffstat (limited to 'storage/maria/ma_preload.c')
-rw-r--r--storage/maria/ma_preload.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_preload.c b/storage/maria/ma_preload.c
index c453788ed49..84e0bcb2352 100644
--- a/storage/maria/ma_preload.c
+++ b/storage/maria/ma_preload.c
@@ -42,7 +42,7 @@
int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves)
{
ulong block_length= 0;
- uchar *buff= NULL;
+ uchar *buff;
MARIA_SHARE* share= info->s;
uint keynr;
my_off_t key_file_length= share->state.state.key_file_length;
@@ -84,7 +84,7 @@ int maria_preload(MARIA_HA *info, ulonglong key_map, my_bool ignore_leaves)
consecutive pages (like the my_pread() in mi_preload()).
*/
if (pagecache_read(share->pagecache, &share->kfile, page_no,
- DFLT_INIT_HITS, (uchar*) buff, share->page_type,
+ DFLT_INIT_HITS, buff, share->page_type,
PAGECACHE_LOCK_WRITE, &page_link) == NULL)
goto err;
keynr= _ma_get_keynr(share, buff);