From: Tor Didriksen
Date: October 27 2010 8:25am
Subject: bzr commit into mysql-trunk-bugfixing branch (tor.didriksen:3294) Bug#45288
List-Archive: http://lists.mysql.com/commits/122046
X-Bug: 45288
Message-Id: <20101027082530.EE43437C4@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1503938170482779466=="

--===============1503938170482779466==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/trunk-bugfixing/ based on revid:gkodinov@stripped

 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
=== 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;
 	}
 


--===============1503938170482779466==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   3yiw38jrtghl8yol
# target_branch: file:///export/home/didrik/repo/trunk-bugfixing/
# testament_sha1: 4f344e9dbfb1a0f0a3efb314190f2febe5f16265
# timestamp: 2010-10-27 10:25:30 +0200
# base_revision_id: gkodinov@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTKZyloAAbbfgEgwWuf//1+A
BAC////wUAQr29tbj3vFbZXjzcEkgppqZlT9qaGU3qaJqfpQ9T0hpmk0YmgEpBNBhNJqeRA0yAA0
DRo0GggQaImR6QAAAAAAABIpNRtIyCYnlPU0xNAANAA0NBKIJo00mQyGkT2U9UflRtT0Jo0ZDIO2
MYkZebb8G8vE+u3dQdep9SDTOM4ZcjsvZoWj00kdhdZUylGzWlTaVCtDFi2Ubd/ApPTVH1zTv2e+
6U3ntnxtdkY/iWPU2p5vh0vH78bu8GKFFoTJuq9eTFQxgSHTUh+hD7C8wsDaV5g7Lc0cMMFrzykK
jWmS2JTfqgFxXnfZsuixu3DnixDEYAaRD6UgkptJATryiyqSu3oorYN8A1iaplIqUi0YeUwhYoha
SzVjQcvLtumMuKb1p3zv/ASVfTdZp+mw9zBaQ0xJ4wmIq1wuvoFstQViGp3GQZbHhR5Ld9kTVhtK
kx2V0it4cAc/+CWoQVYmV0Kslka02LD6VWKicxRJ6gqnoNStS1JpX8ebFY0ZRpzyzA+N25HGMwiL
psUSHuorwvLQY8tekmNQmgKR3JYFyWWhVCOZsKYygtGtL+eucp0g3EJysEUWJktGvHPjC21oixFL
Bk5VIV0FRCvqcuhxg5yTo2vietzWqJ5EuRixNIAwFAsxWaEYI8AcZJKBT3d5o52yK3c348e28kH9
XHKlTUwzN6evIfZGlLCL5NQoU93Njx1Dg2hh/nGnaBDsOKNJChpv0srfvpQkQ5muJ6uQmXXdYDs8
/g4j3mklCBneQHdWu/aYtPngCjy8SgPfRHZpDOsJ460HmTWnMKDcUBb8m/WfHZwuZgIJFuuzBjEz
SvxcZjOssU6BGK1bAprYH1pOR7kggLqaVYioHMkMVl63t8Xcl0nZFeDIkQfk6IMFEJZqjWVcimTP
IEkZArvU+DiIRoRhnEzFKdJsKyCgLdkT49c+oG+BxuGNW9gycLcCw/cJtLdMcD8E5z8WQcAy4RyU
P3GKYEy3hHKiQkqknLKSU/9Du2ojYMKoAdWy1CZCzANUZ/HUeBUk/twujKwMg7LxNeT87A+YtuhD
T4zDXgtwEA/ybeFQVOOQm/jUFzFQCpPVvw9FOuXnBEOlOwJlpKVoHjDjO9wz0R9bVUGk6OEU9wM1
yA0w10lKJiwamsjfi0Ng1n0ckJEFLA8Aq0KaSNG+rpuvpZAGKlHNBbg5xnm4FGbGtitvLFa2DmMh
yy1xw2SirmdpcCYl2UxR+1S5VjSrj7QMrXoKIsg6W0SupyCk04MLGgi7h1lBeUvXoAuTS2jQC3ly
teZIkFRMIIYK06hKSWW/ebOiCtW0mayyR15CPIsgaVj4YHYK7pASpFVqC5xYl9nQms5zlt8pmPcc
CtFMr6L04krAkKggnRTQpTKlU966CcL7ipOSn1D6T/i7kinChIGUzlLQ


--===============1503938170482779466==--