← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/myisam/ha_myisam.cc

  • Committer: Monty Taylor
  • Date: 2009-04-09 05:35:58 UTC
  • mfrom: (984 merge)
  • mto: (992.1.1 mordred)
  • mto: This revision was merged to the branch mainline in revision 986.
  • Revision ID: mordred@inaugust.com-20090409053558-qi1x0zzsgf1d8f1p
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/myisam/ha_myisam.cc
87
87
  msg_length= vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
88
88
  msgbuf[sizeof(msgbuf) - 1] = 0; // healthy paranoia
89
89
 
90
 
  if (!session->protocol->io_ok())
 
90
  if (!session->protocol->isConnected())
91
91
  {
92
92
    errmsg_printf(ERRMSG_LVL_ERROR, "%s",msgbuf);
93
93
    return;
109
109
    Also we likely need to lock mutex here (in both cases with protocol and
110
110
    push_warning).
111
111
  */
112
 
  protocol->prepare_for_resend();
 
112
  protocol->prepareForResend();
113
113
  protocol->store(name, length, system_charset_info);
114
114
  protocol->store(param->op_name, system_charset_info);
115
115
  protocol->store(msg_type, system_charset_info);