← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Jay Pipes
  • Date: 2009-03-16 02:52:26 UTC
  • mto: This revision was merged to the branch mainline in revision 941.
  • Revision ID: jpipes@serialcoder-20090316025226-bs0fprh0cxony7z9
This changeset removes a few more  C functions from sql_connect.cc/connect.h
and houses them as member methods of the session object.  Added documentation
where I could and cleaned up the code style.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
553
553
                          tmp->thread_id,
554
554
                          (tmp->security_ctx.user.c_str() ?
555
555
                           tmp->security_ctx.user.c_str() : ""));
556
 
      tmp->close_connection(0,0);
 
556
      tmp->disconnect(0, false);
557
557
    }
558
558
    (void) pthread_mutex_unlock(&LOCK_thread_count);
559
559
  }
1904
1904
    net_send_error(session, ER_CANT_CREATE_THREAD, error_message_buff);
1905
1905
    (void) pthread_mutex_lock(&LOCK_thread_count);
1906
1906
    --connection_count;
1907
 
    session->close_connection(0, 0);
 
1907
    session->disconnect(0, false);
1908
1908
    delete session;
1909
1909
    (void) pthread_mutex_unlock(&LOCK_thread_count);
1910
1910
  }