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");