maria-developers team mailing list archive

Thread
Date

Re: [Commits] bzr commit into MariaDB 5.1, with Maria 1.5:maria branch (monty:2897)

To: Michael Widenius <monty@xxxxxxxxxxxx>, maria-developers@xxxxxxxxxxxxxxxxxxx
From: Kristian Nielsen <knielsen@xxxxxxxxxxxxxxx>
Date: Tue, 10 Aug 2010 15:54:26 +0200
In-reply-to: <20100809175501.24ABC15036@nosik.askmonty.org> (Michael Widenius's message of "Mon\, 09 Aug 2010 17\:55\:01 -0000")
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux)

Michael Widenius <michael.widenius@xxxxxxxxx> writes:

> #At lp:maria based on revid:monty@xxxxxxxxx-20100809170542-ewa2awm6pcoi1ipy
>
>  2897 Michael Widenius	2010-08-09
>       Ignore ENOLCK errno from FreeBSD (known problem in old FreeBSD releases)
>       modified:
>         mysys/my_sync.c
>
> === modified file 'mysys/my_sync.c'
> --- a/mysys/my_sync.c	2010-08-09 17:05:42 +0000
> +++ b/mysys/my_sync.c	2010-08-09 17:54:58 +0000
> @@ -68,6 +68,8 @@ int my_sync(File fd, myf my_flags)
>      res= fdatasync(fd);
>  #elif defined(HAVE_FSYNC)
>      res= fsync(fd);
> +    if (res == -1 and errno == ENOLCK)
                     ^^^

Ehm, the operator is called `&&' in C ;-)

(causes build to break for macosx in Buildbot).

 - Kristian.