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
89e10f34
Commit
89e10f34
authored
Oct 13, 2005
by
lenz@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
parents
fee9c135
b72e1afb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
5 deletions
+22
-5
support-files/mysql.spec.sh
support-files/mysql.spec.sh
+22
-5
No files found.
support-files/mysql.spec.sh
View file @
89e10f34
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
%endif
%endif
%define license GPL
%define license GPL
%define mysqld_user mysql
%define mysqld_user mysql
%define mysqld_group mysql
%define server_suffix
-standard
%define server_suffix
-standard
%define mysqldatadir /var/lib/mysql
%define mysqldatadir /var/lib/mysql
...
@@ -313,6 +314,8 @@ make test-force || true
...
@@ -313,6 +314,8 @@ make test-force || true
# Save mysqld-max
# Save mysqld-max
mv
sql/mysqld sql/mysqld-max
mv
sql/mysqld sql/mysqld-max
nm
--numeric-sort
sql/mysqld-max
>
sql/mysqld-max.sym
nm
--numeric-sort
sql/mysqld-max
>
sql/mysqld-max.sym
# Save the perror binary so it supports the NDB error codes (BUG#13740)
mv
extra/perror extra/perror.ndb
# Install the ndb binaries
# Install the ndb binaries
(
cd
ndb
;
make
install
DESTDIR
=
$RBR
)
(
cd
ndb
;
make
install
DESTDIR
=
$RBR
)
...
@@ -321,7 +324,7 @@ nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym
...
@@ -321,7 +324,7 @@ nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym
install
-m
644 libmysqld/libmysqld.a
$RBR
%
{
_libdir
}
/mysql/
install
-m
644 libmysqld/libmysqld.a
$RBR
%
{
_libdir
}
/mysql/
# Include libgcc.a in the devel subpackage (BUG 4921)
# Include libgcc.a in the devel subpackage (BUG 4921)
if
[
"
$CC
"
=
gcc
]
if
expr
"
$CC
"
:
".*gcc.*"
>
/dev/null
;
then
then
libgcc
=
`
$CC
--print-libgcc-file
`
libgcc
=
`
$CC
--print-libgcc-file
`
if
[
-f
$libgcc
]
if
[
-f
$libgcc
]
...
@@ -385,6 +388,9 @@ make install-strip DESTDIR=$RBR benchdir_root=%{_datadir}
...
@@ -385,6 +388,9 @@ make install-strip DESTDIR=$RBR benchdir_root=%{_datadir}
# install saved mysqld-max
# install saved mysqld-max
install
-s
-m755
$MBD
/sql/mysqld-max
$RBR
%
{
_sbindir
}
/mysqld-max
install
-s
-m755
$MBD
/sql/mysqld-max
$RBR
%
{
_sbindir
}
/mysqld-max
# install saved perror binary with NDB support (BUG#13740)
install
-s
-m755
$MBD
/extra/perror.ndb
$RBR
%
{
_bindir
}
/perror
# install symbol files ( for stack trace resolution)
# install symbol files ( for stack trace resolution)
install
-m644
$MBD
/sql/mysqld-max.sym
$RBR
%
{
_libdir
}
/mysql/mysqld-max.sym
install
-m644
$MBD
/sql/mysqld-max.sym
$RBR
%
{
_libdir
}
/mysql/mysqld-max.sym
install
-m644
$MBD
/sql/mysqld.sym
$RBR
%
{
_libdir
}
/mysql/mysqld.sym
install
-m644
$MBD
/sql/mysqld.sym
$RBR
%
{
_libdir
}
/mysql/mysqld.sym
...
@@ -442,18 +448,20 @@ fi
...
@@ -442,18 +448,20 @@ fi
# Create a MySQL user and group. Do not report any problems if it already
# Create a MySQL user and group. Do not report any problems if it already
# exists.
# exists.
groupadd
-r
%
{
mysqld_user
}
2> /dev/null
||
true
groupadd
-r
%
{
mysqld_group
}
2> /dev/null
||
true
useradd
-M
-r
-d
$mysql_datadir
-s
/bin/bash
-c
"MySQL server"
-g
%
{
mysqld_user
}
%
{
mysqld_user
}
2> /dev/null
||
true
useradd
-M
-r
-d
$mysql_datadir
-s
/bin/bash
-c
"MySQL server"
-g
%
{
mysqld_group
}
%
{
mysqld_user
}
2> /dev/null
||
true
# The user may already exist, make sure it has the proper group nevertheless (BUG#12823)
usermod
-g
%
{
mysqld_group
}
%
{
mysqld_user
}
2> /dev/null
||
true
# Change permissions so that the user that will run the MySQL daemon
# Change permissions so that the user that will run the MySQL daemon
# owns all database files.
# owns all database files.
chown
-R
%
{
mysqld_user
}
:%
{
mysqld_
user
}
$mysql_datadir
chown
-R
%
{
mysqld_user
}
:%
{
mysqld_
group
}
$mysql_datadir
# Initiate databases
# Initiate databases
%
{
_bindir
}
/mysql_install_db
--rpm
--user
=
%
{
mysqld_user
}
%
{
_bindir
}
/mysql_install_db
--rpm
--user
=
%
{
mysqld_user
}
# Change permissions again to fix any new files.
# Change permissions again to fix any new files.
chown
-R
%
{
mysqld_user
}
:%
{
mysqld_
user
}
$mysql_datadir
chown
-R
%
{
mysqld_user
}
:%
{
mysqld_
group
}
$mysql_datadir
# Fix permissions for the permission database so that only the user
# Fix permissions for the permission database so that only the user
# can read them.
# can read them.
...
@@ -668,6 +676,15 @@ fi
...
@@ -668,6 +676,15 @@ fi
# itself - note that they must be ordered by date (important when
# itself - note that they must be ordered by date (important when
# merging BK trees)
# merging BK trees)
%changelog
%changelog
*
Thu Oct 13 2005 Lenz Grimmer <lenz@mysql.com>
- added a usermod call to assign a potential existing mysql user to the
correct user group
(
BUG#12823
)
- Save the perror binary built during Max build so it supports the NDB
error codes
(
BUG#13740
)
- added a separate macro
"mysqld_group"
to be able to define the
user group of the mysql user seperately,
if
desired.
*
Thu Sep 29 2005 Lenz Grimmer <lenz@mysql.com>
*
Thu Sep 29 2005 Lenz Grimmer <lenz@mysql.com>
- fixed the removing of the RPM_BUILD_ROOT
in
the %clean section
(
the
- fixed the removing of the RPM_BUILD_ROOT
in
the %clean section
(
the
...
...
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