bk commit into 5.1 tree (tomas:1.2525)

[tomas]

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@stripped, 2007-05-09 12:57:36+02:00, tomas@stripped +2 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-merge
  MERGE: 1.2502.5.7

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-05-09 12:57:32+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.104.3.11

  storage/ndb/include/ndbapi/NdbRecAttr.hpp@stripped, 2007-05-09 12:57:32+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.23.2.1

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-merge/RESYNC

--- 1.25/storage/ndb/include/ndbapi/NdbRecAttr.hpp	2007-05-08 12:28:41 +02:00
+++ 1.26/storage/ndb/include/ndbapi/NdbRecAttr.hpp	2007-05-09 12:57:32 +02:00
@@ -149,7 +149,7 @@
    *
    * @return  Char value.
    */           
-  char  char_value() const;           
+  Int8  char_value() const;           
 
   /**
    * Get value stored in NdbRecAttr object.
@@ -313,10 +313,10 @@
 }
 
 inline
-char
+Int8
 NdbRecAttr::char_value() const
 {
-  return *(char*)theRef;
+  return *(Int8*)theRef;
 }
 
 inline

--- 1.117/sql/ha_ndbcluster_binlog.cc	2007-04-26 14:04:28 +02:00
+++ 1.118/sql/ha_ndbcluster_binlog.cc	2007-05-09 12:57:32 +02:00
@@ -3826,6 +3826,17 @@
       res= i_ndb->pollEvents(tot_poll_wait, &gci);
       tot_poll_wait= 0;
     }
+    else
+    {
+      /*
+        Just consume any events, not used if no binlogging
+        e.g. node failure events
+      */
+      Uint64 tmp_gci;
+      if (i_ndb->pollEvents(0, &tmp_gci))
+        while (i_ndb->nextEvent())
+          ;
+    }
     int schema_res= s_ndb->pollEvents(tot_poll_wait, &schema_gci);
     ndb_latest_received_binlog_epoch= gci;