bzr push into mysql-trunk-bugfixing branch (tor.didriksen:3293 to 3294) Bug#45288

[Tor Didriksen]

 3294 Tor Didriksen	2010-10-27
      Bug#45288: pb2 returns a lot of compilation warnings
      
      DBG build broken on freebsd:
      storage/innobase/os/os0sync.c:171: warning: format '%lu' expects type 'long unsigned int', but argument 4 has type 'time_t'
     @ storage/innobase/os/os0sync.c
        Cast arguments to match format string.

    modified:
      storage/innobase/os/os0sync.c
 3293 Georgi Kodinov	2010-10-27 [merge]
      merge

    modified:
      sql/ha_partition.h
      sql/sql_partition.cc
      sql/sql_show.cc
=== modified file 'storage/innobase/os/os0sync.c'
--- a/storage/innobase/os/os0sync.c	2010-10-19 09:53:21 +0000
+++ b/storage/innobase/os/os0sync.c	2010-10-27 08:25:25 +0000
@@ -168,7 +168,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;
 	}
 

No bundle (reason: useless for push emails).