List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:November 10 2011 9:47am
Subject:bzr push into mysql-5.5-cluster branch (magnus.blaudd:3652 to 3653)
View as plain text  
 3653 magnus.blaudd@stripped	2011-11-10
      ndb schema dist
       - remove now unused 'post_epoch_unlock' flag and logic

    modified:
      sql/ha_ndbcluster_binlog.cc
 3652 magnus.blaudd@stripped	2011-11-10
      ndb schema dist
       - factor out 'handle_drop_db'

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-10 09:37:06 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-10 09:47:05 +0000
@@ -3104,8 +3104,6 @@ class Ndb_schema_event_handler {
         THD* thd= m_thd; // Code compatibility
         Thd_ndb *thd_ndb= get_thd_ndb(thd);
         Thd_ndb_options_guard thd_ndb_options(thd_ndb);
-
-        int post_epoch_unlock= 0;
  
         switch (schema_type)
         {
@@ -3212,11 +3210,8 @@ class Ndb_schema_event_handler {
         DBUG_DUMP("slock", (uchar*) schema->slock_buf, schema->slock_length);
         if (bitmap_is_set(&schema->slock, own_nodeid()))
         {
-          if (post_epoch_unlock)
-            unlock_after_epoch(schema);
-          else
-            ack_schema_op(schema->db, schema->name,
-                          schema->id, schema->version);
+          ack_schema_op(schema->db, schema->name,
+                        schema->id, schema->version);
         }
       }
     }

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (magnus.blaudd:3652 to 3653) magnus.blaudd11 Nov