← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/mysql_protocol.cc

  • Committer: Lee Bieber
  • Date: 2011-02-24 03:20:47 UTC
  • mfrom: (2196.1.4 build)
  • Revision ID: kalebral@gmail.com-20110224032047-avmw06iwww3m73cw
Merge Andrew - 723653: Docs day first pass fixes 
Merge Brian - Puts back in support for COM_KILL, Also adds back in the INTERACTIVE flag, and creates a DD to track sessions/check on usage
Merge Olaf - Use List::size()

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/mysql_protocol.cc
97
97
ClientMySQLProtocol::ClientMySQLProtocol(int fd, bool using_mysql41_protocol, ProtocolCounters *set_counters):
98
98
  is_admin_connection(false),
99
99
  _using_mysql41_protocol(using_mysql41_protocol),
 
100
  _is_interactive(false),
100
101
  counters(set_counters)
101
102
{
102
103
  
156
157
    drizzleclient_net_close(&net);
157
158
    drizzleclient_net_end(&net);
158
159
    if (is_admin_connection)
 
160
    {
159
161
      counters->adminConnected.decrement();
 
162
    }
160
163
    else
 
164
    {
161
165
      counters->connected.decrement();
 
166
    }
162
167
  }
163
168
}
164
169
 
275
280
      (*l_packet)[0]= (unsigned char) COM_SHUTDOWN;
276
281
      break;
277
282
 
 
283
    case 12: /* KILL */
 
284
      (*l_packet)[0]= (unsigned char) COM_KILL;
 
285
      break;
 
286
 
278
287
    case 14: /* PING */
279
288
      (*l_packet)[0]= (unsigned char) COM_PING;
280
289
      break;
859
868
    }
860
869
  }
861
870
 
 
871
  if (client_capabilities & CLIENT_INTERACTIVE)
 
872
  {
 
873
    _is_interactive= true;
 
874
  }
 
875
 
862
876
  user_identifier->setUser(user);
863
877
  session->setUser(user_identifier);
864
878