bk commit into 5.1 tree (tomas:1.2393)

[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.2393 06/05/10 16:54:29 tomas@stripped +1 -0
  ndb: added extra printout on failed "internal" discovery for binlog
  + removed extra (not needed) discovery done at online create/drop index

  sql/ha_ndbcluster_binlog.cc
    1.52 06/05/10 16:54:21 tomas@stripped +16 -7
    ndb: added extra printout on failed "internal" discovery for binlog
    + removed extra (not needed) discovery done at online create/drop index

# 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-new-ndb

--- 1.51/sql/ha_ndbcluster_binlog.cc	2006-05-08 18:08:53 +02:00
+++ 1.52/sql/ha_ndbcluster_binlog.cc	2006-05-10 16:54:21 +02:00
@@ -1689,10 +1689,15 @@
           pthread_mutex_lock(&LOCK_open);
           if (ndb_create_table_from_engine(thd, schema->db, schema->name))
           {
-            sql_print_error("Could not discover table '%s.%s' from "
-                            "binlog schema event '%s' from node %d",
+            sql_print_error("NDB binlog: Could not discover table '%s.%s' from "
+                            "binlog schema event '%s' from node %d. "
+                            "my_errno: %d",
                             schema->db, schema->name, schema->query,
-                            schema->node_id);
+                            schema->node_id, my_errno);
+            List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
+            MYSQL_ERROR *err;
+            while ((err= it++))
+              sql_print_warning("NDB binlog: (%d)%s", err->code, err->msg);
           }
           pthread_mutex_unlock(&LOCK_open);
           log_query= 1;
@@ -1916,7 +1921,7 @@
         // fall through
       case SOT_RENAME_TABLE_NEW:
         log_query= 1;
-        if (ndb_binlog_running)
+        if (ndb_binlog_running && (!share || !share->op))
         {
           /*
             we need to free any share here as command below
@@ -1930,10 +1935,14 @@
           pthread_mutex_lock(&LOCK_open);
           if (ndb_create_table_from_engine(thd, schema->db, schema->name))
           {
-            sql_print_error("Could not discover table '%s.%s' from "
-                            "binlog schema event '%s' from node %d",
+            sql_print_error("NDB binlog: Could not discover table '%s.%s' from "
+                            "binlog schema event '%s' from node %d. my_errno: %d",
                             schema->db, schema->name, schema->query,
-                            schema->node_id);
+                            schema->node_id, my_errno);
+            List_iterator_fast<MYSQL_ERROR> it(thd->warn_list);
+            MYSQL_ERROR *err;
+            while ((err= it++))
+              sql_print_warning("NDB binlog: (%d)%s", err->code, err->msg);
           }
           pthread_mutex_unlock(&LOCK_open);
         }