Commit e5950cb1 authored by unknown's avatar unknown
Browse files

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
parents 93064473 972c1573

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -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

sql/mysqld.cc

+7 −1
Original line number Diff line number Diff line
@@ -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);  

}