Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
77965c01
Commit
77965c01
authored
Dec 07, 2006
by
df@kahlann.erinye.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
BUG#24780 use --sysconfdir in scripts
parent
6541302b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
6 deletions
+7
-6
scripts/Makefile.am
scripts/Makefile.am
+1
-0
scripts/mysqlaccess.sh
scripts/mysqlaccess.sh
+3
-3
scripts/mysqld_multi.sh
scripts/mysqld_multi.sh
+3
-3
No files found.
scripts/Makefile.am
View file @
77965c01
...
@@ -111,6 +111,7 @@ SUFFIXES = .sh
...
@@ -111,6 +111,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@!'
\
...
...
scripts/mysqlaccess.sh
View file @
77965c01
...
@@ -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"
)
;
}
}
...
...
scripts/mysqld_multi.sh
View file @
77965c01
...
@@ -429,9 +429,9 @@ sub find_groups
...
@@ -429,9 +429,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
++)
{
{
...
@@ -658,7 +658,7 @@ sub example
...
@@ -658,7 +658,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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment