bk commit into 5.1 tree (msvensson:1.2330) BUG#14262

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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-10-26 18:34:24+02:00, msvensson@neptunus.(none) +1 -0
  Bug #14262  	SP: DROP PROCEDURE|VIEW (maybe more) write to binlog too late (race cond)
  - Rmove duplicate code to log a "DROP VIEW..", must be a merge miss 

  sql/sql_view.cc@stripped, 2006-10-26 18:34:22+02:00, msvensson@neptunus.(none) +0 -7
    The query should only be logged to binlog once and that is if the drop didn't produce
any errors
    Removing the duplicate as that must have been a merge error

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.113/sql/sql_view.cc	2006-10-26 18:34:30 +02:00
+++ 1.114/sql/sql_view.cc	2006-10-26 18:34:30 +02:00
@@ -1418,13 +1418,6 @@
     sp_cache_invalidate();
   }
 
-  if (mysql_bin_log.is_open())
-  {
-    thd->clear_error();
-    thd->binlog_query(THD::MYSQL_QUERY_TYPE,
-                      thd->query, thd->query_length, FALSE, FALSE);
-  }
-
   if (error)
   {
     VOID(pthread_mutex_unlock(&LOCK_open));