bk commit into 5.1 tree (tomas:1.2729)

[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@stripped, 2007-11-16 08:42:15+01:00, tomas@stripped +1 -0
  correct manual merge

  sql/ha_ndbcluster.h@stripped, 2007-11-16 08:42:13+01:00, tomas@stripped +0 -1
    correct manual merge

diff -Nrup a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
--- a/sql/ha_ndbcluster.h	2007-11-15 18:48:07 +01:00
+++ b/sql/ha_ndbcluster.h	2007-11-16 08:42:13 +01:00
@@ -556,7 +556,6 @@ private:
 
   void check_read_before_write_removal();
   static int delete_table(THD *thd, ha_ndbcluster *h, Ndb *ndb,
-  static int delete_table(THD *thd, ha_ndbcluster *h, Ndb *ndb,
 			  const char *path,
 			  const char *db,
 			  const char *table_name);