From: Date: April 20 2006 2:44pm
Subject: bk commit into 5.1 tree (tomas:1.2370) BUG#19214
List-Archive: http://lists.mysql.com/commits/5258
X-Bug: 19214
Message-Id: <20060420124429.E92921F3088@poseidon.mysql.com>

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2370 06/04/20 14:44:16 tomas@stripped +1 -0
  Bug #19214  	running mysqld without binlog causes 10s timeout to drigger on schema ops
  - binlog thread should not wait for apply status share if binlog is not enabled

  sql/ha_ndbcluster_binlog.cc
    1.46 06/04/20 14:44:10 tomas@stripped +2 -1
    Bug #19214  	running mysqld without binlog causes 10s timeout to drigger on schema ops
    - binlog thread should not wait for apply status share if binlog is not enabled

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.45/sql/ha_ndbcluster_binlog.cc	2006-04-19 14:54:32 +02:00
+++ 1.46/sql/ha_ndbcluster_binlog.cc	2006-04-20 14:44:10 +02:00
@@ -3197,7 +3197,8 @@
   thd->proc_info= "Waiting for ndbcluster to start";
 
   pthread_mutex_lock(&injector_mutex);
-  while (!schema_share || !apply_status_share)
+  while (!schema_share ||
+         (ndb_binlog_running && !apply_status_share))
   {
     /* ndb not connected yet */
     struct timespec abstime;