Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

storage/ndb/tools/delete_all.cpp

@@ -75,6 +75,7 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_delete_all");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;

storage/ndb/tools/desc.cpp

@@ -81,6 +81,7 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_WRONGARGS);
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_desc");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;

storage/ndb/tools/drop_index.cpp

@@ -61,6 +61,7 @@ int main(int argc, char** argv){
   }
   
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_drop_index");
   if(con.connect(12, 5, 1) != 0)
   {
     return NDBT_ProgramExit(NDBT_FAILED);

storage/ndb/tools/drop_tab.cpp

@@ -61,6 +61,7 @@ int main(int argc, char** argv){
   }
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_drop_table");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;

storage/ndb/tools/listTables.cpp

@@ -307,6 +307,7 @@ int main(int argc, char** argv){
   _tabname = argv[0];
 
   ndb_cluster_connection = new Ndb_cluster_connection(opt_connect_str);
+  ndb_cluster_connection->set_name("ndb_show_tables");
   if (ndb_cluster_connection->connect(12,5,1))
     fatal("Unable to connect to management server.");
   if (ndb_cluster_connection->wait_until_ready(30,0) < 0)

storage/ndb/tools/select_all.cpp

@@ -129,6 +129,7 @@ int main(int argc, char** argv){
   }
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_select_all");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;

storage/ndb/tools/select_count.cpp

@@ -83,6 +83,7 @@ int main(int argc, char** argv){
   }
 
   Ndb_cluster_connection con(opt_connect_str);
+  con.set_name("ndb_select_count");
   if(con.connect(12, 5, 1) != 0)
   {
     ndbout << "Unable to connect to management server." << endl;