merging cp932 from 4.1

BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-have_cp932.inc:
  Delete: mysql-test/include/have_cp932.inc
BitKeeper/deleted/.del-ctype_cp932.result:
  Delete: mysql-test/r/ctype_cp932.result
BitKeeper/deleted/.del-have_cp932.require:
  Delete: mysql-test/r/have_cp932.require
BitKeeper/deleted/.del-ctype_cp932.test:
  Delete: mysql-test/t/ctype_cp932.test
BitKeeper/deleted/.del-ctype-cp932.c:
  Delete: strings/ctype-cp932.c
include/m_ctype.h:
  Auto merged
mysys/charset-def.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

1 files changed, 7 insertions, 1 deletions

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);  
 }