From: Date: November 18 2008 9:11am
Subject: bzr commit into mysql-5.1 branch (tomas.ulin:2756) Bug#33626
List-Archive: http://lists.mysql.com/commits/59034
X-Bug: 33626
Message-Id: <20081118081133.DA766440D2@linux.local>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/tomas/mysql_src/mysql-5.1-telco-6.3/

 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 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2008-10-28 19:40:45 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2008-11-18 08:11:19 +0000
@@ -9,8 +9,8 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 
+ndb_reconnect		 : disabled until reconnect patch is fixed
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2008-11-14 19:42:13 +0000
+++ b/sql/ha_ndbcluster.cc	2008-11-18 08:11:19 +0000
@@ -11023,7 +11023,7 @@ pthread_handler_t ndb_util_thread_func(v
       have been created.
       If not try to create it
     */
-		if (!check_ndb_in_thd(thd, false))
+    if (!check_ndb_in_thd(thd, false))
     {
       set_timespec(abstime, 1);
       continue;

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2008-11-14 19:42:13 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2008-11-18 08:11:19 +0000
@@ -5780,7 +5780,7 @@ restart:
                                                 &post_epoch_log_list,
                                                 &post_epoch_unlock_list,
                                                 &mem_root);
-
+#ifdef NOT_YET
           if (unlikely(pOp->getEventType() == NDBEVENT::TE_CLUSTER_FAILURE))
           {
             sql_print_information("NDB Binlog: cluster failure detected");
@@ -5805,7 +5805,7 @@ restart:
             sql_print_information("NDB Binlog: restarting");
             goto restart_cluster_failure;
           }
-
+#endif
           DBUG_PRINT("info", ("s_ndb first: %s", s_ndb->getEventOperation() ?
                               s_ndb->getEventOperation()->getEvent()->getTable()->getName() :
                               "<empty>"));