List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:October 28 2010 5:13pm
Subject:bzr commit into mysql-5.5-innodb branch (vasil.dimov:3213)
View as plain text  
#At file:///usr/local/devel/bzrroot/server/mysql-5.5-innodb/ based on revid:calvin.sun@stripped

 3213 Vasil Dimov	2010-10-28
      Fix a compilation warning:
      
      /export/home/pb2/build/sb_0-2459340-1288264809.63/mysql-5.5.8-ga/storage/innobase/os/os0sync.c: In function 'os_cond_wait_timed':
      /export/home/pb2/build/sb_0-2459340-1288264809.63/mysql-5.5.8-ga/storage/innobase/os/os0sync.c:184: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'time_t'
      gmake[2]: *** [storage/innobase/CMakeFiles/innobase.dir/os/os0sync.c.o] Error 1 

    modified:
      storage/innobase/os/os0sync.c
=== modified file 'storage/innobase/os/os0sync.c'
--- a/storage/innobase/os/os0sync.c	revid:calvin.sun@stripped
+++ b/storage/innobase/os/os0sync.c	revid:vasil.dimov@stripped
@@ -181,7 +181,7 @@ os_cond_wait_timed(
 	default:
 		fprintf(stderr, "  InnoDB: pthread_cond_timedwait() returned: "
 				"%d: abstime={%lu,%lu}\n",
-				ret, abstime->tv_sec, abstime->tv_nsec);
+				ret, (ulong) abstime->tv_sec, (ulong) abstime->tv_nsec);
 		ut_error;
 	}
 


Attachment: [text/bzr-bundle] bzr/vasil.dimov@oracle.com-20101028171223-10w9wn069a80lenx.bundle
Thread
bzr commit into mysql-5.5-innodb branch (vasil.dimov:3213) vasil.dimov28 Oct