Commit db2236be authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


sql/ha_ndbcluster_binlog.cc:
  Auto merged
parents 6751cb25 a304bcac

sql/ha_ndbcluster_binlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int ndbcluster_reset_logs(THD *thd) 
static int

ndbcluster_binlog_index_purge_file(THD *thd, const char *file)

{

  if (!ndb_binlog_running)

  if (!ndb_binlog_running || thd->slave_thread)

    return 0;



  DBUG_ENTER("ndbcluster_binlog_index_purge_file");