bk commit into 5.1 tree (tomas:1.2741)

[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-20 17:09:35+01:00, tomas@stripped +1 -0
  correct manual merge

  sql/ha_ndbcluster_connection.cc@stripped, 2007-11-20 17:09:32+01:00, tomas@stripped +0 -1
    correct manual merge

diff -Nrup a/sql/ha_ndbcluster_connection.cc b/sql/ha_ndbcluster_connection.cc
--- a/sql/ha_ndbcluster_connection.cc	2007-11-20 15:47:54 +01:00
+++ b/sql/ha_ndbcluster_connection.cc	2007-11-20 17:09:32 +01:00
@@ -25,7 +25,6 @@
 #include "ha_ndbcluster_connection.h"
 
 /* options from from mysqld.cc */
-extern my_bool opt_ndb_optimized_node_selection;
 extern const char *opt_ndbcluster_connectstring;
 extern ulong opt_ndb_wait_connected;
 extern ulong opt_ndb_cluster_connection_pool;