List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:February 18 2011 1:55pm
Subject:bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4204)
View as plain text  
#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4204 Magnus Blåudd	2011-02-18
      ndb
       - remove unused ndbcluster_handle_alter_table()

    modified:
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_binlog.h
=== modified file 'sql/ha_ndbcluster_binlog.cc'
--- a/sql/ha_ndbcluster_binlog.cc	2011-02-16 06:10:50 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-02-18 13:55:27 +0000
@@ -5048,44 +5048,6 @@ ndbcluster_drop_event(THD *thd, Ndb *ndb
   DBUG_RETURN(0);
 }
 
-int
-ndbcluster_handle_alter_table(THD *thd, NDB_SHARE *share, const char *type_str)
-{
-  DBUG_ENTER("ndbcluster_handle_alter_table");
-  const char *save_proc_info= thd->proc_info;
-  thd->proc_info= "Syncing ndb table schema operation and binlog";
-  pthread_mutex_lock(&share->mutex);
-  int max_timeout= DEFAULT_SYNC_TIMEOUT;
-  while (share->state == NSS_ALTERED)
-  {
-    struct timespec abstime;
-    set_timespec(abstime, 1);
-    int ret= pthread_cond_timedwait(&injector_cond,
-                                    &share->mutex,
-                                    &abstime);
-    if (thd->killed ||
-        (share->state != NSS_ALTERED))
-      break;
-    if (ret)
-    {
-      max_timeout--;
-      if (max_timeout == 0)
-      {
-        sql_print_error("NDB %s: %s timed out. Ignoring...",
-                        type_str, share->key);
-        DBUG_ASSERT(false);
-        break;
-      }
-      if (opt_ndb_extra_logging)
-        ndb_report_waiting(type_str, max_timeout,
-                           type_str, share->key, 0);
-    }
-  }
-  pthread_mutex_unlock(&share->mutex);
-  thd->proc_info= save_proc_info;
-  DBUG_RETURN(0);
-}
-
 /*
   when entering the calling thread should have a share lock id share != 0
   then the injector thread will have  one as well, i.e. share->use_count == 0

=== modified file 'sql/ha_ndbcluster_binlog.h'
--- a/sql/ha_ndbcluster_binlog.h	2011-02-16 06:10:50 +0000
+++ b/sql/ha_ndbcluster_binlog.h	2011-02-18 13:55:27 +0000
@@ -230,8 +230,6 @@ int ndbcluster_log_schema_op(THD *thd,
 int ndbcluster_drop_event(THD *thd, Ndb *ndb, NDB_SHARE *share,
                           const char *type_str,
                           const char * dbname, const char * tabname);
-int ndbcluster_handle_alter_table(THD *thd, NDB_SHARE *share,
-                                  const char *type_str);
 int ndbcluster_handle_drop_table(THD *thd, Ndb *ndb, NDB_SHARE *share,
                                  const char *type_str,
                                  const char * db, const char * tabname);

Attachment: [text/bzr-bundle] bzr/magnus.blaudd@oracle.com-20110218135527-mn9md2gdepp2ql39.bundle
Thread
bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4204) Magnus Blåudd18 Feb