List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:November 7 2011 10:14pm
Subject:bzr push into mysql-5.5-cluster branch (magnus.blaudd:3640 to 3642)
View as plain text  
 3642 Magnus Blåudd	2011-11-07
      ndb schema dist
       - fold SOT_CLEAR_SLOCK into teh same switch as the other

    modified:
      sql/ha_ndbcluster_binlog.cc
 3641 Magnus Blåudd	2011-11-07
      ndb schema dist
       - move the final free_share call in SOT_ONLINE_ALTER_TABLE_COMMIT out one step(i.e revert
         so it looks like original code before fold)

    modified:
      sql/ha_ndbcluster_binlog.cc
 3640 Magnus Blåudd	2011-11-07
      ndb schema dist
       - remove use of NO_LOCK_SCHEMA_OP around ndb_create_table_from_engine - that
         function doesn't lock global schema lock

    modified:
      sql/ha_ndbcluster_binlog.cc
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-11-07 21:48:03 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-11-07 22:01:14 +0000
@@ -2929,12 +2929,6 @@ class Ndb_schema_event_handler {
 
     {
       const SCHEMA_OP_TYPE schema_type= (SCHEMA_OP_TYPE)schema->type;
-      if (schema_type == SOT_CLEAR_SLOCK)
-      {
-        handle_clear_slock(schema, true);
-        DBUG_VOID_RETURN;
-      }
-
       if (opt_ndb_extra_logging > 9)
         sql_print_information("%s - %s.%s",
                               get_schema_type_name(schema_type),
@@ -2943,6 +2937,10 @@ class Ndb_schema_event_handler {
 
       switch (schema_type)
       {
+      case SOT_CLEAR_SLOCK:
+        handle_clear_slock(schema, true);
+        break;
+
       case SOT_DROP_DB:
         write_schema_op_to_binlog(thd, schema);
         break;
@@ -3127,14 +3125,13 @@ class Ndb_schema_event_handler {
           share->op= tmp_op;
           pthread_mutex_unlock(&share->mutex);
 
-          if (share)
-          {
-            free_share(&share);
-          }
-
           if (opt_ndb_extra_logging > 9)
             sql_print_information("NDB Binlog: handeling online alter/rename done");
         }
+        if (share)
+        {
+          free_share(&share);
+        }
         break;
       }
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-cluster branch (magnus.blaudd:3640 to 3642) Magnus Blåudd11 Nov