1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compiler warnings

Browse Source 
sql/log_event.cc:
  Fixed compiler warning on windows
storage/maria/ma_state.c:
  Fixed compiler warning
storage/maria/maria_chk.c:
  Fixed compiler warning
storage/myisam/mi_dynrec.c:
  Fixed compiler warning
support-files/compiler_warnings.supp:
  Fixed suppression rule
This commit is contained in:
Michael Widenius 2010-06-16 01:00:51 +03:00
parent 26968d68a9
commit cfbee9359c
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/log_event.cc
View File

@ -1716,13 +1716,13 @@ beg:
case MYSQL_TYPE_DATETIME: case MYSQL_TYPE_DATETIME:
{ {
size_t d, t; ulong d, t;
uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */
d= i64 / 1000000; d= (ulong) (i64 / 1000000);
t= i64 % 1000000; t= (ulong) (i64 % 1000000);
my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d", my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d",
d / 10000, (d % 10000) / 100, d % 100, (int) (d / 10000), (int) (d % 10000) / 100, (int) (d % 100),
t / 10000, (t % 10000) / 100, t % 100); (int) (t / 10000), (int) (t % 10000) / 100, (int) t % 100);
my_snprintf(typestr, typestr_length, "DATETIME"); my_snprintf(typestr, typestr_length, "DATETIME");
return 8; return 8;
} }

4
storage/maria/ma_state.c
View File

@ -639,7 +639,9 @@ my_bool _ma_block_check_status(void *param __attribute__((unused)))
/* Get status when transactional but not versioned */ /* Get status when transactional but not versioned */
void _ma_block_get_status_no_versioning(void* param, my_bool concurrent_insert) void _ma_block_get_status_no_versioning(void* param,
my_bool concurrent_insert
__attribute__((unused)))
{ {
MARIA_HA *info=(MARIA_HA*) param; MARIA_HA *info=(MARIA_HA*) param;
DBUG_ENTER("_ma_block_get_status_no_version"); DBUG_ENTER("_ma_block_get_status_no_version");

2
storage/maria/maria_chk.c
View File

@ -1094,7 +1094,7 @@ static int maria_chk(HA_CHECK *param, char *filename)
*/ */
maria_lock_database(info, F_EXTRA_LCK); maria_lock_database(info, F_EXTRA_LCK);
datafile= info->dfile.file; datafile= info->dfile.file;
if (init_pagecache(maria_pagecache, param->use_buffers, 0, 0, if (init_pagecache(maria_pagecache, (size_t) param->use_buffers, 0, 0,
maria_block_size, MY_WME) == 0) maria_block_size, MY_WME) == 0)
{ {
_ma_check_print_error(param, "Can't initialize page cache with %lu memory", _ma_check_print_error(param, "Can't initialize page cache with %lu memory",

2
storage/myisam/mi_dynrec.c
View File

@ -116,7 +116,7 @@ int mi_munmap_file(MI_INFO *info)
{ {
int ret; int ret;
DBUG_ENTER("mi_unmap_file"); DBUG_ENTER("mi_unmap_file");
if ((ret= my_munmap(info->s->file_map, info->s->mmaped_length))) if ((ret= my_munmap(info->s->file_map, (size_t) info->s->mmaped_length)))
DBUG_RETURN(ret); DBUG_RETURN(ret);
info->s->file_read= mi_nommap_pread; info->s->file_read= mi_nommap_pread;
info->s->file_write= mi_nommap_pwrite; info->s->file_write= mi_nommap_pwrite;

2
support-files/compiler_warnings.supp
View File

@ -130,7 +130,7 @@ xaction_xt\.cc: may be used uninitialized in this function
# #
storage/pbxt/ : typedef.*was ignored in this declaration storage/pbxt/ : typedef.*was ignored in this declaration
ha_pbxt\.cc : variable.*might be clobbered by.*longjmp ha_pbxt\.cc : variable.*might be clobbered by.*longjmp
table_xt\.cc : variable.*might be clobbered by ~longjm~p or ~vfork~ table_xt\.cc : variable.*might be clobbered by.*longjmp
# #
# Yassl # Yassl