diff options
| author | unknown <mtaylor@qualinost.(none)> | 2006-12-15 13:23:57 -0800 |
|---|---|---|
| committer | unknown <mtaylor@qualinost.(none)> | 2006-12-15 13:23:57 -0800 |
| commit | b027f833a12003a586e5f312650b37581ce73be0 (patch) | |
| tree | b8879a3b6f7ae88bc7cf2d77ab7918618dedba56 /scripts | |
| parent | 8cad8f9bce859f229fd63ac2a4b37dadcc01aaf5 (diff) | |
| parent | fad8db22085e55712d7c306184c59754f5142995 (diff) | |
| download | mariadb-git-b027f833a12003a586e5f312650b37581ce73be0.tar.gz | |
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
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqlbug.sh | 8 | ||||
| -rw-r--r-- | scripts/mysqld_multi.sh | 10 |
2 files changed, 16 insertions, 2 deletions
diff --git a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh index 6aed140b79d..880ab248a90 100644 --- a/scripts/mysqlbug.sh +++ b/scripts/mysqlbug.sh @@ -132,7 +132,13 @@ if test -z "$VISUAL" then if test -z "$EDITOR" then - EDIT=emacs + # 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 diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 2dcc8dc7bc4..6ac31a00c75 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -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)) { |