← 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: Joseph Daly
  • Date: 2010-10-31 20:44:18 UTC
  • mfrom: (1894 build)
  • mto: This revision was merged to the branch mainline in revision 1900.
  • Revision ID: skinny.moey@gmail.com-20101031204418-dq03jokakmudu3iu
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/mysql_protocol.cc
103
103
ClientMySQLProtocol::~ClientMySQLProtocol()
104
104
{
105
105
  if (net.vio)
106
 
    vio_close(net.vio);
 
106
    net.vio->close();
107
107
}
108
108
 
109
109
int ClientMySQLProtocol::getFileDescriptor(void)
884
884
  uint32_t pointer_seed;
885
885
  memcpy(&pointer_seed, &pointer, 4);
886
886
  uint32_t random1= (seed + pointer_seed) % random_max;
887
 
  uint32_t random2= (seed + session->variables.pseudo_thread_id + net.vio->sd) % random_max;
 
887
  uint32_t random2= (seed + session->variables.pseudo_thread_id + net.vio->get_fd()) % random_max;
888
888
 
889
889
  for (char *end= scramble + SCRAMBLE_LENGTH; scramble != end; scramble++)
890
890
  {