mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/root/mysql-5.0 BitKeeper/etc/logging_ok: auto-union
This commit is contained in:
commit
6166821819
2 changed files with 8 additions and 1 deletions
|
@ -244,6 +244,7 @@ serg@serg.mysql.com
|
|||
serg@sergbook.mylan
|
||||
serg@sergbook.mysql.com
|
||||
sergefp@mysql.com
|
||||
shuichi@mysql.com
|
||||
sinisa@rhols221.adsl.netsonic.fi
|
||||
stewart@mysql.com
|
||||
svoj@mysql.com
|
||||
|
|
|
@ -6990,9 +6990,15 @@ static void create_pid_file()
|
|||
char buff[21], *end;
|
||||
end= int10_to_str((long) getpid(), buff, 10);
|
||||
*end++= '\n';
|
||||
(void) my_write(file, (byte*) buff, (uint) (end-buff),MYF(MY_WME));
|
||||
if (!my_write(file, (byte*) buff, (uint) (end-buff), MYF(MY_WME | MY_NABP)))
|
||||
{
|
||||
(void) my_close(file, MYF(0));
|
||||
return;
|
||||
}
|
||||
(void) my_close(file, MYF(0));
|
||||
}
|
||||
sql_perror("Can't start server: can't create PID file");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue