1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

Several fixes revelaled by Intel compiler.

cmd-line-utils/readline/complete.c:
  Added a cast.
dbug/my_main.c:
  Added an include to avoid implicit declaration of
  my_thread_global_init()
include/my_global.h:
  undef cannot be used on this predefined name.
  Since it is a custom fix for gcc 2.8.0, let's make it only
  effective in that case.
include/my_sys.h:
  Added a new type, TYPE_NOT_SET.
myisam/ft_boolean_search.c:
  Added casts.
myisam/mi_key.c:
  Added cast.
myisam/mi_open.c:
  Added cast.
  Changed function types.
myisam/mi_test1.c:
  Added cast.
myisam/myisamchk.c:
  Added cast.
myisam/myisamdef.h:
  Changed function type.
myisam/myisampack.c:
  Added casts.
myisam/sp_key.c:
  Added cast.
mysys/mf_iocache.c:
  Fixed invalid use of 0 to info->type. According to comment it
  should not have been set, but in earlier code by setting it
  to 0 would have been same as setting it to READ_CACHE. This
  probably was not desired, potential bug.
server-tools/instance-manager/instance_options.cc:
  Fixed a typo.
server-tools/instance-manager/protocol.cc:
  Changed enum to int.
  Changed char to uchar.
  Added casts.
sql/mysql_priv.h:
  Bit overflow.
sql/sql_base.cc:
  Removed unused label. The code below label was unused too, because
  there is a return just before.
sql/sql_parse.cc:
  Removed unneccessary extra argument.
This commit is contained in:
unknown
2005-09-23 16:47:08 +03:00
parent abda6dc69f
commit ecffc1b83c
18 changed files with 42 additions and 38 deletions

View File

@@ -199,7 +199,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags)
DBUG_PRINT("warning",("saved_base_info_length: %d base_info_length: %d",
len,MI_BASE_INFO_SIZE))
}
disk_pos=my_n_base_info_read((uchar*) disk_cache + base_pos, &share->base);
disk_pos= (char*)
my_n_base_info_read((uchar*) disk_cache + base_pos, &share->base);
share->state.state_length=base_pos;
if (!(open_flags & HA_OPEN_FOR_REPAIR) &&
@@ -863,7 +864,7 @@ uint mi_state_info_write(File file, MI_STATE_INFO *state, uint pWrite)
}
char *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state)
uchar *mi_state_info_read(uchar *ptr, MI_STATE_INFO *state)
{
uint i,keys,key_parts,key_blocks;
memcpy_fixed(&state->header,ptr, sizeof(state->header));
@@ -974,7 +975,7 @@ uint mi_base_info_write(File file, MI_BASE_INFO *base)
}
char *my_n_base_info_read(uchar *ptr, MI_BASE_INFO *base)
uchar *my_n_base_info_read(uchar *ptr, MI_BASE_INFO *base)
{
base->keystart = mi_sizekorr(ptr); ptr +=8;
base->max_data_file_length = mi_sizekorr(ptr); ptr +=8;