database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-03 20:43:11 +03:00
Code Activity

merging cp932 from 4.1

Browse Source
This commit is contained in:
bar@mysql.com
2005-05-06 12:00:25 +05:00
parent b93385de8f 22a8b93cc5
commit 1f14cfcb35
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/logging_ok
View File

@@ -243,6 +243,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

8
sql/mysqld.cc
View 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);
} }