bk commit into 5.1 tree (tomas:1.2607)

[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-09-20 07:12:36+02:00, tomas@stripped +1 -0
  post merge fixes

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-09-20 07:12:33+02:00,
tomas@stripped +4 -4
    post merge fixes

diff -Nrup a/sql/ha_ndbcluster_binlog.cc b/sql/ha_ndbcluster_binlog.cc
--- a/sql/ha_ndbcluster_binlog.cc	2007-09-19 16:46:47 +02:00
+++ b/sql/ha_ndbcluster_binlog.cc	2007-09-20 07:12:33 +02:00
@@ -2792,6 +2792,8 @@ set_conflict_fn(NDB_SHARE *share,
 {
   DBUG_ENTER("set_conflict_fn");
   uint len= 0;
+  Ndb_event_data *event_data=
+    (share->event_data != 0) ? share->event_data : (Ndb_event_data
*)share->op->getCustomData();
   switch (conflict_col->getArrayType())
   {
   case NDBCOL::ArrayTypeShortVar:
@@ -2880,8 +2882,7 @@ set_conflict_fn(NDB_SHARE *share,
       {
         /* find column in table */
         DBUG_PRINT("info", ("serching for %s %u", start_arg, len));
-        DBUG_ASSERT(share->event_data != 0); // this function is called before event
ops are set up
-        TABLE_SHARE *table_s= share->event_data->table_share;
+        TABLE_SHARE *table_s= event_data->table_share;
         for (uint j= 0; j < table_s->fields; j++)
         {
           Field *field= table_s->field[j];
@@ -2934,8 +2935,7 @@ set_conflict_fn(NDB_SHARE *share,
           slave_set_resolve_max(share, ndbtab, args[0].fieldno))
       {
         /* wrong data type */
-        DBUG_ASSERT(share->event_data != 0); // this function is called before event
ops are set up
-        TABLE_SHARE *table_s= share->event_data->table_share;
+        TABLE_SHARE *table_s= event_data->table_share;
         snprintf(msg, msg_len,
                  "column '%s' has wrong datatype",
                  table_s->field[args[0].fieldno]->field_name);