Commit 32fcce2b authored by unknown's avatar unknown
Browse files

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

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


mysql-test/mysql-test-run.pl:
  Auto merged
parents 41087253 1a899c05

mysql-test/lib/mtr_unique.pl

+9 −3
Original line number Diff line number Diff line
@@ -10,12 +10,18 @@ use Fcntl ':flock'; 
# Requested IDs are stored in a hash and released upon END.

#

my %mtr_unique_assigned_ids = ();

my $mtr_unique_pid;

BEGIN {

	$mtr_unique_pid = $$ unless defined $mtr_unique_pid;

}

END { 

	if($mtr_unique_pid == $$) {

		while(my ($id,$file) = each(%mtr_unique_assigned_ids)) {

			print "Autoreleasing $file:$id\n";

			mtr_release_unique_id($file, $id);

		}

	}

}



#

# Require a unique, numerical ID, given a file name (where all

scripts/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ SUFFIXES = .sh 
	  -e 's!@''pkglibdir''@!$(pkglibdir)!g' \

	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \

	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \

	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \

	  -e 's!@''CC''@!@CC@!'\

	  -e 's!@''CXX''@!@CXX@!'\

	  -e 's!@''GXX''@!@GXX@!'\

scripts/mysqlaccess.sh

+3 −3
Original line number Diff line number Diff line
@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header(); 
  if (-f "./$script_conf") {

     require "./$script_conf";

  }

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

     require "/etc/$script_conf";

  elsif (-f "@sysconfdir@/$script_conf") {

     require "@sysconfdir@/$script_conf";

  }



# ****************************
@@ -929,7 +929,7 @@ sub MergeConfigFile { 
# =================================

sub MergeConfigFiles {

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

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

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

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

}

scripts/mysqld_multi.sh

+3 −3
Original line number Diff line number Diff line
@@ -464,9 +464,9 @@ sub find_groups 
  }

  else

  {

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

    if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")

    {

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

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

    }

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

    {
@@ -703,7 +703,7 @@ sub example 
#   (as per Linux/Unix standard). You may even replace the

#   /etc/init.d/mysql.server script with it.

#

#   Before using, you must create a my.cnf file either in /etc/my.cnf

#   Before using, you must create a my.cnf file either in @sysconfdir@/my.cnf

#   or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.

#

#   The script can be found from support-files/mysqld_multi.server.sh