BUG#46166

Post merge fixes for mysql-5.5-bugteam.

mysql-test/suite/binlog/r/binlog_max_extension.result

@@ -3,6 +3,5 @@ call mtr.add_suppression("Log filename extension number exhausted:");
 call mtr.add_suppression("Can't generate a unique log-filename");
 RESET MASTER;
 FLUSH LOGS;
-Warnings:
-Warning	1098	Can't generate a unique log-filename master-bin.(1-999)
+ERROR HY000: Can't generate a unique log-filename master-bin.(1-999)
 

mysql-test/suite/binlog/t/binlog_max_extension.test

@@ -58,7 +58,8 @@ EOF
 # Assertion
 ###########
 
-# assertion: should throw warning
+# assertion: should raise error
+-- error ER_NO_UNIQUE_LOGFILE
 FLUSH LOGS;
 
 ##############

sql/log.cc

@@ -5111,7 +5111,7 @@ int MYSQL_BIN_LOG::rotate_and_purge(uint flags)
          to the current log. 
       */
       if (!write_incident(current_thd, FALSE))
-        flush_and_sync();
+        flush_and_sync(0);
 
 #ifdef HAVE_REPLICATION
     check_purge= true;

sql/slave.cc

@@ -523,7 +523,8 @@ int terminate_slave_threads(Master_info* mi,int thread_mask,bool skip_lock)
     if (flush_master_info(mi, TRUE, FALSE))
       DBUG_RETURN(ER_ERROR_DURING_FLUSH_LOGS);
 
-    if (my_sync(mi->rli.relay_log.get_log_file()->file, MYF(MY_WME)))
+    if (mi->rli.relay_log.is_open() &&
+        my_sync(mi->rli.relay_log.get_log_file()->file, MYF(MY_WME)))
       DBUG_RETURN(ER_ERROR_DURING_FLUSH_LOGS);
 
     if (my_sync(mi->fd, MYF(MY_WME)))

sql/sql_repl.cc

@@ -1925,7 +1925,7 @@ bool show_binlogs(THD* thd)
 
   if (!mysql_bin_log.is_open())
   {
-    my_message(ER_NO_BINARY_LOGGING, ER(ER_NO_BINARY_LOGGING), MYF(0));
+    my_error(ER_NO_BINARY_LOGGING, MYF(0));
     DBUG_RETURN(TRUE);
   }