bk commit into 5.1 tree (mskold:1.2323) BUG#21495

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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, 2006-11-15 11:38:22+01:00, mskold@stripped +1 -0
  bug #21495  Alter table from x engine to ndb and back can cause issue with drop DB:added
error printout to log

  sql/ha_ndbcluster_binlog.cc@stripped, 2006-11-15 11:38:12+01:00, mskold@stripped +5 -3
    bug #21495  Alter table from x engine to ndb and back can cause issue with drop
DB:added error printout to log

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.86/sql/ha_ndbcluster_binlog.cc	2006-11-15 11:38:34 +01:00
+++ 1.87/sql/ha_ndbcluster_binlog.cc	2006-11-15 11:38:34 +01:00
@@ -1843,9 +1843,11 @@ ndb_binlog_thread_handle_schema_event(TH
 	  }
 	  else
 	  {
-	    /*
-	      Database contained local tables, leave it
-	     */
+	    /* Database contained local tables, leave it */
+	    sql_print_error("NDB binlog: Skipping drop database '%s' since it contained local
tables "
+                            "binlog schema event '%s' from node %d. ",
+                            schema->db, schema->query,
+                            schema->node_id);
 	    log_query= 1;
 	  }
           break;