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
6ed9208e
Commit
6ed9208e
authored
Nov 04, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge siva.hindu.god:/opt/home/tim/m/40/bk
into siva.hindu.god:/opt/home/tim/m/40/a configure.in: Auto merged
parents
b80ed3bb
1d3f4a1a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
configure.in
configure.in
+1
-1
scripts/mysqld_safe.sh
scripts/mysqld_safe.sh
+1
-1
No files found.
BitKeeper/etc/logging_ok
View file @
6ed9208e
...
...
@@ -139,6 +139,7 @@ tim@bitch.mysql.fi
tim@black.box
tim@hundin.mysql.fi
tim@sand.box
tim@siva.hindu.god
tim@threads.polyesthetic.msg
tim@white.box
tim@work.mysql.com
...
...
configure.in
View file @
6ed9208e
...
...
@@ -444,7 +444,7 @@ if $PS p $$ 2> /dev/null | grep $0 > /dev/null
then
FIND_PROC
=
"
$PS
p
\$\$
PID | grep mysqld > /dev/null"
# Solaris
elif
$PS
-p
$$
2> /dev/null |
grep
$0
>
/dev/null
elif
$PS
-
f
p
$$
2> /dev/null |
grep
$0
>
/dev/null
then
FIND_PROC
=
"
$PS
-p
\$\$
PID | grep mysqld > /dev/null"
# BSD style
...
...
scripts/mysqld_safe.sh
View file @
6ed9208e
...
...
@@ -315,7 +315,7 @@ do
break
fi
if
test
@IS_LINUX@
-a
$KILL_MYSQLD
-eq
1
if
@IS_LINUX@
&&
test
$KILL_MYSQLD
-eq
1
then
# Test if one process was hanging.
# This is only a fix for Linux (running as base 3 mysqld processes)
...
...
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