← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/mysql_protocol/vio.cc

  • Committer: Mark Atwood
  • Date: 2011-06-14 19:30:31 UTC
  • mfrom: (2318.2.41 refactor5)
  • Revision ID: me@mark.atwood.name-20110614193031-lwbrlwfgf6id4r8b
merge lp:~olafvdspek/drizzle/refactor6
 with resolved conflict in drizzled/plugin/client.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/vio.cc
150
150
  return en == EAGAIN || en == EINTR || en == EWOULDBLOCK || en == ETIMEDOUT;
151
151
}
152
152
 
153
 
bool Vio::peer_addr(char *buf, uint16_t *port, size_t buflen) const
 
153
bool Vio::peer_addr(char *buf, size_t buflen, uint16_t& port) const
154
154
{
155
155
  char port_buf[NI_MAXSERV];
156
156
  sockaddr_storage remote;
164
164
    return true;
165
165
  }
166
166
 
167
 
  *port= (uint16_t)strtol(port_buf, (char **)NULL, 10);
 
167
  port= (uint16_t)strtol(port_buf, (char **)NULL, 10);
168
168
 
169
169
  return false;
170
170
}