bk commit into 5.0 tree (Kristofer.Pettersson:1.2334) BUG#17733

[kpettersson]

Below is the list of changes that have just been committed into a local
5.0 repository of Kristofer Pettersson. When Kristofer Pettersson does a push these
changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-24 10:44:36+01:00, Kristofer.Pettersson@naruto. +4 -0
  Bug#17733: Flushing logs causes daily server crash
  
  Server crashes if a flush commmand is issued and binlog is closed.
  - added check to prevent binlog access when binlog file isn't opened.

  mysql-test/r/flush2.result@stripped, 2006-11-24 10:44:21+01:00, Kristofer.Pettersson@naruto.
+12 -0
    - Added test case (resultfile)

  mysql-test/r/flush2.result@stripped, 2006-11-24 10:44:21+01:00, Kristofer.Pettersson@naruto.
+0 -0

  mysql-test/t/flush2-master.opt@stripped, 2006-11-24 10:44:21+01:00,
Kristofer.Pettersson@naruto. +1 -0
    - Added test case (master options)

  mysql-test/t/flush2-master.opt@stripped, 2006-11-24 10:44:21+01:00,
Kristofer.Pettersson@naruto. +0 -0

  mysql-test/t/flush2.test@stripped, 2006-11-24 10:44:21+01:00, Kristofer.Pettersson@naruto. +7
-0
    - Added test case

  mysql-test/t/flush2.test@stripped, 2006-11-24 10:44:21+01:00, Kristofer.Pettersson@naruto. +0
-0

  sql/sql_parse.cc@stripped, 2006-11-24 10:44:20+01:00, Kristofer.Pettersson@naruto. +8 -3
    - removed deprecated environment consistency check.
    - added check to prevent binlog access on closed binlog.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	Kristofer.Pettersson
# Host:	naruto.
# Root:	C:/cpp/bug17733/my50-bug17733

--- 1.587/sql/sql_parse.cc	2006-11-24 10:44:58 +01:00
+++ 1.588/sql/sql_parse.cc	2006-11-24 10:44:58 +01:00
@@ -4008,8 +4008,9 @@ end_with_restore_list:
   case SQLCOM_FLUSH:
   {
     bool write_to_binlog;
-    if (check_global_access(thd,RELOAD_ACL) || check_db_used(thd, all_tables))
+    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.
@@ -4030,7 +4031,8 @@ end_with_restore_list:
         }
       }
       send_ok(thd);
-    }
+    } 
+    
     break;
   }
   case SQLCOM_KILL:
@@ -6696,7 +6698,10 @@ bool reload_acl_and_cache(THD *thd, ulon
     tmp_write_to_binlog= 0;
     mysql_log.new_file(1);
     mysql_slow_log.new_file(1);
-    mysql_bin_log.rotate_and_purge(RP_FORCE_ROTATE);
+    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);
--- New file ---
+++ mysql-test/r/flush2.result	06/11/24 10:44:21
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;

--- New file ---
+++ mysql-test/t/flush2-master.opt	06/11/24 10:44:21
--disable-log-bin

--- New file ---
+++ mysql-test/t/flush2.test	06/11/24 10:44:21
#
# Bug#17733 Flushing logs causes daily server crash
#
set global expire_logs_days = 3;
show variables like 'log%';
flush logs;