← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Brian Aker
  • Date: 2009-03-20 00:26:27 UTC
  • Revision ID: brian@tangent.org-20090320002627-d3uzdyrial5om2d7
Merge fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
393
393
  net.vio= 0;
394
394
  client_capabilities= 0;                       // minimalistic client
395
395
  system_thread= NON_SYSTEM_THREAD;
396
 
  cleanup_done= abort_on_warning= no_warnings_for_error= 0;
 
396
  cleanup_done= abort_on_warning= no_warnings_for_error= false;
397
397
  peer_port= 0;                                 // For SHOW PROCESSLIST
398
398
  transaction.on= 1;
399
399
  pthread_mutex_init(&LOCK_delete, MY_MUTEX_INIT_FAST);
556
556
 
557
557
void Session::cleanup(void)
558
558
{
559
 
  assert(cleanup_done == 0);
 
559
  assert(cleanup_done == false);
560
560
 
561
561
  killed= KILL_CONNECTION;
562
562
#ifdef ENABLE_WHEN_BINLOG_WILL_BE_ABLE_TO_PREPARE
580
580
  if (global_read_lock)
581
581
    unlock_global_read_lock(this);
582
582
 
583
 
  cleanup_done=1;
 
583
  cleanup_done= true;
584
584
  return;
585
585
}
586
586
 
605
605
    drizzleclient_net_close(&net);
606
606
    drizzleclient_net_end(&net);
607
607
  }
608
 
  if (!cleanup_done)
 
608
  if (cleanup_done == false)
609
609
    cleanup();
610
610
 
611
611
  ha_close_connection(this);