32e03b2cdd
Move content from stx-gplv2 into stx-integ
Packages will be relocated to
stx-integ:
base/
bash
cgcs-users
cluster-resource-agents
dpkg
haproxy
libfdt
netpbm
rpm
database/
mariadb
filesystem/
iscsi-initiator-utils
filesystem/drbd/
drbd-tools
kernel/kernel-modules/
drbd
integrity
intel-e1000e
intel-i40e
intel-i40evf
intel-ixgbe
intel-ixgbevf
qat17
tpmdd
ldap/
ldapscripts
networking/
iptables
net-tools
Change-Id: Ibc2ad09bef7a7f40e337513a1694a22f38d7f4e9
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
---
|
|
scripts/mysqld_safe.sh | 2 +-
|
|
support-files/mysql.server.sh | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
|
|
index 5564f92..fe77d97 100644
|
|
--- a/scripts/mysqld_safe.sh
|
|
+++ b/scripts/mysqld_safe.sh
|
|
@@ -756,7 +756,7 @@ if [ ! -d $mysql_unix_port_dir ]
|
|
then
|
|
if ! `mkdir -p $mysql_unix_port_dir`
|
|
then
|
|
- log_error "Fatal error Can't create database directory '$mysql_unix_port'"
|
|
+ echo "Fatal error Can't create database directory '$mysql_unix_port'"
|
|
exit 1
|
|
fi
|
|
chown $user $mysql_unix_port_dir
|
|
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
|
|
index ed0da3c..312f2b2 100644
|
|
--- a/support-files/mysql.server.sh
|
|
+++ b/support-files/mysql.server.sh
|
|
@@ -296,7 +296,7 @@ case "$mode" in
|
|
then
|
|
# Give extra arguments to mysqld with the my.cnf file. This script
|
|
# may be overwritten at next upgrade.
|
|
- $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" &
|
|
+ $bindir/mysqld_safe --datadir="$datadir" --pid-file="$mysqld_pid_file_path" "$@" >dev/null &
|
|
wait_for_ready; return_value=$?
|
|
|
|
# Make lock for RedHat / SuSE
|
|
--
|
|
1.9.1
|
|
|