List:Commits« Previous MessageNext Message »
From:tomas Date:January 26 2006 10:37pm
Subject:bk commit into 5.1 tree (tomas:1.2085)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2085 06/01/26 23:37:19 tomas@stripped +1 -0
  wl2325, fix bug in "distribution of schema operations" in ndb

  sql/ha_ndbcluster_binlog.cc
    1.6 06/01/26 23:37:12 tomas@stripped +13 -9
    wl2325, fix bug in "distribution of schema operations" in ndb

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.5/sql/ha_ndbcluster_binlog.cc	2006-01-26 09:28:04 +01:00
+++ 1.6/sql/ha_ndbcluster_binlog.cc	2006-01-26 23:37:12 +01:00
@@ -1104,9 +1104,10 @@
         sql_print_error("NDB create table: timed out. Ignoring...");
         break;
       }
-      sql_print_information("NDB create table: "
-                            "waiting max %u sec for create table %s.",
-                            max_timeout, share->key);
+      if (ndb_extra_logging)
+        sql_print_information("NDB create table: "
+                              "waiting max %u sec for create table %s.",
+                              max_timeout, share->key);
     }
     (void) pthread_mutex_unlock(&share->mutex);
   }
@@ -1369,12 +1370,6 @@
                             schema->node_id);
           }
           pthread_mutex_unlock(&LOCK_open);
-          {
-            /* signal that schema operation has been handled */
-            DBUG_DUMP("slock", (char*)schema->slock, schema->slock_length);
-            if (bitmap_is_set(&slock, node_id))
-              ndbcluster_update_slock(thd, schema->db, schema->name);
-          }
           log_query= 1;
           break;
         case SOT_DROP_DB:
@@ -1419,6 +1414,15 @@
           log_query= 1;
           break;
         }
+
+        /* signal that schema operation has been handled */
+        if ((enum SCHEMA_OP_TYPE)schema->type != SOT_CLEAR_SLOCK)
+        {
+          DBUG_DUMP("slock", (char*)schema->slock, schema->slock_length);
+          if (bitmap_is_set(&slock, node_id))
+            ndbcluster_update_slock(thd, schema->db, schema->name);
+        }
+
         if (log_query)
         {
           char *thd_db_save= thd->db;
Thread
bk commit into 5.1 tree (tomas:1.2085)tomas26 Jan