Commit 93ab42f6 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

parents 967b1e9d 1617f24a

sql/mysqld.cc

+5 −2
Original line number Diff line number Diff line
@@ -977,11 +977,14 @@ static void server_init(void) 
    }

  }



  /*

    We have to first call set_user(), then set_root(), to get things to work

    with glibc

  */

  set_user(mysqld_user);		// Works also with mysqld_user==NULL

  if (mysqld_chroot)

    set_root(mysqld_chroot);



  set_user(mysqld_user); // set_user now takes care of mysqld_user==NULL



#ifdef __NT__

  /* create named pipe */

  if (Service.IsNT() && mysql_unix_port[0] && !opt_bootstrap)