mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 19:11:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from mysql-5.1.72-release

Browse source
This commit is contained in:
hery.ramilison@oracle.com 2013-09-20 21:08:08 +02:00 • committed by Hery Ramilison
commit b6c6c3bdfb
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
support-files/mysql.spec.sh
View file

@ -716,7 +716,7 @@ fi
# We assume that if there is exactly one ".pid" file,
# it contains the valid PID of a running MySQL server.
NR_PID_FILES=`ls $PID_FILE_PATT 2>/dev/null | wc -l`
NR_PID_FILES=`ls -1 $PID_FILE_PATT 2>/dev/null | wc -l`
case $NR_PID_FILES in
0 ) SERVER_TO_START='' ;; # No "*.pid" file == no running server
1 ) SERVER_TO_START='true' ;;
@ -1027,6 +1027,7 @@ fi
%attr(755, root, root) %{_sbindir}/rcmysql
%if %{INNODB_BUILD}
%if %{WITH_INNODB_PLUGIN}
%attr(755, root, root) %{_libdir}/mysql/plugin/
%attr(755, root, root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so*
%endif
%endif
@ -1194,6 +1195,9 @@ fi
# merging BK trees)
##############################################################################
%changelog
* Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
- Updated logic to get the correct count of PID files
* Tue Sep 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
- Disable "maintainer mode" in debug builds, there is a cast ulonglong -> int