bk commit into 5.1 tree (cbell:1.2490)

[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 08:38:06-04:00, cbell@mysql_cab_desk. +1 -0
  Merge mysql_cab_desk.:C:/source/c++/mysql-5.1-new-rpl
  into  mysql_cab_desk.:C:/source/c++/mysql-5.1_WL_3629
  MERGE: 1.2476.1.6

  sql/slave.cc@stripped, 2007-03-29 08:38:00-04:00, cbell@mysql_cab_desk. +0 -0
    Auto merged
    MERGE: 1.297.1.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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.1_WL_3629/RESYNC

--- 1.298/sql/slave.cc	2007-03-29 08:38:18 -04:00
+++ 1.299/sql/slave.cc	2007-03-29 08:38:18 -04:00
@@ -1722,7 +1722,7 @@
   }
   if (ev)
   {
-    int type_code = ev->get_type_code();
+    int const type_code= ev->get_type_code();
     int exec_res= 0;
 
     /*
@@ -1828,7 +1828,7 @@
        used to read info about the relay log's format; it will be deleted when
        the SQL thread does not need it, i.e. when this thread terminates.
     */
-    if (ev->get_type_code() != FORMAT_DESCRIPTION_EVENT)
+    if (type_code != FORMAT_DESCRIPTION_EVENT)
     {
       DBUG_PRINT("info", ("Deleting the event after it has been executed"));
       delete ev;