database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge siva.hindu.god:/usr/home/tim/m/bk/g50

Browse Source 
into  siva.hindu.god:/usr/home/tim/m/bk/50


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/sql_class.h:
  Auto merged
This commit is contained in:
unknown
2006-12-21 18:20:09 -07:00
parent 6de718d22a 377cfb8b1b
commit ca589a4fc5
44 changed files with 517 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/mysqld_multi.sh
View File

@@ -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++)
{
@@ -719,7 +719,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