Use --no-defaults when checking server status before starting

This commit is contained in:
Honza Horak 2015-02-23 14:40:08 +01:00
parent d90e5b11b6
commit 82d026ef29
2 changed files with 2 additions and 1 deletions

View File

@ -940,6 +940,7 @@ fi
* Mon Feb 23 2015 Honza Horak <hhorak@redhat.com> - 5.6.23-3 * Mon Feb 23 2015 Honza Horak <hhorak@redhat.com> - 5.6.23-3
- Expand paths in perl scripts in mysql-test - Expand paths in perl scripts in mysql-test
- Use correct path in install_db script warning - Use correct path in install_db script warning
- Use --no-defaults when checking server status before starting
* Thu Jan 29 2015 Bjorn Munch <bjorn.munch@oracle.com> - 5.6.23-1 * Thu Jan 29 2015 Bjorn Munch <bjorn.munch@oracle.com> - 5.6.23-1
- Update to MySQL 5.6.23, for various fixes described at - Update to MySQL 5.6.23, for various fixes described at

View File

@ -53,7 +53,7 @@ start(){
MYSQLDRUNNING=1 MYSQLDRUNNING=1
fi fi
fi fi
RESPONSE=`@bindir@/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` RESPONSE=`@bindir@/mysqladmin --no-defaults --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then if [ $MYSQLDRUNNING = 1 ] && [ $? = 0 ]; then
# already running, do nothing # already running, do nothing
action $"Starting $prog: " /bin/true action $"Starting $prog: " /bin/true