← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/log_event.cc

  • Committer: Monty Taylor
  • Date: 2008-09-23 00:10:39 UTC
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: monty@inaugust.com-20080923001039-cv4ve8om1kk5mgit
Removed __alpha__ references.
Removed VOID().

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/log_event.cc
2179
2179
    thd->set_time((time_t)when);
2180
2180
    thd->query_length= q_len_arg;
2181
2181
    thd->query= (char*)query_arg;
2182
 
    VOID(pthread_mutex_lock(&LOCK_thread_count));
 
2182
    pthread_mutex_lock(&LOCK_thread_count);
2183
2183
    thd->query_id = next_query_id();
2184
 
    VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
2184
    pthread_mutex_unlock(&LOCK_thread_count);
2185
2185
    thd->variables.pseudo_thread_id= thread_id;         // for temp tables
2186
2186
 
2187
2187
    if (ignored_error_code((expected_error= error_code)) ||
2364
2364
  } /* End of if (db_ok(... */
2365
2365
 
2366
2366
end:
2367
 
  VOID(pthread_mutex_lock(&LOCK_thread_count));
 
2367
  pthread_mutex_lock(&LOCK_thread_count);
2368
2368
  /*
2369
2369
    Probably we have set thd->query, thd->db, thd->catalog to point to places
2370
2370
    in the data_buf of this event. Now the event is going to be deleted
2379
2379
  thd->set_db(NULL, 0);                 /* will free the current database */
2380
2380
  thd->query= 0;                        // just to be sure
2381
2381
  thd->query_length= 0;
2382
 
  VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
2382
  pthread_mutex_unlock(&LOCK_thread_count);
2383
2383
  close_thread_tables(thd);      
2384
2384
  /*
2385
2385
    As a disk space optimization, future masters will not log an event for
3562
3562
  if (rpl_filter->db_ok(thd->db))
3563
3563
  {
3564
3564
    thd->set_time((time_t)when);
3565
 
    VOID(pthread_mutex_lock(&LOCK_thread_count));
 
3565
    pthread_mutex_lock(&LOCK_thread_count);
3566
3566
    thd->query_id = next_query_id();
3567
 
    VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
3567
    pthread_mutex_unlock(&LOCK_thread_count);
3568
3568
    /*
3569
3569
      Initing thd->row_count is not necessary in theory as this variable has no
3570
3570
      influence in the case of the slave SQL thread (it is used to generate a
3718
3718
error:
3719
3719
  thd->net.vio = 0; 
3720
3720
  const char *remember_db= thd->db;
3721
 
  VOID(pthread_mutex_lock(&LOCK_thread_count));
 
3721
  pthread_mutex_lock(&LOCK_thread_count);
3722
3722
  thd->catalog= 0;
3723
3723
  thd->set_db(NULL, 0);                   /* will free the current database */
3724
3724
  thd->query= 0;
3725
3725
  thd->query_length= 0;
3726
 
  VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
3726
  pthread_mutex_unlock(&LOCK_thread_count);
3727
3727
  close_thread_tables(thd);
3728
3728
 
3729
3729
  if (thd->is_slave_error)