maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2868
committer: Michael Widenius <monty@xxxxxxxxxxxx>
branch nick: maria-5.1
timestamp: Wed 2010-06-16 01:00:51 +0300
message:
  Fixed compiler warnings
modified:
  sql/log_event.cc
  storage/maria/ma_state.c
  storage/maria/maria_chk.c
  storage/myisam/mi_dynrec.c
  support-files/compiler_warnings.supp


--
lp:~maria-captains/maria/5.1-converting
https://code.launchpad.net/~maria-captains/maria/5.1-converting

Your team Maria developers is subscribed to branch lp:~maria-captains/maria/5.1-converting.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1-converting/+edit-subscription

=== modified file 'sql/log_event.cc'
--- sql/log_event.cc	2010-04-28 12:52:24 +0000
+++ sql/log_event.cc	2010-06-15 22:00:51 +0000
@@ -1716,13 +1716,13 @@
 
   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;
     }

=== modified file 'storage/maria/ma_state.c'
--- storage/maria/ma_state.c	2010-06-13 22:13:32 +0000
+++ storage/maria/ma_state.c	2010-06-15 22:00:51 +0000
@@ -639,7 +639,9 @@
 
 /* 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");

=== modified file 'storage/maria/maria_chk.c'
--- storage/maria/maria_chk.c	2009-04-25 09:04:38 +0000
+++ storage/maria/maria_chk.c	2010-06-15 22:00:51 +0000
@@ -1094,7 +1094,7 @@
   */
   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",

=== modified file 'storage/myisam/mi_dynrec.c'
--- storage/myisam/mi_dynrec.c	2010-04-28 12:52:24 +0000
+++ storage/myisam/mi_dynrec.c	2010-06-15 22:00:51 +0000
@@ -116,7 +116,7 @@
 {
   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;

=== modified file 'support-files/compiler_warnings.supp'
--- support-files/compiler_warnings.supp	2010-05-27 17:18:31 +0000
+++ support-files/compiler_warnings.supp	2010-06-15 22:00:51 +0000
@@ -130,7 +130,7 @@
 #
 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