From afc56a509cc7d3d651ca68ad826ca183da8dc7cc Mon Sep 17 00:00:00 2001
From: Alexander Kuleshov <kuleshovmail@gmail.com>
Date: Sat, 17 Feb 2018 00:11:45 +0600
Subject: [PATCH] merge two the same consistently 'if' clauses into one

we have two the same 'if' clauses that check opt_bin_log argument
in mysqld.cc and both clauses go successively one after another.
Let's merge them into one
---
 sql/mysqld.cc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 2600f346140..0d225dec151 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5299,10 +5299,7 @@ static int init_server_components()
     {
       unireg_abort(1);
     }
-  }
 
-  if (opt_bin_log)
-  {
     log_bin_basename=
       rpl_make_log_name(opt_bin_logname, pidfile_name,
                         opt_bin_logname ? "" : "-bin");