bk commit into 5.1 tree (tomas:1.1904)

[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.1904 05/09/15 17:03:34 tomas@stripped +1 -0
  removed usage of ndbtab variable that sometimes seem not to be set correctly
  unified NDBTAB variable naming

  sql/ha_ndbcluster.cc
    1.214 05/09/15 17:03:29 tomas@stripped +12 -15
    removed usage of ndbtab variable that sometimes seem not to be set correctly
    unified NDBTAB variable naming

# 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.213/sql/ha_ndbcluster.cc	2005-09-15 08:41:47 +02:00
+++ 1.214/sql/ha_ndbcluster.cc	2005-09-15 17:03:29 +02:00
@@ -9037,7 +9037,7 @@
 }
 
 static int
-ndbcluster_create_event(Ndb *ndb, const NDBTAB *table, const char* event_name)
+ndbcluster_create_event(Ndb *ndb, const NDBTAB *ndbtab, const char* event_name)
 {
   DBUG_ENTER("ndbcluster_create_event");
   NDBDICT *dict;
@@ -9051,11 +9051,11 @@
   }
 
   NDBEVENT my_event(event_name);
-  my_event.setTable(*table);
+  my_event.setTable(*ndbtab);
   my_event.addTableEvent(NDBEVENT::TE_ALL);
 
   // add all columns to the event
-  for(int a= 0; a < table->getNoOfColumns(); a++)
+  for(int a= 0; a < ndbtab->getNoOfColumns(); a++)
   {
     my_event.addEventColumn(a);
   }
@@ -9118,7 +9118,7 @@
 }
 
 int
-ndbcluster_drop_event(Ndb *ndb, const NDBTAB *table, const char* event_name,
+ndbcluster_drop_event(Ndb *ndb, const NDBTAB *ndbtab, const char* event_name,
 		      NdbError &ndb_error)
 {
   DBUG_ENTER("ndbcluster_drop_event");
@@ -9399,18 +9399,16 @@
 					  Binlog_index_row &row)
 {
   NDB_SHARE *share= (NDB_SHARE *)pOp->getCustomData();
-  const NDBTAB *ndbtab= pOp->getTable();
   NDBEVENT::TableEvent type= pOp->getEventType();
   int remote_drop_table= 0, do_close_cached_tables= 0;
   switch (type)
   {
   case NDBEVENT::TE_CLUSTER_FAILURE:
-    sql_print_information("NDB Binlog: cluster failure for %s.",
-			  ndbtab->getMysqlName());
+    sql_print_information("NDB Binlog: cluster failure for %s.", share->key);
 
     DBUG_PRINT("info",("CLUSTER FAILURE EVENT: "
 		       "%s received share: 0x%lx op: %lx share op: %lx op_old: %lx",
-		       ndbtab->getMysqlName(), share, pOp, share->op, share->op_old));
+		       share->key, share, pOp, share->op, share->op_old));
     if (apply_status_share)
     {
       free_share(&apply_status_share);
@@ -9427,11 +9425,11 @@
     // ToDo: remove printout
     sql_print_information("NDB Binlog: %s table %s.",
 			  type == NDBEVENT::TE_DROP ? "drop" : "alter",
-			  ndbtab->getMysqlName());
+			  share->key);
 
     DBUG_PRINT("info",("TABLE %s EVENT: %s received share: 0x%lx op: %lx share op: %lx op_old: %lx",
 		       type == NDBEVENT::TE_DROP ? "DROP" : "ALTER",
-		       ndbtab->getMysqlName(), share, pOp, share->op, share->op_old));
+		       share->key, share, pOp, share->op, share->op_old));
     if (pOp->getReqNodeId() != ndb_cluster_node_id)
     {
       ndb->setDatabaseName(share->table->s->db);
@@ -9444,7 +9442,7 @@
     break;
   default:
     sql_print_error("NDB Binlog: unknown non data event %d for %s. "
-		    "Ignoring...", (unsigned)type, ndbtab->getMysqlName());
+		    "Ignoring...", (unsigned)type, share->key);
     return 0;
   }
 
@@ -9492,7 +9490,6 @@
 				      injector::transaction &trans)
 {
   NDB_SHARE *share= (NDB_SHARE *)pOp->getCustomData();
-  const NDBTAB *ndbtab= pOp->getTable();
   TABLE *table= share->table;
   
   assert(table != 0);
@@ -9514,7 +9511,7 @@
   {
   case NDBEVENT::TE_INSERT:
     row.n_inserts++;
-    DBUG_PRINT("info",("INSERT INTO %s",ndbtab->getName()));
+    DBUG_PRINT("info",("INSERT INTO %s",share->key));
     {
       /**
        * row data is already in table->record[0]
@@ -9530,7 +9527,7 @@
     break;
   case NDBEVENT::TE_DELETE:
     row.n_deletes++;
-    DBUG_PRINT("info",("DELETE FROM %s",ndbtab->getName()));
+    DBUG_PRINT("info",("DELETE FROM %s",share->key));
     {
       /**
        * row data is already in table->record[0]
@@ -9554,7 +9551,7 @@
     break;
   case NDBEVENT::TE_UPDATE:
     row.n_updates++;
-    DBUG_PRINT("info",("UPDATE %s",ndbtab->getName()));
+    DBUG_PRINT("info",("UPDATE %s",share->key));
     {
       /**
        * row data is already in table->record[0]