← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Monty Taylor
  • Date: 2008-12-17 18:23:08 UTC
  • mfrom: (685.3.3 mysys-slimdown)
  • mto: This revision was merged to the branch mainline in revision 713.
  • Revision ID: monty@inaugust.com-20081217182308-bcuztplharskm9yh
Merged from Toru.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
1206
1206
  pthread_mutex_unlock(&LOCK_thread_count);
1207
1207
 
1208
1208
  thread_info *session_info;
1209
 
  time_t now= my_time(0);
 
1209
  time_t now= time(0);
1210
1210
  while ((session_info=thread_infos.get()))
1211
1211
  {
1212
1212
    protocol->prepare_for_resend();
1236
1236
  Table *table= tables->table;
1237
1237
  const CHARSET_INFO * const cs= system_charset_info;
1238
1238
  char *user;
1239
 
  time_t now= my_time(0);
 
1239
  time_t now;
 
1240
 
 
1241
  if ((now= time(0)) == (time_t)-1)
 
1242
    return 1;
1240
1243
 
1241
1244
  user= NULL;
1242
1245