diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index e1b7579a4f8..35165f820fb 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -243,6 +243,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
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 15624dfe80b..58020207a88 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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);  
 }