bk commit into 5.1 tree (cmiller:1.2375)

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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-20 17:44:03-04:00, cmiller@stripped +2 -0
  Fix bad merge from #14262.

  sql/sql_trigger.cc@stripped, 2006-10-20 17:44:01-04:00, cmiller@stripped +1 -1
    Correct previous patch regarding binlog-entry type.

  sql/sql_view.cc@stripped, 2006-10-20 16:40:00-04:00, cmiller@stripped +12 -1
    Fix bad merge from #14262.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/mysql-5.1-maint-afterbreak

--- 1.108/sql/sql_view.cc	2006-10-20 17:44:08 -04:00
+++ 1.109/sql/sql_view.cc	2006-10-20 17:44:08 -04:00
@@ -1425,23 +1425,34 @@ bool mysql_drop_view(THD *thd, TABLE_LIS
                       thd->query, thd->query_length, FALSE, FALSE);
   }
 
-  VOID(pthread_mutex_unlock(&LOCK_open));
   if (error)
   {
+    VOID(pthread_mutex_unlock(&LOCK_open));
     DBUG_RETURN(TRUE);
   }
   if (wrong_object_name)
   {
+    VOID(pthread_mutex_unlock(&LOCK_open));
     my_error(ER_WRONG_OBJECT, MYF(0), wrong_object_db, wrong_object_name, 
              "VIEW");
     DBUG_RETURN(TRUE);
   }
   if (non_existant_views.length())
   {
+    VOID(pthread_mutex_unlock(&LOCK_open));
     my_error(ER_BAD_TABLE_ERROR, MYF(0), non_existant_views.c_ptr());
     DBUG_RETURN(TRUE);
   }
+
+  if (mysql_bin_log.is_open())
+  {
+    thd->clear_error();
+    thd->binlog_query(THD::STMT_QUERY_TYPE,
+                      thd->query, thd->query_length, FALSE, FALSE);
+  }
+
   send_ok(thd);
+  VOID(pthread_mutex_unlock(&LOCK_open));
   DBUG_RETURN(FALSE);
 }
 

--- 1.71/sql/sql_trigger.cc	2006-10-20 17:44:08 -04:00
+++ 1.72/sql/sql_trigger.cc	2006-10-20 17:44:08 -04:00
@@ -284,7 +284,7 @@ end:
       thd->clear_error();
 
       /* Such a statement can always go directly to binlog, no trans cache. */
-      thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+      thd->binlog_query(THD::MYSQL_STMT_TYPE,
                         stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);
     }
   }