bk commit into 5.1 tree (tomas:1.2535)

[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.2535 07/04/18 08:41:14 tomas@stripped +2 -0
  enabled feature for testing

  sql/ha_ndbcluster.cc
    1.446 07/04/18 08:41:05 tomas@stripped +0 -2
    enabled feature for testing

  mysql-test/t/disabled.def
    1.246 07/04/18 08:41:04 tomas@stripped +0 -1
    enabled feature for testing

# 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.mysql.com
# Root:	/home/tomas/mysql-5.1-telco

--- 1.245/mysql-test/t/disabled.def	2007-04-10 10:34:22 +02:00
+++ 1.246/mysql-test/t/disabled.def	2007-04-18 08:41:04 +02:00
@@ -38,5 +38,4 @@ synchronization          : Bug#24529  	T
 plugin                   : Bug#25659 memory leak via "plugins" test
 rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly
 
-rpl_ndb_stm_innodb       : Bug#26783
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms

--- 1.445/sql/ha_ndbcluster.cc	2007-04-12 16:04:43 +02:00
+++ 1.446/sql/ha_ndbcluster.cc	2007-04-18 08:41:05 +02:00
@@ -4202,8 +4202,6 @@ THR_LOCK_DATA **ha_ndbcluster::store_loc
 extern MASTER_INFO *active_mi;
 static int ndbcluster_update_apply_status(THD *thd, int do_update)
 {
-  return 0;
-
   Thd_ndb *thd_ndb= get_thd_ndb(thd);
   Ndb *ndb= thd_ndb->ndb;
   NDBDICT *dict= ndb->getDictionary();