bzr push into mysql-trunk-cluster branch (magnus.blaudd:3454 to 3457) WL#946

[magnus.blaudd]

 3457 magnus.blaudd@stripped	2012-03-15
      ndb
       - disable one more test waiting for adaption to WL#946

    modified:
      mysql-test/suite/rpl_ndb/t/disabled.def
 3456 magnus.blaudd@stripped	2012-03-15
      Disable 2 more unstable perfschem tests

    modified:
      mysql-test/suite/perfschema/t/disabled.def
 3455 magnus.blaudd@stripped	2012-03-15 [merge]
      Merge 7.2 -> trunk-cluster

    modified:
      sql/ndb_mi.cc
 3454 magnus.blaudd@stripped	2012-03-15 [merge]
      Merge 7.2 -> trunk-cluster

    modified:
      storage/ndb/compile-cluster
=== modified file 'mysql-test/suite/perfschema/t/disabled.def'
--- a/mysql-test/suite/perfschema/t/disabled.def	2012-03-14 11:44:51 +0000
+++ b/mysql-test/suite/perfschema/t/disabled.def	2012-03-15 11:50:41 +0000
@@ -10,7 +10,9 @@
 #
 ##############################################################################
 
+event_aggregate_no_a : MCP Unstable testcase
 event_aggregate_no_a_no_h : MCP Unstable testcase
+event_aggregate_no_a_no_u : MCP Unstable testcase
 event_aggregate_no_a_no_u_no_h : MCP Unstable testcase
 event_aggregate_no_h : MCP Unstable testcase
 event_aggregate_no_u_no_h : MCP Unstable testcase

=== modified file 'mysql-test/suite/rpl_ndb/t/disabled.def'
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2012-03-12 15:09:11 +0000
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2012-03-15 12:12:34 +0000
@@ -15,4 +15,4 @@ rpl_ndb_row_implicit_commit_binlog : BUG
 rpl_ndb_dist_priv : Waiting for adaption to WL#946
 rpl_ndb_extra_col_master : Waiting for adaption to WL#946
 rpl_ndb_extra_col_slave : Waiting for adaption to WL#946
-
+rpl_ndb_row_basic : Waiting for adaption to WL#946

=== modified file 'sql/ndb_mi.cc'
--- a/sql/ndb_mi.cc	2011-09-30 15:38:44 +0000
+++ b/sql/ndb_mi.cc	2012-03-15 11:44:44 +0000
@@ -28,11 +28,13 @@ extern Master_info *active_mi;
 
 uint32 ndb_mi_get_master_server_id()
 {
+  DBUG_ASSERT (active_mi != NULL);
   return (uint32) active_mi->master_id;
 }
 
 const char* ndb_mi_get_group_master_log_name()
 {
+  DBUG_ASSERT (active_mi != NULL);
 #if MYSQL_VERSION_ID < 50600
   return active_mi->rli.group_master_log_name;
 #else
@@ -42,6 +44,7 @@ const char* ndb_mi_get_group_master_log_
 
 uint64 ndb_mi_get_group_master_log_pos()
 {
+  DBUG_ASSERT (active_mi != NULL);
 #if MYSQL_VERSION_ID < 50600
   return (uint64) active_mi->rli.group_master_log_pos;
 #else
@@ -51,6 +54,7 @@ uint64 ndb_mi_get_group_master_log_pos()
 
 uint64 ndb_mi_get_future_event_relay_log_pos()
 {
+  DBUG_ASSERT (active_mi != NULL);
 #if MYSQL_VERSION_ID < 50600
   return (uint64) active_mi->rli.future_event_relay_log_pos;
 #else
@@ -60,6 +64,7 @@ uint64 ndb_mi_get_future_event_relay_log
 
 uint64 ndb_mi_get_group_relay_log_pos()
 {
+  DBUG_ASSERT (active_mi != NULL);
 #if MYSQL_VERSION_ID < 50600
   return (uint64) active_mi->rli.group_relay_log_pos;
 #else
@@ -69,27 +74,44 @@ uint64 ndb_mi_get_group_relay_log_pos()
 
 bool ndb_mi_get_ignore_server_id(uint32 server_id)
 {
+  DBUG_ASSERT (active_mi != NULL);
   return (active_mi->shall_ignore_server_id(server_id) != 0);
 }
 
 uint32 ndb_mi_get_slave_run_id()
 {
+  DBUG_ASSERT (active_mi != NULL);
+#if MYSQL_VERSION_ID < 50600
+  return active_mi->rli.slave_run_id;
+#else
   return active_mi->rli->slave_run_id;
+#endif
 }
 
 bool ndb_mi_get_in_relay_log_statement(Relay_log_info* rli)
 {
+  DBUG_ASSERT (rli != NULL);
   return (rli->get_flag(Relay_log_info::IN_STMT) != 0);
 }
 
 ulong ndb_mi_get_relay_log_trans_retries()
 {
+  DBUG_ASSERT (active_mi != NULL);
+#if MYSQL_VERSION_ID < 50600
+  return active_mi->rli.trans_retries;
+#else
   return active_mi->rli->trans_retries;
+#endif
 }
 
 void ndb_mi_set_relay_log_trans_retries(ulong number)
 {
+  DBUG_ASSERT (active_mi != NULL);
+#if MYSQL_VERSION_ID < 50600
+  active_mi->rli.trans_retries = number;
+#else
   active_mi->rli->trans_retries = number;
+#endif
 }
 
 /* #ifdef HAVE_NDB_BINLOG */

No bundle (reason: useless for push emails).