← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log.cc

  • Committer: Monty Taylor
  • Date: 2008-09-23 14:19:48 UTC
  • mto: This revision was merged to the branch mainline in revision 419.
  • Revision ID: monty@inaugust.com-20080923141948-ktph2kg13addaxq1
Actually removed VOID() this time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log.cc
2146
2146
    thread. If the transaction involved MyISAM tables, it should go
2147
2147
    into binlog even on rollback.
2148
2148
  */
2149
 
  VOID(pthread_mutex_lock(&LOCK_thread_count));
 
2149
  pthread_mutex_lock(&LOCK_thread_count);
2150
2150
 
2151
2151
  /* Save variables so that we can reopen the log */
2152
2152
  save_name=name;
2226
2226
  my_free((uchar*) save_name, MYF(0));
2227
2227
 
2228
2228
err:
2229
 
  VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
2229
  pthread_mutex_unlock(&LOCK_thread_count);
2230
2230
  pthread_mutex_unlock(&LOCK_index);
2231
2231
  pthread_mutex_unlock(&LOCK_log);
2232
2232
  return(error);
3150
3150
    if ((thd && !(thd->options & OPTION_BIN_LOG)) ||
3151
3151
        (!binlog_filter->db_ok(local_db)))
3152
3152
    {
3153
 
      VOID(pthread_mutex_unlock(&LOCK_log));
 
3153
      pthread_mutex_unlock(&LOCK_log);
3154
3154
      return(0);
3155
3155
    }
3156
3156
 
3541
3541
 
3542
3542
bool DRIZZLE_BIN_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event)
3543
3543
{
3544
 
  VOID(pthread_mutex_lock(&LOCK_log));
 
3544
  pthread_mutex_lock(&LOCK_log);
3545
3545
 
3546
3546
  /* NULL would represent nothing to replicate after ROLLBACK */
3547
3547
  assert(commit_event != NULL);
3617
3617
    else
3618
3618
      rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
3619
3619
  }
3620
 
  VOID(pthread_mutex_unlock(&LOCK_log));
 
3620
  pthread_mutex_unlock(&LOCK_log);
3621
3621
 
3622
3622
  return(0);
3623
3623
 
3627
3627
    write_error= 1;
3628
3628
    sql_print_error(ER(ER_ERROR_ON_WRITE), name, errno);
3629
3629
  }
3630
 
  VOID(pthread_mutex_unlock(&LOCK_log));
 
3630
  pthread_mutex_unlock(&LOCK_log);
3631
3631
  return(1);
3632
3632
}
3633
3633
 
3832
3832
    char err_renamed[FN_REFLEN], *end;
3833
3833
    end= strmake(err_renamed,log_error_file,FN_REFLEN-4);
3834
3834
    stpcpy(end, "-old");
3835
 
    VOID(pthread_mutex_lock(&LOCK_error_log));
 
3835
    pthread_mutex_lock(&LOCK_error_log);
3836
3836
    char err_temp[FN_REFLEN+4];
3837
3837
    /*
3838
3838
     On Windows is necessary a temporary file for to rename
3863
3863
    }
3864
3864
    else
3865
3865
     result= 1;
3866
 
    VOID(pthread_mutex_unlock(&LOCK_error_log));
 
3866
    pthread_mutex_unlock(&LOCK_error_log);
3867
3867
  }
3868
3868
   return result;
3869
3869
}
3899
3899
  struct tm tm_tmp;
3900
3900
  struct tm *start;
3901
3901
 
3902
 
  VOID(pthread_mutex_lock(&LOCK_error_log));
 
3902
  pthread_mutex_lock(&LOCK_error_log);
3903
3903
 
3904
3904
  skr= my_time(0);
3905
3905
  localtime_r(&skr, &tm_tmp);
3918
3918
 
3919
3919
  fflush(stderr);
3920
3920
 
3921
 
  VOID(pthread_mutex_unlock(&LOCK_error_log));
 
3921
  pthread_mutex_unlock(&LOCK_error_log);
3922
3922
  return;
3923
3923
}
3924
3924