bzr push into mysql-5.1-telco-7.2 branch (john.duncan:4161 to 4162)

[John David Duncan]

 4162 John David Duncan	2011-04-18 [merge]
      merge

    modified:
      storage/ndb/memcache/src/Configuration.cc
 4161 John David Duncan	2011-04-18 [merge]
      Merge

    removed:
      storage/ndb/memcache/src/schedulers/3thread.cc
      storage/ndb/memcache/src/schedulers/3thread.h
    added:
      storage/ndb/memcache/src/schedulers/Bulk.cc
      storage/ndb/memcache/src/schedulers/Bulk.h
    modified:
      storage/ndb/memcache/Makefile.am
      storage/ndb/memcache/include/NdbInstance.h
      storage/ndb/memcache/src/NdbInstance.cc
      storage/ndb/memcache/src/ndb_pipeline.cc
      storage/ndb/memcache/src/ndb_worker.cc
      storage/ndb/memcache/src/schedulers/Stockholm.cc
      storage/ndb/memcache/src/workqueue.c
      storage/ndb/memcache/unit/Makefile.am
      storage/ndb/memcache/unit/harness.cc
=== modified file 'storage/ndb/memcache/src/Configuration.cc'
--- a/storage/ndb/memcache/src/Configuration.cc	2011-04-09 07:36:24 +0000
+++ b/storage/ndb/memcache/src/Configuration.cc	2011-04-19 06:47:32 +0000
@@ -580,7 +580,7 @@ bool config_v1::get_connections() {
     if(str_is_null)
       connection_idx = conf.storeConnection(0, rtt);
     else 
-      connection_idx = conf.storeConnection(connectstring, rtt);
+      connection_idx = conf.storeConnection(strdup(connectstring), rtt);
        
     DEBUG_PRINT("[%d]:  { %d => \"%s\" [rtt: %d]}", connection_idx, 
                 cfg_data_id, str_is_null ? "" : connectstring, rtt);

No bundle (reason: useless for push emails).