mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge with 4.0.13
This commit is contained in:
@ -254,6 +254,13 @@ export PATH
|
||||
# Build the 4.0 Max binary (includes BDB and UDFs and therefore
|
||||
# cannot be linked statically against the patched glibc)
|
||||
|
||||
# If we want to compile with RAID using gcc 3, we need to use
|
||||
# gcc instead of g++ to avoid linking problems (RAID code is written in C++)
|
||||
if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1
|
||||
then
|
||||
export CXX="gcc"
|
||||
fi
|
||||
|
||||
BuildMySQL "--enable-shared \
|
||||
--with-openssl \
|
||||
--with-berkeley-db \
|
||||
@ -319,6 +326,10 @@ install -m644 $MBD/sql/mysqld.sym $RBR/usr/lib/mysql/mysqld.sym
|
||||
install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql
|
||||
install -m755 $MBD/support-files/mysql.server $RBR/etc/init.d/mysql
|
||||
|
||||
# Create a symlink "rcmysql", pointing to the init.script. SuSE users
|
||||
# will appreciate that, as all services usually offer this.
|
||||
ln -s ../../sbin/init.d/mysql $RPM_BUILD_ROOT/usr/sbin/rcmysql
|
||||
|
||||
# Create symbolic compatibility link safe_mysqld -> mysqld_safe
|
||||
# (safe_mysqld will be gone in MySQL 4.1)
|
||||
ln -sf ./mysqld_safe $RBR/usr/bin/safe_mysqld
|
||||
@ -463,6 +474,7 @@ fi
|
||||
%attr(755, root, root) /usr/bin/safe_mysqld
|
||||
|
||||
%attr(755, root, root) /usr/sbin/mysqld
|
||||
%attr(755, root, root) /usr/sbin/rcmysql
|
||||
%attr(644, root, root) /usr/lib/mysql/mysqld.sym
|
||||
|
||||
%attr(644, root, root) /etc/logrotate.d/mysql
|
||||
|
Reference in New Issue
Block a user