List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:October 28 2011 7:17am
Subject:bzr push into mysql-5.5-cluster branch (magnus.blaudd:3639 to 3641)
View as plain text  
 3641 Magnus Blåudd	2011-10-28
      ndb schema dist
       - remove faulty friend declaration of 'ndb_handle_schema_change'

    modified:
      sql/ha_ndbcluster.h
 3640 Magnus Blåudd	2011-10-28
      ndb schema dist
       - add missing DBUG_VOID_RETURN

    modified:
      sql/ha_ndbcluster_binlog.cc
 3639 Magnus Blåudd	2011-10-28
      ndb schema dist
       - factor out the code which checks that the event received on s_ndb is a proper
        event with all pointers initialized into own function 'check_is_ndb_schema_event
       - add some extra asserts
       - remove the above check from 'handle_schema_event'

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-10-27 12:43:16 +0000
+++ b/sql/ha_ndbcluster.h	2011-10-28 07:14:45 +0000
@@ -496,9 +496,6 @@ private:
                                     const uchar *record,
                                     bool use_active_index);
   friend int ndbcluster_drop_database_impl(THD *thd, const char *path);
-  friend int ndb_handle_schema_change(THD *thd, 
-                                      Ndb *ndb, NdbEventOperation *pOp,
-                                      NDB_SHARE *share);
 
   void check_read_before_write_removal();
   static int drop_table_impl(THD *thd, ha_ndbcluster *h, Ndb *ndb,

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-10-28 07:08:59 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-10-28 07:12:35 +0000
@@ -3384,6 +3384,7 @@ public:
                         &m_post_epoch_log_list,
                         &m_post_epoch_unlock_list,
                         m_mem_root);
+    DBUG_VOID_RETURN;
   }
 
   void post_epoch()

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (magnus.blaudd:3639 to 3641) Magnus Blåudd28 Oct