[mariadb/f18] Fix mariadb-wait-ready script
Honza Horak
hhorak at fedoraproject.org
Wed Nov 27 14:34:41 UTC 2013
commit d0897899b1ab3732d2447cf6a4a7daa381e95a7a
Author: Honza HorĂ¡k <hhorak at redhat.com>
Date: Wed Nov 27 15:22:54 2013 +0100
Fix mariadb-wait-ready script
Conflicts:
mariadb.spec
mariadb.spec | 5 ++++-
mysqld-wait-ready | 9 ++-------
2 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/mariadb.spec b/mariadb.spec
index 7e4075e..b28967a 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -4,7 +4,7 @@
Name: mariadb
Version: 5.5.34
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A community developed branch of MySQL
Group: Applications/Databases
@@ -774,6 +774,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
diff --git a/mysqld-wait-ready b/mysqld-wait-ready
index ead58e0..63740e3 100644
--- a/mysqld-wait-ready
+++ b/mysqld-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=$?
More information about the scm-commits
mailing list