bzr push into mysql-5.5-cluster branch (jonas.oreland:3558 to 3561)

[jonas oreland]

 3561 jonas oreland	2011-10-01
      add another shameful valgrind suppresions (no 4)

    modified:
      mysql-test/valgrind.supp
 3560 jonas oreland	2011-10-01
      ndb - remove dbug_assert(false) after rpl_ndb_dist_priv...unknown reason...

    modified:
      sql/ha_ndbcluster.cc
 3559 jonas oreland	2011-10-01
      ndb - fix suite ndb_team wrt embedded...remove old junk

    modified:
      mysql-test/suite/ndb_team/my.cnf
 3558 jonas oreland	2011-09-30
      ndb - add another shameful valgrind supression

    modified:
      mysql-test/valgrind.supp
=== modified file 'mysql-test/suite/ndb_team/my.cnf'
--- a/mysql-test/suite/ndb_team/my.cnf	2011-09-22 17:03:53 +0000
+++ b/mysql-test/suite/ndb_team/my.cnf	2011-10-01 15:05:42 +0000
@@ -17,15 +17,6 @@ ndb-cluster-connection-pool=3
 ndb-extra-logging=99
 ndb-index-stat-enable=0
 
-[mysqld.1.1]
-
-[mysqld.1.1]
-
-# Directory where slaves find the dumps generated by "load data"
-# on the server. The path need to have constant length otherwise
-# test results will vary, thus a relative path is used.
-slave-load-tmpdir=            ../../../tmp
-
 [ENV]
 NDB_CONNECTSTRING=            @mysql_cluster.1.ndb_connectstring
 MASTER_MYPORT=                @mysqld.1.1.port

=== modified file 'mysql-test/valgrind.supp'
--- a/mysql-test/valgrind.supp	2011-09-30 11:44:17 +0000
+++ b/mysql-test/valgrind.supp	2011-10-01 16:31:02 +0000
@@ -988,3 +988,22 @@
    fun:clone
 }
 
+{
+   shame 4
+   Memcheck:Leak
+   fun:_Znwm
+   fun:_ZN12ha_partition9add_indexEP5TABLEP6st_keyjPP17handler_add_index
+   fun:_ZN7handler18alter_table_phase1EP3THDP5TABLEP24st_ha_create_informationP23st_ha_alter_informationP6BitmapILj40EE
+   fun:_Z32mysql_fast_or_online_alter_tableP3THDP5TABLES2_P24st_ha_create_informationP23st_ha_alter_informationP6BitmapILj40EE22enum_enable_or_disablebP11MDL_request
+   fun:_Z17mysql_alter_tableP3THDPcS1_P24st_ha_create_informationP10TABLE_LISTP10Alter_infojP8st_orderb
+   fun:_Z21mysql_execute_commandP3THD
+   fun:_Z11mysql_parseP3THDPcjP12Parser_state
+   fun:_Z16dispatch_command19enum_server_commandP3THDPcj
+   fun:_Z10do_commandP3THD
+   fun:_Z24do_handle_one_connectionP3THD
+   fun:handle_one_connection
+   fun:pfs_spawn_thread
+   fun:start_thread
+   fun:clone
+}
+

=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-09-30 11:05:03 +0000
+++ b/sql/ha_ndbcluster.cc	2011-10-01 16:08:44 +0000
@@ -12891,6 +12891,15 @@ static int ndbcluster_end(handlerton *ht
               share->key, share->use_count,
               get_share_state_string(share->state),
               (uint)share->state);
+      /**
+       * For unknown reasons...the dist-priv tables linger here
+       * TODO investigate why
+       */
+      if (Ndb_dist_priv_util::is_distributed_priv_table(share->db,
+                                                        share->table_name))
+      {
+        save--;
+      }
 #endif
       ndbcluster_real_free_share(&share);
     }

No bundle (reason: useless for push emails).