bzr push into mysql-5.5-cluster branch (john.duncan:3550 to 3551)

[John David Duncan]

 3551 John David Duncan	2011-09-25
      mtr: don't try to run ndb_memcache tests with the embedded server.
      building ndb/memcache: don't disable asserts.

    modified:
      mysql-test/mysql-test-run.pl
      storage/ndb/memcache/CMakeLists.txt
 3550 John David Duncan	2011-09-24
      Remove the problem assert altogether

    modified:
      storage/ndb/memcache/src/NdbInstance.cc
      storage/ndb/memcache/src/QueryPlan.cc
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-09-25 01:44:26 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-09-25 07:19:37 +0000
@@ -2744,9 +2744,11 @@ sub check_ndbcluster_support ($) {
     mtr_report(" - MySQL Cluster");
     # Enable ndb engine and add more test suites
     $opt_include_ndbcluster = 1;
-    $DEFAULT_SUITES.=",ndb,ndb_binlog,rpl_ndb,ndb_rpl,ndb_memcache";
+    $DEFAULT_SUITES.=",ndb,ndb_binlog,rpl_ndb,ndb_rpl";
+    $DEFAULT_SUITES.=",ndb_memcache" unless($opt_embedded_server);
   }
 
+
   if ($opt_include_ndbcluster)
   {
     $opt_skip_ndbcluster= 0;
@@ -3112,7 +3114,7 @@ sub memcached_load_metadata($) {
     mtr_init_args(\$args);
     mtr_add_arg($args, "--defaults-file=%s", $path_config_file);
     mtr_add_arg($args, "--defaults-group-suffix=%s", $cluster->suffix());
-    mtr_add_arg($args, "--connect-timeout=10");
+    mtr_add_arg($args, "--connect-timeout=20");
     
     mtr_verbose("Script: $sql_script");
     if ( My::SafeProcess->run(
@@ -5524,6 +5526,13 @@ sub start_servers($) {
   { 
     if(memcacheds()) 
     {
+      # In theory maybe you could run the memcached tests with the embedded
+      # server, but for now we skip it.
+      if($opt_embedded_server) 
+      { 
+        mtr_error("Cannot run memcached tests with the embedded server.");
+      }
+      
       my $avail_port = $memcached_base_port;
       my $memcached;
       memcached_load_metadata($cluster);

=== modified file 'storage/ndb/memcache/CMakeLists.txt'
--- a/storage/ndb/memcache/CMakeLists.txt	2011-09-23 00:00:18 +0000
+++ b/storage/ndb/memcache/CMakeLists.txt	2011-09-25 07:19:37 +0000
@@ -20,6 +20,9 @@ IF(WIN32)
   RETURN()
 ENDIF()
 
+# Don't disable assert
+remove_definitions(-DNDEBUG)
+
 include("FindMemcached.cmake")
 
 IF(MEMCACHED_FOUND) 

No bundle (reason: useless for push emails).