bk commit into 5.1 tree (msvensson:1.2219)

[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
  1.2219 06/03/06 12:32:15 msvensson@neptunus.(none) +1 -0
  Add DBUG_PRINT's

  sql/log_event.cc
    1.210 06/03/06 12:32:09 msvensson@neptunus.(none) +4 -3
    Add DBUG_ENTER and DBUG_VOID_RETURN so filename is updated corectly for DBUG_PRINT's
in this function

# 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/my51-bug17728

--- 1.209/sql/log_event.cc	2006-02-28 23:29:47 +01:00
+++ 1.210/sql/log_event.cc	2006-03-06 12:32:09 +01:00
@@ -1659,6 +1659,7 @@
 int Query_log_event::exec_event(struct st_relay_log_info* rli, const char *query_arg,
uint32 q_len_arg)
 {
   int expected_error,actual_error= 0;
+  DBUG_ENTER("exec_event");
   /*
     Colleagues: please never free(thd->catalog) in MySQL. This would lead to
     bugs as here thd->catalog is a part of an alloced block, not an entire
@@ -1895,9 +1896,9 @@
     ONE_SHOT, because SET ONE_SHOT should not be separated from its following
     updating query.
   */
-  return (thd->query_error ? thd->query_error : 
-          (thd->one_shot_set ? (rli->inc_event_relay_log_pos(),0) :
-           Log_event::exec_event(rli))); 
+  DBUG_RETURN(thd->query_error ? thd->query_error :
+              (thd->one_shot_set ? (rli->inc_event_relay_log_pos(),0) :
+               Log_event::exec_event(rli)));
 }
 #endif