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
d126ca80
Commit
d126ca80
authored
Jun 30, 2006
by
evgen@sunlight.local
Browse files
Options
Browse Files
Download
Plain Diff
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into sunlight.local:/local_work/autopush/merge-4.1
parents
83bc48f3
57e94d02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
configure.in
configure.in
+4
-4
scripts/mysqld_safe-watch.sh
scripts/mysqld_safe-watch.sh
+2
-2
No files found.
configure.in
View file @
d126ca80
...
...
@@ -441,18 +441,18 @@ fi
AC_SUBST
(
LD_VERSION_SCRIPT
)
# Avoid bug in fcntl on some versions of linux
AC_MSG_CHECKING
(
"if we should use 'skip-locking' as default for
$target_os
"
)
AC_MSG_CHECKING
(
[
if
we should use
'skip-external-locking'
as default
for
$target_os
]
)
# Any wariation of Linux
if
expr
"
$target_os
"
:
"[[Ll]]inux.*"
>
/dev/null
then
MYSQLD_DEFAULT_SWITCHES
=
"--skip-locking"
MYSQLD_DEFAULT_SWITCHES
=
"--skip-
external-
locking"
TARGET_LINUX
=
"true"
AC_MSG_RESULT
(
"yes"
)
AC_MSG_RESULT
(
[
yes
]
)
AC_DEFINE
([
TARGET_OS_LINUX],
[
1],
[
Whether we build
for
Linux]
)
else
MYSQLD_DEFAULT_SWITCHES
=
""
TARGET_LINUX
=
"false"
AC_MSG_RESULT
(
"no"
)
AC_MSG_RESULT
(
[
no]
)
fi
AC_SUBST
(
MYSQLD_DEFAULT_SWITCHES
)
AC_SUBST
(
TARGET_LINUX
)
...
...
scripts/mysqld_safe-watch.sh
View file @
d126ca80
...
...
@@ -93,10 +93,10 @@ do
if
test
"$#"
-eq
0
then
nohup
$ledir
/mysqld
--basedir
=
$MY_BASEDIR_VERSION
--datadir
=
$DATADIR
\
--skip-locking
>>
$err
2>&1 &
--skip-
external-
locking
>>
$err
2>&1 &
else
nohup
$ledir
/mysqld
--basedir
=
$MY_BASEDIR_VERSION
--datadir
=
$DATADIR
\
--skip-locking
"
$@
"
>>
$err
2>&1 &
--skip-
external-
locking
"
$@
"
>>
$err
2>&1 &
fi
pid
=
$!
rm
-f
$lockfile
...
...
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