From: kpettersson
Date: December 4 2006 1:35pm
Subject: bk commit into 5.1 tree (Kristofer.Pettersson:1.2402)
List-Archive: http://lists.mysql.com/commits/16381
Message-Id: <200612041335.kB4DZEfn023711@mail.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 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-12-04 14:34:56+01:00, Kristofer.Pettersson@naruto. +1 -0
  Merge naruto.:C:/cpp/bug17733/my51-bug17733
  into  naruto.:C:/cpp/mysql-5.1-maint
  MERGE: 1.2358.6.1

  sql/sql_parse.cc@stripped, 2006-12-04 14:34:49+01:00, Kristofer.Pettersson@naruto. +0 -0
    Auto merged
    MERGE: 1.592.6.1

# 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/mysql-5.1-maint/RESYNC

--- 1.607/sql/sql_parse.cc	2006-12-04 14:35:14 +01:00
+++ 1.608/sql/sql_parse.cc	2006-12-04 14:35:14 +01:00
@@ -4221,6 +4221,7 @@ end_with_restore_list:
     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.
@@ -4241,7 +4242,8 @@ end_with_restore_list:
         }
       }
       send_ok(thd);
-    }
+    } 
+    
     break;
   }
   case SQLCOM_KILL:
@@ -6966,7 +6968,10 @@ bool reload_acl_and_cache(THD *thd, ulon
       than it would help them)
     */
     tmp_write_to_binlog= 0;
-    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);