bk commit into 5.1 tree (stewart:1.1830)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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.1830 05/03/24 11:51:29 stewart@stripped +1 -0
  Further work on WL2325 - NDB Injector thread
  
  - ignore temp tables
  - show error on !consistent
  - print info on drop table

  sql/ha_ndbcluster.cc
    1.186 05/03/24 11:51:22 stewart@stripped +11 -5
    NDB Injector:
    - ignore temporary tables by using a (possible) hack (look if table_name[0]=='#').
      - this needs confirming.
    
    - show error message on Not Consistent
    
    - sql_print_information on drop table

# 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:	stewart
# Host:	kennedy.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-wl2325

--- 1.185/sql/ha_ndbcluster.cc	2005-03-23 09:02:25 +11:00
+++ 1.186/sql/ha_ndbcluster.cc	2005-03-24 11:51:22 +11:00
@@ -3901,6 +3901,7 @@
   }
 
 #ifdef HAVE_REPLICATION
+  if(opt_bin_log && m_tabname[0]!='#')
   {
     const NDBTAB *t= dict->getTable(m_tabname);
     String event_name(INJECTOR_EVENT_LEN);
@@ -4033,13 +4034,13 @@
   ndb->setDatabaseName(m_dbname);
 
 #ifdef HAVE_REPLICATION
-  if(opt_bin_log)
+  if(opt_bin_log && m_tabname[0]!='#') // FIXME tabname hack
   {
     ndbcluster_drop_event_ops(from);
-
+    
     String event_name(INJECTOR_EVENT_LEN);
     ndb_rep_event_name(&event_name,m_dbname,m_tabname);
-
+    
     if ( ndbcluster_drop_event(ndb,0/* ToDo */,event_name.c_ptr()) < 0 )
       ; /* ToDo; handle error? */
   }
@@ -4052,6 +4053,7 @@
   }
 
 #ifdef HAVE_REPLICATION
+  if(opt_bin_log && new_tabname[0]!='#') // FIXME tabname hack
   {
     const NDBTAB *t= dict->getTable(new_tabname);
     String event_name(INJECTOR_EVENT_LEN);
@@ -4071,7 +4073,7 @@
     {
       ; /* ToDo handle error */
     }
-    sql_print_information("NDB Replication: ALTER Event: %s",
+    sql_print_information("NDB Replication: RENAME Event: %s",
 			  event_name.c_ptr());
   }
 #endif
@@ -7459,7 +7461,10 @@
 	   * and continue
 	   */
 	  sql_print_error("NDB Replication: Not Consistent. Cannot "
-			  "continue replication.");
+			  "continue replication. Error code: %d"
+			  " Message: %s",
+			  pOp->getNdbError().code,
+			  pOp->getNdbError().message);
 	  goto err;
 	}
 	
@@ -7483,6 +7488,7 @@
 	  char name[FN_REFLEN];
 	  (void)strxnmov(name, FN_REFLEN, "./",table->getMysqlName(),NullS);
 	  NDB_SHARE *share= get_share(name);
+	  sql_print_information("NDB Replication: drop table %s. ", name);
 	  DBUG_PRINT("info",("TABLE DROP EVENT: %s %x %x", name, pOp, share->op));
 	  assert(share->op == pOp);
 	  share->op= 0;