bzr push into mysql-5.1 branch (tomas.ulin:2756 to 2757)

[Tomas Ulin]

 2757 Tomas Ulin	2008-11-18
      more revert to fix ndb_autodiscover3
modified:
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster_binlog.cc

 2756 Tomas Ulin	2008-11-18
      partial revert of Bug #33626
modified:
  mysql-test/suite/ndb/t/disabled.def
  sql/ha_ndbcluster.cc
  sql/ha_ndbcluster_binlog.cc

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2008-11-18 08:11:19 +0000
+++ b/sql/ha_ndbcluster.cc	2008-11-18 09:08:29 +0000
@@ -8105,11 +8105,13 @@ Ndb* check_ndb_in_thd(THD* thd, bool val
       return NULL;
     set_thd_ndb(thd, thd_ndb);
   }
+#ifdef NOT_YET
   else if (validate_ndb && !thd_ndb->valid_ndb())
   {
     if (!thd_ndb->recycle_ndb(thd))
       return NULL;
   }
+#endif
   return thd_ndb->ndb;
 }
 

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2008-11-18 08:11:19 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2008-11-18 09:08:29 +0000
@@ -5467,7 +5467,9 @@ pthread_handler_t ndb_binlog_thread_func
   pthread_mutex_unlock(&LOCK_thread_count);
   thd->lex->start_transaction_opt= 0;
 
+#ifdef NOT_YET
 restart_cluster_failure:
+#endif
   if (!(s_ndb= new Ndb(g_ndb_cluster_connection, "")) ||
       s_ndb->init())
   {