Commit 61668218 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/root/mysql-5.0


BitKeeper/etc/logging_ok:
  auto-union
parents ac3b760f e5950cb1

BitKeeper/etc/logging_ok

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

}