bk commit into 5.1 tree (tomas:1.1926)

[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
  1.1926 05/09/23 11:47:23 tomas@stripped +2 -0
  sql/ha_ndbcluster.cc
      added some comments
  sql/log_event.cc
      for correct retrieval of data read set must be set

  sql/log_event.cc
    1.202 05/09/23 11:47:16 tomas@stripped +3 -0
    for correct retrieval of data read set must be set

  sql/ha_ndbcluster.cc
    1.224 05/09/23 11:47:16 tomas@stripped +11 -2
    added some comments

# 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:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.201/sql/log_event.cc	2005-09-19 18:57:40 +02:00
+++ 1.202/sql/log_event.cc	2005-09-23 11:47:16 +02:00
@@ -5903,6 +5903,9 @@
   }
   else
   {
+    /* We need to retrieve all fields */
+    table->file->ha_set_all_bits_in_read_set();
+
     /* Continue until we find the right record or have made a full loop */
     int restart_count= 0; // Number of times scanning has restarted from top
     int error= 0;

--- 1.223/sql/ha_ndbcluster.cc	2005-09-22 19:23:02 +02:00
+++ 1.224/sql/ha_ndbcluster.cc	2005-09-23 11:47:16 +02:00
@@ -9289,20 +9289,29 @@
   TABLE *table= share->table;
   if (table)
   {
+    /*
+      Logging of blob tables is not yet implemented, it would require:
+      1. setup of events also on the blob attribute tables
+      2. collect the pieces of the blob into one from an epoch to
+         provide a full blob to binlog
+    */
     if (table->s->blob_fields)
     {
       sql_print_error("NDB Binlog: logging of blob table %s "
                       "is not supported", share->key);
       DBUG_RETURN(0);
     }
-#if 0
+    /*
+      Logging of a table without primary key is not possible since the event
+      api does not provide a "full" before image, only updated attributes
+      are returned in the before image.
+    */
     if (table->s->primary_key == MAX_KEY)
     {
       sql_print_error("NDB Binlog: logging of table %s without a "
                       "primary key is not supported", share->key);
       DBUG_RETURN(0);
     }
-#endif
   }
 
   pthread_mutex_lock(&injector_mutex);