← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_show.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/sql_show.cc
494
494
   it's a keyword
495
495
  */
496
496
 
497
 
  VOID(packet->reserve(length*2 + 2));
 
497
  packet->reserve(length*2 + 2);
498
498
  quote_char= (char) q;
499
499
  packet->append(&quote_char, 1, system_charset_info);
500
500
 
1117
1117
                            Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
1118
1118
    return;
1119
1119
 
1120
 
  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
 
1120
  pthread_mutex_lock(&LOCK_thread_count); // For unlink from list
1121
1121
  if (!thd->killed)
1122
1122
  {
1123
1123
    I_List_iterator<THD> it(threads);
1169
1169
      }
1170
1170
    }
1171
1171
  }
1172
 
  VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
1172
  pthread_mutex_unlock(&LOCK_thread_count);
1173
1173
 
1174
1174
  thread_info *thd_info;
1175
1175
  time_t now= my_time(0);
1207
1207
 
1208
1208
  user= NullS;
1209
1209
 
1210
 
  VOID(pthread_mutex_lock(&LOCK_thread_count));
 
1210
  pthread_mutex_lock(&LOCK_thread_count);
1211
1211
 
1212
1212
  if (!thd->killed)
1213
1213
  {
1280
1280
 
1281
1281
      if (schema_table_store_record(thd, table))
1282
1282
      {
1283
 
        VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
1283
        pthread_mutex_unlock(&LOCK_thread_count);
1284
1284
        return(1);
1285
1285
      }
1286
1286
    }
1287
1287
  }
1288
1288
 
1289
 
  VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
1289
  pthread_mutex_unlock(&LOCK_thread_count);
1290
1290
  return(0);
1291
1291
}
1292
1292
 
1628
1628
{
1629
1629
 
1630
1630
  /* Ensure that thread id not killed during loop */
1631
 
  VOID(pthread_mutex_lock(&LOCK_thread_count)); // For unlink from list
 
1631
  pthread_mutex_lock(&LOCK_thread_count); // For unlink from list
1632
1632
 
1633
1633
  I_List_iterator<THD> it(threads);
1634
1634
  THD *tmp;
1640
1640
  while ((tmp= it++))
1641
1641
    add_to_status(to, &tmp->status_var);
1642
1642
  
1643
 
  VOID(pthread_mutex_unlock(&LOCK_thread_count));
 
1643
  pthread_mutex_unlock(&LOCK_thread_count);
1644
1644
  return;
1645
1645
}
1646
1646