Commit b306b2bd authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-11707 

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 8a8070bb a267fd22

sql/mysqld.cc

+14 −12
Original line number Diff line number Diff line
@@ -1328,7 +1328,7 @@ static void set_root(const char *path) 
#endif

}



static void server_init(void)

static void network_init(void)

{

  struct sockaddr_in	IPaddr;

#ifdef HAVE_SYS_UN_H
@@ -1378,16 +1378,6 @@ static void server_init(void) 
    }

  }



  if ((user_info= check_user(mysqld_user)))

  {

#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)

    if (locked_in_memory) // getuid() == 0 here

      set_effective_user(user_info);

    else

#endif

      set_user(mysqld_user, user_info);

  }



#ifdef __NT__

  /* create named pipe */

  if (Service.IsNT() && mysqld_unix_port[0] && !opt_bootstrap &&
@@ -3205,7 +3195,17 @@ int main(int argc, char **argv) 
  mysql_data_home= mysql_data_home_buff;

  mysql_data_home[0]=FN_CURLIB;		// all paths are relative from here

  mysql_data_home[1]=0;

  server_init();



  if ((user_info= check_user(mysqld_user)))

  {

#if defined(HAVE_MLOCKALL) && defined(MCL_CURRENT)

    if (locked_in_memory) // getuid() == 0 here

      set_effective_user(user_info);

    else

#endif

      set_user(mysqld_user, user_info);

  }





  if (opt_bin_log && !server_id)

  {
@@ -3230,6 +3230,8 @@ we force server id to 2, but this MySQL server will not act as a slave."); 
  if (init_server_components())

    exit(1);



  network_init();



#ifdef __WIN__

  if (!opt_console)

  {