Commit 0231b019 authored by df@kahlann.erinye.com's avatar df@kahlann.erinye.com

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
parents 635a5641 75c71141
...@@ -10,10 +10,16 @@ use Fcntl ':flock'; ...@@ -10,10 +10,16 @@ use Fcntl ':flock';
# Requested IDs are stored in a hash and released upon END. # Requested IDs are stored in a hash and released upon END.
# #
my %mtr_unique_assigned_ids = (); my %mtr_unique_assigned_ids = ();
my $mtr_unique_pid;
BEGIN {
$mtr_unique_pid = $$ unless defined $mtr_unique_pid;
}
END { END {
while(my ($id,$file) = each(%mtr_unique_assigned_ids)) { if($mtr_unique_pid == $$) {
print "Autoreleasing $file:$id\n"; while(my ($id,$file) = each(%mtr_unique_assigned_ids)) {
mtr_release_unique_id($file, $id); print "Autoreleasing $file:$id\n";
mtr_release_unique_id($file, $id);
}
} }
} }
......
...@@ -115,6 +115,7 @@ SUFFIXES = .sh ...@@ -115,6 +115,7 @@ SUFFIXES = .sh
-e 's!@''pkglibdir''@!$(pkglibdir)!g' \ -e 's!@''pkglibdir''@!$(pkglibdir)!g' \
-e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \ -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
-e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \ -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
-e 's!@''sysconfdir''@!$(sysconfdir)!g' \
-e 's!@''CC''@!@CC@!'\ -e 's!@''CC''@!@CC@!'\
-e 's!@''CXX''@!@CXX@!'\ -e 's!@''CXX''@!@CXX@!'\
-e 's!@''GXX''@!@GXX@!'\ -e 's!@''GXX''@!@GXX@!'\
......
...@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header(); ...@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header();
if (-f "./$script_conf") { if (-f "./$script_conf") {
require "./$script_conf"; require "./$script_conf";
} }
elsif (-f "/etc/$script_conf") { elsif (-f "@sysconfdir@/$script_conf") {
require "/etc/$script_conf"; require "@sysconfdir@/$script_conf";
} }
# **************************** # ****************************
...@@ -929,7 +929,7 @@ sub MergeConfigFile { ...@@ -929,7 +929,7 @@ sub MergeConfigFile {
# ================================= # =================================
sub MergeConfigFiles { sub MergeConfigFiles {
my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<; my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<;
MergeConfigFile("/etc/my.cnf"); MergeConfigFile("@sysconfdir@/my.cnf");
MergeConfigFile("$dir/.my.cnf"); MergeConfigFile("$dir/.my.cnf");
} }
......
...@@ -464,9 +464,9 @@ sub find_groups ...@@ -464,9 +464,9 @@ sub find_groups
} }
else 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++) for ($i = 0; ($line = shift @tmp); $i++)
{ {
...@@ -703,7 +703,7 @@ sub example ...@@ -703,7 +703,7 @@ sub example
# (as per Linux/Unix standard). You may even replace the # (as per Linux/Unix standard). You may even replace the
# /etc/init.d/mysql.server script with it. # /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. # or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
# #
# The script can be found from support-files/mysqld_multi.server.sh # The script can be found from support-files/mysqld_multi.server.sh
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment