← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_connect.cc

  • Committer: Monty Taylor
  • Date: 2009-02-08 10:59:43 UTC
  • mto: This revision was merged to the branch mainline in revision 852.
  • Revision ID: mordred@inaugust.com-20090208105943-e30tagctq2nrghxi
Renamed my_net_* to drizzleclient_net_* to help with namespace issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_connect.cc
222
222
    /* At this point we write connection message and read reply */
223
223
    if (net_write_command(net, (unsigned char) protocol_version, (unsigned char*) "", 0,
224
224
                          (unsigned char*) buff, (size_t) (end-buff)) ||
225
 
        (pkt_len= my_net_read(net)) == packet_error ||
 
225
        (pkt_len= drizzleclient_net_read(net)) == packet_error ||
226
226
        pkt_len < MIN_HANDSHAKE_SIZE)
227
227
    {
228
228
      my_error(ER_HANDSHAKE_ERROR, MYF(0),
368
368
  int error;
369
369
 
370
370
  /* Use "connect_timeout" value during connection phase */
371
 
  my_net_set_read_timeout(net, connect_timeout);
372
 
  my_net_set_write_timeout(net, connect_timeout);
 
371
  drizzleclient_net_set_read_timeout(net, connect_timeout);
 
372
  drizzleclient_net_set_write_timeout(net, connect_timeout);
373
373
 
374
374
  lex_start(session);
375
375
 
382
382
    return(1);
383
383
  }
384
384
  /* Connect completed, set read/write timeouts back to default */
385
 
  my_net_set_read_timeout(net, session->variables.net_read_timeout);
386
 
  my_net_set_write_timeout(net, session->variables.net_write_timeout);
 
385
  drizzleclient_net_set_read_timeout(net, session->variables.net_read_timeout);
 
386
  drizzleclient_net_set_write_timeout(net, session->variables.net_write_timeout);
387
387
  return(0);
388
388
}
389
389