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
5eea9720
Commit
5eea9720
authored
18 years ago
by
joerg@trift2
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1
parents
d9fb74e4
27df8b07
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
5 deletions
+29
-5
support-files/mysql.server.sh
support-files/mysql.server.sh
+14
-4
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+15
-1
No files found.
support-files/mysql.server.sh
View file @
5eea9720
...
...
@@ -98,6 +98,11 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin:$basedir/bin
export
PATH
mode
=
$1
# start or stop
shift
other_args
=
"
$*
"
# uncommon, but needed when called from an RPM upgrade action
# Expected: "--skip-networking --skip-grant-tables"
# They are not checked here, intentionally, as it is the resposibility
# of the "spec" file author to give correct arguments only.
case
`
echo
"testing
\c
"
`
,
`
echo
-n
testing
`
in
*
c
*
,-n
*
)
echo_n
=
echo_c
=
;;
...
...
@@ -264,6 +269,11 @@ case "$mode" in
echo
$echo_n
"Starting MySQL"
if
test
-x
$manager
-a
"
$use_mysqld_safe
"
=
"0"
then
if
test
-n
"
$other_args
"
then
log_failure_msg
"MySQL manager does not support options '
$other_args
'"
exit
1
fi
# Give extra arguments to mysqld with the my.cnf file. This script may
# be overwritten at next upgrade.
"
$manager
"
\
...
...
@@ -282,7 +292,7 @@ case "$mode" in
# Give extra arguments to mysqld with the my.cnf file. This script
# may be overwritten at next upgrade.
pid_file
=
$server_pid_file
$bindir
/mysqld_safe
--datadir
=
$datadir
--pid-file
=
$server_pid_file
>
/dev/null 2>&1 &
$bindir
/mysqld_safe
--datadir
=
$datadir
--pid-file
=
$server_pid_file
$other_args
>
/dev/null 2>&1 &
wait_for_pid created
# Make lock for RedHat / SuSE
...
...
@@ -330,8 +340,8 @@ case "$mode" in
'restart'
)
# Stop the service and regardless of whether it was
# running or not, start it again.
$0
stop
$0
start
$0
stop
$other_args
$0
start
$other_args
;;
'reload'
)
...
...
@@ -346,7 +356,7 @@ case "$mode" in
*
)
# usage
echo
"Usage:
$0
start|stop|restart|reload
"
echo
"Usage:
$0
{start|stop|restart|reload} [ MySQL server options ]
"
exit
1
;;
esac
This diff is collapsed.
Click to expand it.
support-files/mysql.spec.sh
View file @
5eea9720
...
...
@@ -466,7 +466,16 @@ chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
%
{
_bindir
}
/mysql_install_db
--rpm
--user
=
%
{
mysqld_user
}
# Upgrade databases if needed
%
{
_bindir
}
/mysql_upgrade
--user
=
%
{
mysqld_user
}
# This must be done as database user "root", who should be password-protected,
# but this password is not available here.
# So ensure the server is isolated as much as possible, and start it so that
# passwords are not checked.
# See the related change in the start script "/etc/init.d/mysql".
chmod
700
$mysql_datadir
%
{
_sysconfdir
}
/init.d/mysql start
--skip-networking
--skip-grant-tables
%
{
_bindir
}
/mysql_upgrade
%
{
_sysconfdir
}
/init.d/mysql stop
--skip-networking
--skip-grant-tables
chmod
755
$mysql_datadir
# Change permissions again to fix any new files.
chown
-R
%
{
mysqld_user
}
:%
{
mysqld_group
}
$mysql_datadir
...
...
@@ -679,6 +688,11 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
*
Tue Jun 20 2006 Joerg Bruehe <joerg@mysql.com>
- To run
"mysql_upgrade"
, we need a running server
;
start it
in
isolation and skip password checks.
*
Sat May 20 2006 Kent Boortz <kent@mysql.com>
- Always compile
for
PIC, position independent code.
...
...
This diff is collapsed.
Click to expand it.
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