bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4180)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@stripped

 4180 Magnus Blåudd	2011-02-08
      ndb
       - move declaration of ndb_binlog_thread_func to "local scope" inside
         ha_ndbcluster_binlog.cc

    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-04 17:52:38 +0000
+++ b/sql/ha_ndbcluster_binlog.cc	2011-02-08 10:07:46 +0000
@@ -3560,6 +3560,8 @@ add_ndb_binlog_index_err:
   Functions for start, stop, wait for ndbcluster binlog thread
 *********************************************************************/
 
+pthread_handler_t ndb_binlog_thread_func(void *arg);
+
 int ndbcluster_binlog_start()
 {
   DBUG_ENTER("ndbcluster_binlog_start");
@@ -5967,7 +5969,8 @@ enum Binlog_thread_state
 extern ulong opt_ndb_report_thresh_binlog_epoch_slip;
 extern ulong opt_ndb_report_thresh_binlog_mem_usage;
 
-pthread_handler_t ndb_binlog_thread_func(void *arg)
+pthread_handler_t
+ndb_binlog_thread_func(void *arg)
 {
   THD *thd; /* needs to be first for thread_stack */
   Ndb *i_ndb= 0;

=== modified file 'sql/ha_ndbcluster_binlog.h'
--- a/sql/ha_ndbcluster_binlog.h	2011-02-08 09:19:32 +0000
+++ b/sql/ha_ndbcluster_binlog.h	2011-02-08 10:07:46 +0000
@@ -249,7 +249,6 @@ ndbcluster_read_binlog_replication(THD *
 int ndb_create_table_from_engine(THD *thd, const char *db,
                                  const char *table_name);
 int ndbcluster_binlog_start();
-pthread_handler_t ndb_binlog_thread_func(void *arg);
 
 /*
   table mysql.ndb_apply_status

Attachment: [text/bzr-bundle] bzr/[e-mail]