bk commit into 5.1 tree (jonas:1.1981)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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.1981 05/08/31 13:44:46 jonas@eel.(none) +1 -0
  ndb diskdata
    keep log buffer waiter in strict order to keep undo execution from being confused

  storage/ndb/src/kernel/blocks/lgman.cpp
    1.55 05/08/31 13:44:42 jonas@eel.(none) +2 -1
    Keep strict order for log buffer waiters

# 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:	jonas
# Host:	eel.(none)
# Root:	/home/jonas/src/mysql-5.1-ndb-dd

--- 1.54/storage/ndb/src/kernel/blocks/lgman.cpp	2005-08-31 08:41:50 +02:00
+++ 1.55/storage/ndb/src/kernel/blocks/lgman.cpp	2005-08-31 13:44:42 +02:00
@@ -1082,7 +1082,8 @@
   Ptr<Lgman::Logfile_group> ptr;
   if(m_lgman->m_logfile_group_hash.find(ptr, key))
   {
-    if(ptr.p->m_free_buffer_words >= sz)
+    if(ptr.p->m_free_buffer_words >= sz && 
+       ptr.p->m_log_buffer_waiters.isEmpty())
     {
       return 1;
     }