Commit e5670bf2 authored by unknown's avatar unknown

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/root/mysql-5.0

parents e0313d67 61668218
...@@ -244,6 +244,7 @@ serg@serg.mysql.com ...@@ -244,6 +244,7 @@ serg@serg.mysql.com
serg@sergbook.mylan serg@sergbook.mylan
serg@sergbook.mysql.com serg@sergbook.mysql.com
sergefp@mysql.com sergefp@mysql.com
shuichi@mysql.com
sinisa@rhols221.adsl.netsonic.fi sinisa@rhols221.adsl.netsonic.fi
stewart@mysql.com stewart@mysql.com
svoj@mysql.com svoj@mysql.com
......
...@@ -6990,9 +6990,15 @@ static void create_pid_file() ...@@ -6990,9 +6990,15 @@ static void create_pid_file()
char buff[21], *end; char buff[21], *end;
end= int10_to_str((long) getpid(), buff, 10); end= int10_to_str((long) getpid(), buff, 10);
*end++= '\n'; *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)); (void) my_close(file, MYF(0));
} }
sql_perror("Can't start server: can't create PID file");
exit(1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment