diff options
| -rw-r--r-- | sql/log_event.cc | 10 | ||||
| -rw-r--r-- | storage/maria/ma_state.c | 4 | ||||
| -rw-r--r-- | storage/maria/maria_chk.c | 2 | ||||
| -rw-r--r-- | storage/myisam/mi_dynrec.c | 2 | ||||
| -rw-r--r-- | support-files/compiler_warnings.supp | 2 |
5 files changed, 11 insertions, 9 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index f00b271e491..7d8bedd6c79 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -1716,13 +1716,13 @@ beg: case MYSQL_TYPE_DATETIME: { - size_t d, t; + ulong d, t; uint64 i64= uint8korr(ptr); /* YYYYMMDDhhmmss */ - d= i64 / 1000000; - t= i64 % 1000000; + d= (ulong) (i64 / 1000000); + t= (ulong) (i64 % 1000000); my_b_printf(file, "%04d-%02d-%02d %02d:%02d:%02d", - d / 10000, (d % 10000) / 100, d % 100, - t / 10000, (t % 10000) / 100, t % 100); + (int) (d / 10000), (int) (d % 10000) / 100, (int) (d % 100), + (int) (t / 10000), (int) (t % 10000) / 100, (int) t % 100); my_snprintf(typestr, typestr_length, "DATETIME"); return 8; } diff --git a/storage/maria/ma_state.c b/storage/maria/ma_state.c index c8fcf1a6818..cc5eea578a5 100644 --- a/storage/maria/ma_state.c +++ b/storage/maria/ma_state.c @@ -639,7 +639,9 @@ my_bool _ma_block_check_status(void *param __attribute__((unused))) /* 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; DBUG_ENTER("_ma_block_get_status_no_version"); diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index ab3c641b55f..0bf38ac5dc8 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -1094,7 +1094,7 @@ static int maria_chk(HA_CHECK *param, char *filename) */ maria_lock_database(info, F_EXTRA_LCK); 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) { _ma_check_print_error(param, "Can't initialize page cache with %lu memory", diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c index adae7076858..dae8fbe50a8 100644 --- a/storage/myisam/mi_dynrec.c +++ b/storage/myisam/mi_dynrec.c @@ -116,7 +116,7 @@ int mi_munmap_file(MI_INFO *info) { int ret; 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); info->s->file_read= mi_nommap_pread; info->s->file_write= mi_nommap_pwrite; diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index 8e2b63e7a46..c8d2926145d 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -130,7 +130,7 @@ xaction_xt\.cc: may be used uninitialized in this function # storage/pbxt/ : typedef.*was ignored in this declaration 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 |