[mariadb] Fix mariadb-wait-ready script
Honza Horak
hhorak at fedoraproject.org
Wed Nov 27 14:23:28 UTC 2013
commit 2b8c23763f4c1ed898d52e8882d95c65724f4da1
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date: Wed Nov 27 15:22:54 2013 +0100
Fix mariadb-wait-ready script
mariadb-wait-ready | 9 ++-------
mariadb.spec | 5 ++++-
2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/mariadb-wait-ready b/mariadb-wait-ready
index ead58e0..63740e3 100644
--- a/mariadb-wait-ready
+++ b/mariadb-wait-ready
@@ -27,18 +27,13 @@ get_mysql_option mysqld datadir "/var/lib/mysql"
datadir="$result"
get_mysql_option mysqld socket "/var/lib/mysql/mysql.sock"
socketfile="$result"
-get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
-mypidfile="$result"
# Wait for the server to come up or for the mysqld process to disappear
ret=0
while /bin/true; do
MYSQLDRUNNING=0
- if [ -f "$mypidfile" ]; then
- MYSQLPID=`cat "$mypidfile" 2>/dev/null`
- if [ -n "$MYSQLPID" ] && [ -d "/proc/$MYSQLPID" ] ; then
- MYSQLDRUNNING=1
- fi
+ if [ -d "/proc/${daemon_pid}" ] ; then
+ MYSQLDRUNNING=1
fi
RESPONSE=`/usr/bin/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
mret=$?
diff --git a/mariadb.spec b/mariadb.spec
index 3f2cd48..d8cecb0 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -7,7 +7,7 @@
Name: mariadb
Version: 5.5.34
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Summary: A community developed branch of MySQL
@@ -799,6 +799,9 @@ fi
%{_mandir}/man1/mysql_client_test.1*
%changelog
+* Wed Nov 27 2013 Honza Horak <hhorak at redhat.com> 1:5.5.34-2
+- Fix mariadb-wait-ready script
+
* Fri Nov 22 2013 Honza Horak <hhorak at redhat.com> 1:5.5.34-1
- Rebase to 5.5.34
More information about the scm-commits
mailing list