1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
This commit is contained in:
df@kahlann.erinye.com 2007-01-22 16:34:22 +01:00
commit 1b8b33bf83
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-line-utils/readline/undo.c
View File

@ -175,7 +175,7 @@ _rl_fix_last_undo_of_type (type, start, end)
for (rl = rl_undo_list; rl; rl = rl->next) for (rl = rl_undo_list; rl; rl = rl->next)
{ {
if (rl->what == (uint) type) if (rl->what == (unsigned int) type)
{ {
rl->start = start; rl->start = start;
rl->end = end; rl->end = end;

4
scripts/mysqlaccess.sh
View File

@ -465,6 +465,9 @@ MySQLaccess::Report::Print_Header();
elsif (-f "@sysconfdir@/$script_conf") { elsif (-f "@sysconfdir@/$script_conf") {
require "@sysconfdir@/$script_conf"; require "@sysconfdir@/$script_conf";
} }
elsif (-f "/etc/$script_conf") {
require "/etc/$script_conf";
}
# **************************** # ****************************
# Read in all parameters # Read in all parameters
@ -930,6 +933,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("@sysconfdir@/my.cnf"); MergeConfigFile("@sysconfdir@/my.cnf");
MergeConfigFile("/etc/my.cnf");
MergeConfigFile("$dir/.my.cnf"); MergeConfigFile("$dir/.my.cnf");
} }

3
scripts/mysqld_multi.sh
View File

@ -467,6 +467,9 @@ sub find_groups
if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf") if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
{ {
open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(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++) for ($i = 0; ($line = shift @tmp); $i++)
{ {