← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Brian Aker
  • Date: 2009-04-05 19:53:29 UTC
  • mfrom: (971.3.11 eday-dev)
  • Revision ID: brian@tangent.org-20090405195329-k2vpiwhlri9oaedq
Merge from Eric.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
87
87
 
88
88
  for (;;)
89
89
  {
90
 
    NET *net= &session->net;
91
 
 
92
90
    if (! session->authenticate())
93
91
      goto end_thread;
94
92
 
95
93
    session->prepareForQueries();
96
94
 
97
 
    while (!net->error && net->vio != 0 &&
 
95
    while (!session->protocol->have_error() &&
98
96
           !(session->killed == Session::KILL_CONNECTION))
99
97
    {
100
98
      if (! session->executeStatement())