Blame SOURCES/mariadb-mysql_secure_installation.patch
|
 |
1f8cff |
From a0a93d99939de297863f7060e78e6a0ce7a271a7 Mon Sep 17 00:00:00 2001
|
|
|
1f8cff |
From: Sergei Golubchik <sergii@pisem.net>
|
|
|
1f8cff |
Date: Tue, 18 Nov 2014 22:26:04 +0100
|
|
|
1f8cff |
Subject: [PATCH] MDEV-4399 mysql_secure_installation reports error in
|
|
|
1f8cff |
find_mysql_client
|
|
|
1f8cff |
|
|
|
1f8cff |
1. remove find_mysql_client (from a bad merge)
|
|
|
1f8cff |
2. use $mysql_command
|
|
|
1f8cff |
---
|
|
|
1f8cff |
scripts/mysql_secure_installation.sh | 5 ++---
|
|
|
1f8cff |
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
1f8cff |
|
|
|
1f8cff |
diff --git a/scripts/mysql_secure_installation.sh b/scripts/mysql_secure_installation.sh
|
|
|
1f8cff |
index 9e9bce9..8eca327 100644
|
|
|
1f8cff |
--- a/scripts/mysql_secure_installation.sh
|
|
|
1f8cff |
+++ b/scripts/mysql_secure_installation.sh
|
|
|
1f8cff |
@@ -182,7 +182,7 @@ else
|
|
|
1f8cff |
fi
|
|
|
1f8cff |
|
|
|
1f8cff |
mysql_command=`find_in_basedir mysql $bindir`
|
|
|
1f8cff |
-if test -z "$print_defaults"
|
|
|
1f8cff |
+if test -z "$mysql_command"
|
|
|
1f8cff |
then
|
|
|
1f8cff |
cannot_find_file mysql $bindir
|
|
|
1f8cff |
exit 1
|
|
|
1f8cff |
@@ -204,7 +204,7 @@ prepare() {
|
|
|
1f8cff |
do_query() {
|
|
|
1f8cff |
echo "$1" >$command
|
|
|
1f8cff |
#sed 's,^,> ,' < $command # Debugging
|
|
|
1f8cff |
- $bindir/mysql --defaults-file=$config <$command
|
|
|
1f8cff |
+ $mysql_command --defaults-file=$config <$command
|
|
|
1f8cff |
return $?
|
|
|
1f8cff |
}
|
|
|
1f8cff |
|
|
|
1f8cff |
@@ -376,7 +376,6 @@ clean_and_exit() {
|
|
|
1f8cff |
# The actual script starts here
|
|
|
1f8cff |
|
|
|
1f8cff |
prepare
|
|
|
1f8cff |
-find_mysql_client
|
|
|
1f8cff |
set_echo_compat
|
|
|
1f8cff |
|
|
|
1f8cff |
echo
|
|
|
1f8cff |
--
|
|
|
1f8cff |
2.5.5
|
|
|
1f8cff |
|