List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:November 15 2010 9:15am
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4002)
View as plain text  
#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4002 Magnus Blåudd	2010-11-15
      ndb
       - add wrapper for mysql_mutex_assert_owner

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_glue.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2010-11-10 15:37:21 +0000
+++ b/sql/ha_ndbcluster.cc	2010-11-15 09:15:27 +0000
@@ -10932,7 +10932,7 @@ int handle_trailing_share(THD *thd, NDB_
   table_list.db= share->db;
   table_list.alias= table_list.table_name= share->table_name;
   if (have_lock_open)
-    safe_mutex_assert_owner(&LOCK_open);
+    mysql_mutex_assert_owner(&LOCK_open);
   else
     mysql_mutex_lock(&LOCK_open);
   close_cached_tables(thd, &table_list, TRUE, FALSE, FALSE);

=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2010-11-10 10:31:20 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2010-11-15 09:15:27 +0000
@@ -401,7 +401,7 @@ ndbcluster_binlog_open_table(THD *thd, N
   TABLE *table= event_data->table= 
     (TABLE*)alloc_root(&event_data->mem_root, sizeof(TABLE));
 
-  safe_mutex_assert_owner(&LOCK_open);
+  mysql_mutex_assert_owner(&LOCK_open);
   init_tmp_table_share(thd, table_share, share->db, 0, share->table_name, 
                        share->key);
   if ((error= open_table_def(thd, table_share, 0)) ||
@@ -2348,7 +2348,7 @@ end:
     pthread_mutex_lock(&ndb_schema_object->mutex);
     if (have_lock_open)
     {
-      safe_mutex_assert_owner(&LOCK_open);
+      mysql_mutex_assert_owner(&LOCK_open);
       mysql_mutex_unlock(&LOCK_open);
     }
     while (1)
@@ -5081,7 +5081,7 @@ ndbcluster_handle_drop_table(THD *thd, N
 #ifdef SYNC_DROP_
   thd->proc_info= "Syncing ndb table schema operation and binlog";
   pthread_mutex_lock(&share->mutex);
-  safe_mutex_assert_owner(&LOCK_open);
+  mysql_mutex_assert_owner(&LOCK_open);
   mysql_mutex_unlock(&LOCK_open);
   int max_timeout= DEFAULT_SYNC_TIMEOUT;
   while (share->op)

=== modified file 'sql/ha_ndbcluster_glue.h'
--- a/sql/ha_ndbcluster_glue.h	2010-11-10 11:37:55 +0000
+++ b/sql/ha_ndbcluster_glue.h	2010-11-15 09:15:27 +0000
@@ -188,6 +188,12 @@ int mysql_mutex_unlock(mysql_mutex_t* mu
   return pthread_mutex_unlock(mutex);
 }
 
+static inline
+void mysql_mutex_assert_owner(mysql_mutex_t* mutex)
+{
+  return safe_mutex_assert_owner(mutex);
+}
+
 typedef pthread_cond_t mysql_cond_t;
 
 static inline

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@sun.com-20101115091527-uhth5gpq8800wlo8.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4002) Magnus Blåudd15 Nov