Merge naruto.:C:/cpp/bug17733/my51-bug17733

into  naruto.:C:/cpp/mysql-5.1-maint


sql/sql_parse.cc:
  Auto merged

mysql-test/r/flush2.result

+flush logs;
+set global expire_logs_days = 3;
+show variables like 'log%';
+Variable_name	Value
+log	ON
+log_bin	OFF
+log_bin_trust_function_creators	ON
+log_error	
+log_queries_not_using_indexes	OFF
+log_slave_updates	OFF
+log_slow_queries	OFF
+log_warnings	1
+flush logs;
+show variables like 'log%';
+Variable_name	Value
+log	ON
+log_bin	OFF
+log_bin_trust_function_creators	ON
+log_error	
+log_queries_not_using_indexes	OFF
+log_slave_updates	OFF
+log_slow_queries	OFF
+log_warnings	1
+set global expire_logs_days = 0;

mysql-test/t/flush2-master.opt

+--disable-log-bin

mysql-test/t/flush2.test

+#
+# Bug#17733 Flushing logs causes daily server crash
+#
+flush logs;
+set global expire_logs_days = 3;
+show variables like 'log%';
+flush logs;
+show variables like 'log%';
+set global expire_logs_days = 0;

sql/sql_parse.cc

@@ -4221,6 +4221,7 @@ mysql_execute_command(THD *thd)
     bool write_to_binlog;
     if (check_global_access(thd,RELOAD_ACL))
       goto error;
+
     /*
       reload_acl_and_cache() will tell us if we are allowed to write to the
       binlog or not.
@@ -4242,6 +4243,7 @@ mysql_execute_command(THD *thd)
       }
       send_ok(thd);
     } 
+    
     break;
   }
   case SQLCOM_KILL:
@@ -6966,7 +6968,10 @@ bool reload_acl_and_cache(THD *thd, ulong options, TABLE_LIST *tables,
       than it would help them)
     */
     tmp_write_to_binlog= 0;
+    if( mysql_bin_log.is_open() )
+    {
       mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
+    }
 #ifdef HAVE_REPLICATION
     pthread_mutex_lock(&LOCK_active_mi);
     rotate_relay_log(active_mi);