bk commit into 5.1 tree (tomas:1.2530)

[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, 2008-02-20 12:52:04+01:00, tomas@stripped +1 -0
  Upon the sql command flush logs, we need to ensure that all outstanding
  ndb data to be logged has made it to the binary log to get a deterministic
  behavior on the rotation of the log.

  sql/ha_ndbcluster_binlog.cc@stripped, 2008-02-20 12:52:00+01:00, tomas@stripped +13 -0
    Upon the sql command flush logs, we need to ensure that all outstanding
    ndb data to be logged has made it to the binary log to get a deterministic
    behavior on the rotation of the log.

diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-12-19 15:05:26 +01:00
+++ b/sql/ha_ndbcluster_binlog.cc	2008-02-20 12:52:00 +01:00
@@ -683,6 +683,18 @@ static void ndbcluster_reset_slave(THD *
 /*
   Initialize the binlog part of the ndb handlerton
 */
+
+/**
+  Upon the sql command flush logs, we need to ensure that all outstanding
+  ndb data to be logged has made it to the binary log to get a deterministic
+  behavior on the rotation of the log.
+ */
+static bool ndbcluster_flush_logs(handlerton *hton)
+{
+  ndbcluster_binlog_wait(current_thd);
+  return FALSE;
+}
+
 static int ndbcluster_binlog_func(handlerton *hton, THD *thd, 
                                   enum_binlog_func fn, 
                                   void *arg)
@@ -711,6 +723,7 @@ static int ndbcluster_binlog_func(handle
 void ndbcluster_binlog_init_handlerton()
 {
   handlerton *h= ndbcluster_hton;
+  h->flush_logs=       ndbcluster_flush_logs;
   h->binlog_func=      ndbcluster_binlog_func;
   h->binlog_log_query= ndbcluster_binlog_log_query;
 }