← Back to branch summary

~jaypipes/drizzle/proto-definitions

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Jay Pipes
  • Date: 2008-09-25 18:13:26 UTC
  • mfrom: (352.5.30 codestyle)
  • Revision ID: jay@mysql.com-20080925181326-2z7pr377hcvf28qt
Merged in trunk and added additional definition wrappers for proto buffer messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
184
184
  */
185
185
  if (!opt_character_set_client_handshake ||
186
186
      !(thd->variables.character_set_client= get_charset(cs_number, MYF(0))) ||
187
 
      !my_strcasecmp(&my_charset_latin1,
 
187
      !my_strcasecmp(&my_charset_utf8_general_ci,
188
188
                     global_system_variables.character_set_client->name,
189
189
                     thd->variables.character_set_client->name))
190
190
  {
236
236
  uint32_t pkt_len= 0;
237
237
  char *end;
238
238
 
239
 
#ifdef SIGNAL_WITH_VIO_CLOSE
240
 
  thd->set_active_vio(net->vio);
241
 
#endif
242
 
 
243
239
  // TCP/IP connection
244
240
  {
245
241
    char ip[NI_MAXHOST];
246
242
 
247
 
    if (vio_peer_addr(net->vio, ip, &thd->peer_port, NI_MAXHOST))
 
243
    if (net_peer_addr(net, ip, &thd->peer_port, NI_MAXHOST))
248
244
    {
249
245
      my_error(ER_BAD_HOST_ERROR, MYF(0), thd->main_security_ctx.ip);
250
246
      return 1;
252
248
    if (!(thd->main_security_ctx.ip= my_strdup(ip,MYF(MY_WME))))
253
249
      return 1; /* The error is set by my_strdup(). */
254
250
  }
255
 
  vio_keepalive(net->vio, true);
 
251
  net_keepalive(net, true);
256
252
  
257
253
  uint32_t server_capabilites;
258
254
  {