bk commit into 5.1 tree (cbell:1.2535)

[cbell]

Below is the list of changes that have just been committed into a local
5.1 repository of cbell. When cbell 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, 2007-03-29 19:55:47-04:00, cbell@mysql_cab_desk. +1 -0
  WL#3629 - Replication of Invocation and Invoked Features
  
  This patch adds code to the binlog calls for replication of the
  CREATE, DROP, and UPDATE event commands. An extra gate was added 
  to ensure a query with length 0 is not binlogged. This corrects 
  the problem of events_scheduling and rpl_events failing on some
  build machines.

  sql/events.cc@stripped, 2007-03-29 19:54:01-04:00, Chuck@mysql_cab_desk. +3 -3
    WL#3629 - Replication of Invocation and Invoked Features
    
    This patch adds code to the binlog calls for replication of the
    CREATE, DROP, and UPDATE event commands. An extra gate was added 
    to ensure a query with length 0 is not binlogged. This corrects 
    problems found when the patch for this worklog was pushed.

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.1_WL_3629_test

--- 1.72/sql/events.cc	2007-03-29 19:55:59 -04:00
+++ 1.73/sql/events.cc	2007-03-29 19:55:59 -04:00
@@ -351,7 +351,7 @@
     else /* Binlog the create event. */
     {
       event_queue->create_event(thd, new_element);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open() && (thd->query_length > 0))
       {
         thd->clear_error();
         thd->binlog_query(THD::MYSQL_QUERY_TYPE,
@@ -426,7 +426,7 @@
     {
       event_queue->update_event(thd, parse_data->dbname, parse_data->name,
                                 new_element);
-      if (mysql_bin_log.is_open())
+      if (mysql_bin_log.is_open() && (thd->query_length > 0))
       {
         thd->clear_error();
         thd->binlog_query(THD::MYSQL_QUERY_TYPE,
@@ -480,7 +480,7 @@
   {
     event_queue->drop_event(thd, dbname, name);
     /* Binlog the drop event. */
-    if (mysql_bin_log.is_open())
+    if (mysql_bin_log.is_open() && (thd->query_length > 0))
     {
       thd->clear_error();
       thd->binlog_query(THD::MYSQL_QUERY_TYPE,