blob: 4645f90e55c12a4a4124de9b40b7c601bd49f487 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
From 1ebbc61e6243395c45d1c9cc116c0a933674f40e Mon Sep 17 00:00:00 2001
From: Honza Horak <hhorak@redhat.com>
Date: Fri, 9 Dec 2016 17:13:13 +0100
Subject: [PATCH 2/4] Bug#24482156 EXTEND WL#7150: REMOVE USE OF DATADIR IN
MYSQLD_SAFE TO SCRIPTS
MySQL 5.1 upstream backport of:
https://github.com/mysql/mysql-server/commit/71f48ab393bce80a59e5a2e498cd1f46f6b43f9a
Don't read config file in datadir in SysV initscript.
---
support-files/mysql.server.sh | 5 -----
1 file changed, 5 deletions(-)
diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index def52a0..10da440 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -250,11 +250,6 @@ extra_args=""
if test -r "$basedir/my.cnf"
then
extra_args="-e $basedir/my.cnf"
-else
- if test -r "$datadir/my.cnf"
- then
- extra_args="-e $datadir/my.cnf"
- fi
fi
parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server`
--
2.7.4
|
