bk commit into 5.1 tree (mskold:1.2315) BUG#21378

[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-09-13 13:41:05+02:00, mskold@stripped +1 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: post review fix

  sql/ha_ndbcluster_binlog.cc@stripped, 2006-09-13 13:40:53+02:00, mskold@stripped +2 -2
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: post review fix

# 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

--- 1.81/sql/ha_ndbcluster_binlog.cc	2006-09-13 13:41:14 +02:00
+++ 1.82/sql/ha_ndbcluster_binlog.cc	2006-09-13 13:41:14 +02:00
@@ -1804,7 +1804,7 @@ ndb_binlog_thread_handle_schema_event(TH
 	  if (ndbcluster_check_if_local_table(schema->db, schema->name))
 	  {
 	    DBUG_PRINT("info", ("NDB binlog: Skipping locally defined table '%s.%s'",
-				schema->db, schema->name, schema->query));
+				schema->db, schema->name));
             sql_print_error("NDB binlog: Skipping locally defined table '%s.%s' from "
                             "binlog schema event '%s' from node %d. ",
                             schema->db, schema->name, schema->query,
@@ -2064,7 +2064,7 @@ ndb_binlog_thread_handle_schema_event_po
 	  if (ndbcluster_check_if_local_table(schema->db, schema->name))
 	  {
 	    DBUG_PRINT("info", ("NDB binlog: Skipping locally defined table '%s.%s'",
-				schema->db, schema->name, schema->query));
+				schema->db, schema->name));
             sql_print_error("NDB binlog: Skipping locally defined table '%s.%s' from "
                             "binlog schema event '%s' from node %d. ",
                             schema->db, schema->name, schema->query,