diff options
| author | monty@donna.mysql.com <> | 2000-08-22 00:18:32 +0300 |
|---|---|---|
| committer | monty@donna.mysql.com <> | 2000-08-22 00:18:32 +0300 |
| commit | f0952ce3e1e4a315efb62b09038bcd933b51d5a1 (patch) | |
| tree | c129c5ccdb3df8c87c28c6a51baac6e208294313 /sql/table.cc | |
| parent | 48ee575ebcae86c55687b41e6af9c48c75f55d77 (diff) | |
| download | mariadb-git-f0952ce3e1e4a315efb62b09038bcd933b51d5a1.tar.gz | |
FLUSH TABLE table_list
Fixes for RENAME TABLE
Portability fixes
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/table.cc b/sql/table.cc index 98f7b089b19..82ad1f13606 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -33,7 +33,7 @@ static uint find_field(TABLE *form,uint start,uint length); static byte* get_field_name(Field *buff,uint *length, my_bool not_used __attribute__((unused))) { - *length= strlen(buff->field_name); + *length= (uint) strlen(buff->field_name); return (byte*) buff->field_name; } @@ -670,7 +670,7 @@ ulong make_new_entry(File file, uchar *fileinfo, TYPELIB *formnames, uchar *pos; DBUG_ENTER("make_new_entry"); - length=strlen(newname)+1; + length=(uint) strlen(newname)+1; n_length=uint2korr(fileinfo+4); maxlength=uint2korr(fileinfo+6); names=uint2korr(fileinfo+8); @@ -680,7 +680,7 @@ ulong make_new_entry(File file, uchar *fileinfo, TYPELIB *formnames, { /* Expand file */ newpos+=IO_SIZE; int4store(fileinfo+10,newpos); - endpos=(ulong) my_seek(file,0L,MY_SEEK_END,MYF(0)); /* Copy from file-end */ + endpos=(ulong) my_seek(file,0L,MY_SEEK_END,MYF(0));/* Copy from file-end */ bufflength= (uint) (endpos & (IO_SIZE-1)); /* IO_SIZE is a power of 2 */ while (endpos > maxlength) |