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
78e1df3e
Commit
78e1df3e
authored
Dec 11, 2006
by
df@kahlann.erinye.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1
into kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
parents
b9a4ae99
19ec379b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
9 deletions
+16
-9
mysql-test/lib/mtr_unique.pl
mysql-test/lib/mtr_unique.pl
+9
-3
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.
mysql-test/lib/mtr_unique.pl
View file @
78e1df3e
...
...
@@ -10,10 +10,16 @@ use Fcntl ':flock';
# Requested IDs are stored in a hash and released upon END.
#
my
%
mtr_unique_assigned_ids
=
();
my
$mtr_unique_pid
;
BEGIN
{
$mtr_unique_pid
=
$$
unless
defined
$mtr_unique_pid
;
}
END
{
while
(
my
(
$id
,
$file
)
=
each
(
%
mtr_unique_assigned_ids
))
{
print
"
Autoreleasing
$file
:
$id
\n
";
mtr_release_unique_id
(
$file
,
$id
);
if
(
$mtr_unique_pid
==
$$
)
{
while
(
my
(
$id
,
$file
)
=
each
(
%
mtr_unique_assigned_ids
))
{
print
"
Autoreleasing
$file
:
$id
\n
";
mtr_release_unique_id
(
$file
,
$id
);
}
}
}
...
...
scripts/Makefile.am
View file @
78e1df3e
...
...
@@ -111,6 +111,7 @@ SUFFIXES = .sh
-e
's!@''pkglibdir''@!
$(pkglibdir)
!g'
\
-e
's!@''pkgincludedir''@!
$(pkgincludedir)
!g'
\
-e
's!@''pkgdatadir''@!
$(pkgdatadir)
!g'
\
-e
's!@''sysconfdir''@!
$(sysconfdir)
!g'
\
-e
's!@''CC''@!@CC@!'
\
-e
's!@''CXX''@!@CXX@!'
\
-e
's!@''GXX''@!@GXX@!'
\
...
...
scripts/mysqlaccess.sh
View file @
78e1df3e
...
...
@@ -462,8 +462,8 @@ MySQLaccess::Report::Print_Header();
if
(
-f
"./
$script_conf
"
)
{
require
"./
$script_conf
"
;
}
elsif
(
-f
"
/etc
/
$script_conf
"
)
{
require
"
/etc
/
$script_conf
"
;
elsif
(
-f
"
@sysconfdir@
/
$script_conf
"
)
{
require
"
@sysconfdir@
/
$script_conf
"
;
}
# ****************************
...
...
@@ -929,7 +929,7 @@ sub MergeConfigFile {
# =================================
sub MergeConfigFiles
{
my
(
$name
,
$pass
,
$uid
,
$gid
,
$quota
,
$comment
,
$gcos
,
$dir
,
$shell
)
=
getpwuid
$<
;
MergeConfigFile
(
"
/etc
/my.cnf"
)
;
MergeConfigFile
(
"
@sysconfdir@
/my.cnf"
)
;
MergeConfigFile
(
"
$dir
/.my.cnf"
)
;
}
...
...
scripts/mysqld_multi.sh
View file @
78e1df3e
...
...
@@ -429,9 +429,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
++)
{
...
...
@@ -658,7 +658,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
...
...
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