Commit b027f833 authored by unknown's avatar unknown
Browse files

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 

into  qualinost.(none):/home/mtaylor/src/mysql-5.1-maint


mysql-test/r/myisam.result:
  Auto merged
mysys/default.c:
  Auto merged
parents 8cad8f9b fad8db22

mysys/default.c

+6 −4
Original line number Diff line number Diff line
@@ -987,10 +987,11 @@ static uint my_get_system_windows_directory(char *buffer, uint size) 


  Everywhere else, this is:

    1. /etc/

    2. getenv(DEFAULT_HOME_ENV)

    3. ""

    4. "~/"

    5. --sysconfdir=<path>

    2. /etc/mysql/

    3. getenv(DEFAULT_HOME_ENV)

    4. ""

    5. "~/"

    6. --sysconfdir=<path>



 */
@@ -1012,6 +1013,7 @@ static void init_default_directories() 
  *ptr++= "sys:/etc/";

#else

  *ptr++= "/etc/";

  *ptr++= "/etc/mysql/";

#endif

  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))

    *ptr++= env;

scripts/mysqlbug.sh

+7 −1
Original line number Diff line number Diff line
@@ -132,7 +132,13 @@ if test -z "$VISUAL" 
then

  if test -z "$EDITOR"

  then

    # Honor debian sensible-editor

    if test -x "/usr/bin/sensible-editor"

    then

      EDIT=/usr/bin/sensible-editor

    else

      EDIT=emacs

    fi

  else

    EDIT="$EDITOR"

  fi

scripts/mysqld_multi.sh

+9 −1
Original line number Diff line number Diff line
@@ -472,6 +472,14 @@ sub find_groups 
    {

      $data[$i] = $line;

    }

    if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf")

    {

      open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);

    }

    for (; ($line = shift @tmp); $i++)

    {

      $data[$i] = $line;

    }

    if (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" &&

	-r "$ENV{MYSQL_HOME}/my.cnf")

    {
@@ -491,7 +499,7 @@ sub find_groups 
      $data[$i] = $line;

    }

  }

  chop @data;

  chomp @data;

  # Make a list of the wanted group ids

  if (defined($raw_gids))

  {