bzr commit into mysql-5.1 branch (DonKehndon.kehn:2752) Bug#33626

[DonKehndon.kehn]

#At file:///u02/devl/bzr-tree/6.3-patch3/ based on
revid:don.kehn@stripped

 2752 Don Kehn	2008-11-14
      BUG #33626 - Adds the check_ndb_connection in ndb_util_thread_func and removes
assert from binlog TE_CLUSTER_FAILURE
modified:
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster_binlog.cc

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2008-11-14 19:36:11 +0000
+++ b/sql/ha_ndbcluster.cc	2008-11-14 19:42:13 +0000
@@ -8067,6 +8067,7 @@ bool Thd_ndb::recycle_ndb(THD* thd)
     DBUG_RETURN(false);
   }
 
+  changed_tables.empty();
   trans= NULL;
 
   DBUG_RETURN(true);
@@ -11022,6 +11023,11 @@ pthread_handler_t ndb_util_thread_func(v
       have been created.
       If not try to create it
     */
+		if (!check_ndb_in_thd(thd, false))
+    {
+      set_timespec(abstime, 1);
+      continue;
+    }
     if (!ndb_binlog_tables_inited)
       ndbcluster_setup_binlog_table_shares(thd);
 

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2008-11-14 19:33:38 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2008-11-14 19:42:13 +0000
@@ -5802,10 +5802,6 @@ restart:
 
             pthread_mutex_unlock(&LOCK_open);
 
-            DBUG_ASSERT(ndb_binlog_tables_inited == FALSE &&
-                        ndb_schema_share == NULL &&
-                        ndb_apply_status_share == NULL);
-
             sql_print_information("NDB Binlog: restarting");
             goto restart_cluster_failure;
           }