Commit e2570e98 authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


scripts/mysqld_multi.sh:
  Auto merged
parents 644e6c7f ae954950

cmd-line-utils/readline/undo.c

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ _rl_fix_last_undo_of_type (type, start, end) 


  for (rl = rl_undo_list; rl; rl = rl->next)

    {

      if (rl->what == (uint) type)

      if (rl->what == (unsigned int) type)

	{

	  rl->start = start;

	  rl->end = end;

scripts/mysqlaccess.sh

+4 −0
Original line number Diff line number Diff line
@@ -465,6 +465,9 @@ MySQLaccess::Report::Print_Header(); 
  elsif (-f "@sysconfdir@/$script_conf") {

     require "@sysconfdir@/$script_conf";

  }

  elsif (-f "/etc/$script_conf") {

     require "/etc/$script_conf";

  }



# ****************************

# Read in all parameters
@@ -930,6 +933,7 @@ sub MergeConfigFile { 
sub MergeConfigFiles {

    my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<;

    MergeConfigFile("@sysconfdir@/my.cnf");

    MergeConfigFile("/etc/my.cnf");

    MergeConfigFile("$dir/.my.cnf");

}

scripts/mysqld_multi.sh

+3 −0
Original line number Diff line number Diff line
@@ -467,6 +467,9 @@ sub find_groups 
    if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")

    {

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

    } elsif (-f "/etc/my.cnf" && -r "/etc/my.cnf")

    {

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

    }

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

    {