bk commit into 5.1 tree (tomas:1.1867)

[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.1867 05/04/13 11:43:21 tomas@stripped +1 -0
  ha_ndbcluster.cc:
    added checking for blob tables and not replicating those for now

  sql/ha_ndbcluster.cc
    1.211 05/04/13 11:43:13 tomas@stripped +13 -5
    added checking for blob tables and not replicating those for now

# 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

--- 1.210/sql/ha_ndbcluster.cc	2005-04-13 03:18:09 +02:00
+++ 1.211/sql/ha_ndbcluster.cc	2005-04-13 11:43:13 +02:00
@@ -4219,15 +4219,15 @@
     /* always create an event for the table */
     String event_name(INJECTOR_EVENT_LEN);
     ndb_rep_event_name(&event_name,m_dbname,new_tabname);
-    const NDBTAB *t= dict->getTable(new_tabname);
-    if ( ndbcluster_create_event(ndb,t,event_name.c_ptr()) >= 0 )
+    const NDBTAB *ndbtab= dict->getTable(new_tabname);
+    if ( ndbcluster_create_event(ndb,ndbtab,event_name.c_ptr()) >= 0 )
     {
       sql_print_information("NDB Replication: RENAME Event: %s",
 			    event_name.c_ptr());
       if ( new_share )
       {
 	if (injector_ndb && // ToDo: check if we don't have a table definition to pass
-	    ndbcluster_create_event_ops(injector_ndb, new_share, t,
+	    ndbcluster_create_event_ops(injector_ndb, new_share, ndbtab,
 					event_name.c_ptr() ) < 0)
 	{
 	  /* ToDo; handle error? */
@@ -5482,6 +5482,7 @@
 
   //CHECK_S_VAR(reclength); mismatch
   CHECK_S_VAR(fields);
+  CHECK_S_VAR(blob_fields);
   //  ToDo: check null_bytes?
 #if 0 // check this later
   uint* const beg = table->s->blob_field;
@@ -7639,7 +7640,7 @@
 
 inline int is_ndb_compatible_type(Field *field)
 {
-  return  
+  return
     !(field->flags & BLOB_FLAG) &&
     field->type() != MYSQL_TYPE_BIT &&
     field->pack_length() != 0;
@@ -7670,6 +7671,13 @@
     DBUG_RETURN(0);
   }
 
+  TABLE *table= share->table;
+  if (table && table->s->blob_fields)
+  {
+    sql_print_error("NDB Replication: replication of blob tables not supported");
+    DBUG_RETURN(0);
+  }
+
   NdbEventOperation *op= ndb->createEventOperation(event_name,100);
 
   if(!op)
@@ -7817,7 +7825,7 @@
   switch (type)
   {
   case NDBEVENT::TE_CLUSTER_FAILURE:
-    sql_print_information("NDB Replication: cluster nodefailure for %s.",
+    sql_print_information("NDB Replication: cluster failure for %s.",
 			  ndbtab->getMysqlName());
     ndb->dropEventOperation(pOp);
     if (share)