bk commit into 5.1 tree (tomas:1.2740)

[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 15:47:57+01:00, tomas@stripped +1 -0
  correct manual merge

  sql/ha_ndbcluster_connection.cc@stripped, 2007-11-20 15:47:54+01:00, tomas@stripped +2 -2
    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:22:02 +01:00
+++ b/sql/ha_ndbcluster_connection.cc	2007-11-20 15:47:54 +01:00
@@ -60,7 +60,7 @@ int ndbcluster_connect(int (*connect_cal
     g_ndb_cluster_connection->set_name(buf);
   }
   g_ndb_cluster_connection->set_optimized_node_selection
-    (opt_ndb_optimized_node_selection);
+    (global_system_variables.ndb_optimized_node_selection & 1);
 
   // Create a Ndb object to open the connection  to NDB
   if ( (g_ndb= new Ndb(g_ndb_cluster_connection, "sys")) == 0 )
@@ -123,7 +123,7 @@ int ndbcluster_connect(int (*connect_cal
         g_ndb_cluster_connection_pool[i]->set_name(buf);
       }
       g_ndb_cluster_connection_pool[i]->set_optimized_node_selection
-        (opt_ndb_optimized_node_selection);
+        (global_system_variables.ndb_optimized_node_selection & 1);
     }
   }