summaryrefslogtreecommitdiff
path: root/storage/myisam/mi_statrec.c
diff options
context:
space:
mode:
Diffstat (limited to 'storage/myisam/mi_statrec.c')
-rw-r--r--storage/myisam/mi_statrec.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/storage/myisam/mi_statrec.c b/storage/myisam/mi_statrec.c
index 3f92ec31d4c..93e91fb9e32 100644
--- a/storage/myisam/mi_statrec.c
+++ b/storage/myisam/mi_statrec.c
@@ -18,7 +18,7 @@
#include "myisamdef.h"
-int _mi_write_static_record(MI_INFO *info, const byte *record)
+int _mi_write_static_record(MI_INFO *info, const uchar *record)
{
uchar temp[8]; /* max pointer length */
if (info->s->state.dellink != HA_OFFSET_ERROR &&
@@ -48,14 +48,14 @@ int _mi_write_static_record(MI_INFO *info, const byte *record)
}
if (info->opt_flag & WRITE_CACHE_USED)
{ /* Cash in use */
- if (my_b_write(&info->rec_cache, (byte*) record,
+ if (my_b_write(&info->rec_cache, (uchar*) record,
info->s->base.reclength))
goto err;
if (info->s->base.pack_reclength != info->s->base.reclength)
{
uint length=info->s->base.pack_reclength - info->s->base.reclength;
bzero((char*) temp,length);
- if (my_b_write(&info->rec_cache, (byte*) temp,length))
+ if (my_b_write(&info->rec_cache, (uchar*) temp,length))
goto err;
}
}
@@ -70,7 +70,7 @@ int _mi_write_static_record(MI_INFO *info, const byte *record)
{
uint length=info->s->base.pack_reclength - info->s->base.reclength;
bzero((char*) temp,length);
- if (info->s->file_write(info, (byte*) temp,length,
+ if (info->s->file_write(info, (uchar*) temp,length,
info->state->data_file_length+
info->s->base.reclength,
info->s->write_flag))
@@ -85,7 +85,7 @@ int _mi_write_static_record(MI_INFO *info, const byte *record)
return 1;
}
-int _mi_update_static_record(MI_INFO *info, my_off_t pos, const byte *record)
+int _mi_update_static_record(MI_INFO *info, my_off_t pos, const uchar *record)
{
info->rec_cache.seek_not_done=1; /* We have done a seek */
return (info->s->file_write(info,
@@ -105,12 +105,12 @@ int _mi_delete_static_record(MI_INFO *info)
_mi_dpointer(info,temp+1,info->s->state.dellink);
info->s->state.dellink = info->lastpos;
info->rec_cache.seek_not_done=1;
- return (info->s->file_write(info,(byte*) temp, 1+info->s->rec_reflength,
+ return (info->s->file_write(info,(uchar*) temp, 1+info->s->rec_reflength,
info->lastpos, MYF(MY_NABP)) != 0);
}
-int _mi_cmp_static_record(register MI_INFO *info, register const byte *old)
+int _mi_cmp_static_record(register MI_INFO *info, register const uchar *old)
{
DBUG_ENTER("_mi_cmp_static_record");
@@ -133,7 +133,7 @@ int _mi_cmp_static_record(register MI_INFO *info, register const byte *old)
info->lastpos,
MYF(MY_NABP)))
DBUG_RETURN(-1);
- if (memcmp((byte*) info->rec_buff, (byte*) old,
+ if (memcmp((uchar*) info->rec_buff, (uchar*) old,
(uint) info->s->base.reclength))
{
DBUG_DUMP("read",old,info->s->base.reclength);
@@ -147,7 +147,7 @@ int _mi_cmp_static_record(register MI_INFO *info, register const byte *old)
int _mi_cmp_static_unique(MI_INFO *info, MI_UNIQUEDEF *def,
- const byte *record, my_off_t pos)
+ const uchar *record, my_off_t pos)
{
DBUG_ENTER("_mi_cmp_static_unique");
@@ -166,7 +166,7 @@ int _mi_cmp_static_unique(MI_INFO *info, MI_UNIQUEDEF *def,
/* MY_FILE_ERROR on read-error or locking-error */
int _mi_read_static_record(register MI_INFO *info, register my_off_t pos,
- register byte *record)
+ register uchar *record)
{
int error;
@@ -199,7 +199,7 @@ int _mi_read_static_record(register MI_INFO *info, register my_off_t pos,
-int _mi_read_rnd_static_record(MI_INFO *info, byte *buf,
+int _mi_read_rnd_static_record(MI_INFO *info, uchar *buf,
register my_off_t filepos,
my_bool skip_deleted_blocks)
{
@@ -274,11 +274,11 @@ int _mi_read_rnd_static_record(MI_INFO *info, byte *buf,
}
/* Read record with cacheing */
- error=my_b_read(&info->rec_cache,(byte*) buf,share->base.reclength);
+ error=my_b_read(&info->rec_cache,(uchar*) buf,share->base.reclength);
if (info->s->base.pack_reclength != info->s->base.reclength && !error)
{
char tmp[8]; /* Skill fill bytes */
- error=my_b_read(&info->rec_cache,(byte*) tmp,
+ error=my_b_read(&info->rec_cache,(uchar*) tmp,
info->s->base.pack_reclength - info->s->base.reclength);
}
if (locked)