← 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: Mark Atwood
  • Date: 2011-10-13 18:28:03 UTC
  • mfrom: (2433.1.5 rf1)
  • Revision ID: me@mark.atwood.name-20111013182803-pbmb3r5emfxfrbvy
merge lp:~olafvdspek/drizzle/refactor2

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/mysql_protocol/mysql_protocol.cc
405
405
  char *tmp= strncpy((char*)pos, err, DRIZZLE_ERRMSG_SIZE-1);
406
406
  tmp+= strlen((char*)pos);
407
407
  tmp[0]= '\0';
408
 
  net.write_command(255, data_ref().clear(), data_ref(buff, tmp));
 
408
  net.write_command(255, data_ref(), data_ref(buff, tmp));
409
409
  net.flush();
410
410
  session->main_da().can_overwrite_status= false;
411
411
}
686
686
    *end++= 0; /* an empty byte for some reason */
687
687
 
688
688
    /* At this point we write connection message and read reply */
689
 
    if (net.write_command(PROTOCOL_VERSION, data_ref().clear(), data_ref(buff, end)) 
 
689
    if (net.write_command(PROTOCOL_VERSION, data_ref(), data_ref(buff, end)) 
690
690
        || (pkt_len= net.read()) == packet_error 
691
691
        || pkt_len < MIN_HANDSHAKE_SIZE)
692
692
    {