ganapathi / rpms / mariadb

Forked from rpms/mariadb 4 years ago
Clone

Blame SOURCES/mariadb-mysql_secure_installation.patch

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