[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 5.0 tree (pem:1.1858) BUG#7646
From:       pem () mysql ! com
Date:       2005-02-28 15:49:43
Message-ID: 200502281549.j1SFnhg2013812 () mail ! mysql ! com
[Download RAW message or body]

Below is the list of changes that have just been committed into a local
5.0 repository of pem. When pem 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.1858 05/02/28 16:34:02 pem@mysql.comhem.se +1 -0
  Fixed BUG#7646: Stored procedure hang if show binlog events
    Return false from show_binlog_events() if successful, otherwise stored
    procedures will think it failed.

  sql/sql_repl.cc
    1.129 05/02/28 16:33:56 pem@mysql.com +4 -1
    Return false from show_binlog_events() if successful, otherwise stored
    procedures will think it failed.

# 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:	pem
# Host:	mysql.comhem.se
# Root:	/home/pem/work/mysql-5.0

--- 1.128/sql/sql_repl.cc	Mon Feb 21 13:47:53 2005
+++ 1.129/sql/sql_repl.cc	Mon Feb 28 16:33:56 2005
@@ -1274,6 +1274,7 @@
   DBUG_ENTER("show_binlog_events");
   List<Item> field_list;
   const char *errmsg = 0;
+  bool ret = TRUE;
   IO_CACHE log;
   File file = -1;
   Format_description_log_event *description_event= new
@@ -1376,6 +1377,8 @@
     pthread_mutex_unlock(log_lock);
   }
 
+  ret= FALSE;
+
 err:
   delete description_event;
   if (file >= 0)
@@ -1395,7 +1398,7 @@
   pthread_mutex_lock(&LOCK_thread_count);
   thd->current_linfo = 0;
   pthread_mutex_unlock(&LOCK_thread_count);
-  DBUG_RETURN(TRUE);
+  DBUG_RETURN(ret);
 }
 
 

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com

[prev in list] [next in list] [prev in thread] [next in thread]