bk commit into 5.1 tree (Justin.He:1.2559) BUG#24951

[justin.he]

Below is the list of changes that have just been committed into a local
5.1 repository of justin.he. When justin.he 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-04-27 18:03:44+08:00, Justin.He@stripped +2 -0
  Bug#24951, Data nodes died(lgman) during creating tables

  storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp@stripped, 2007-04-27 18:03:41+08:00,
Justin.He@stripped +6 -2
    if alloc_log_space failed, send refused signal

  storage/ndb/src/kernel/blocks/lgman.cpp@stripped, 2007-04-27 18:03:41+08:00,
Justin.He@stripped +5 -0
    add check free data space of undofile

# 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:	Justin.He
# Host:	dev3-240.dev.cn.tlan
# Root:	/home/justin.he/mysql/mysql-5.1/bug24951-5.1-new-ndb-bj

--- 1.25/storage/ndb/src/kernel/blocks/lgman.cpp	2007-04-27 18:03:53 +08:00
+++ 1.26/storage/ndb/src/kernel/blocks/lgman.cpp	2007-04-27 18:03:53 +08:00
@@ -1961,6 +1961,11 @@
   if(m_logfile_group_hash.find(ptr, key) && 
      ptr.p->m_free_file_words >= (words + (4 * File_formats::UNDO_PAGE_WORDS)))
   {
+    Uint32 group_pages = 
+      ((ptr.p->m_free_file_words + File_formats::UNDO_PAGE_WORDS - 1)/
File_formats::UNDO_PAGE_WORDS);
+    if(group_pages > compute_free_file_pages(ptr))
+      return 1501; 
+
     ptr.p->m_free_file_words -= words;
     validate_logfile_group(ptr, "alloc_log_space");
     return 0;

--- 1.36/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2007-04-27 18:03:53 +08:00
+++ 1.37/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2007-04-27 18:03:53 +08:00
@@ -591,8 +591,12 @@
       Uint32 sz= sizeof(Disk_undo::Create) >> 2;
       
       Logfile_client lgman(this, c_lgman, regFragPtr.p->m_logfile_group_id);
-      (void)  c_lgman->alloc_log_space(regFragPtr.p->m_logfile_group_id,
-                                       sz);
+      if((terrorCode = 
+         c_lgman->alloc_log_space(regFragPtr.p->m_logfile_group_id, sz)))
+      {
+        addattrrefuseLab(signal, regFragPtr, fragOperPtr, regTabPtr.p, fragId);
+        return;
+      }
       
       int res= lgman.get_log_buffer(signal, sz, &cb);
       switch(res){