~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/handler.cc

  • Committer: Monty Taylor
  • Date: 2009-06-08 13:39:05 UTC
  • mto: This revision was merged to the branch mainline in revision 1060.
  • Revision ID: mordred@inaugust.com-20090608133905-3hogrrafmfg6e5hs
Removed CHARSET_INFO stuff from protocol plugin interface - it makes no sense.

Show diffs side-by-side

added added

removed removed

Lines of Context:
822
822
      protocol->store((int64_t)xs->xid.formatID);
823
823
      protocol->store((int64_t)xs->xid.gtrid_length);
824
824
      protocol->store((int64_t)xs->xid.bqual_length);
825
 
      protocol->store(xs->xid.data, xs->xid.gtrid_length+xs->xid.bqual_length,
826
 
                      &my_charset_bin);
 
825
      protocol->store(xs->xid.data, xs->xid.gtrid_length+xs->xid.bqual_length);
827
826
      if (protocol->write())
828
827
      {
829
828
        pthread_mutex_unlock(&LOCK_xid_cache);
3253
3252
{
3254
3253
  Protocol *protocol= session->protocol;
3255
3254
  protocol->prepareForResend();
3256
 
  protocol->store(type, type_len, system_charset_info);
3257
 
  protocol->store(file, file_len, system_charset_info);
3258
 
  protocol->store(status, status_len, system_charset_info);
 
3255
  protocol->store(type, type_len);
 
3256
  protocol->store(file, file_len);
 
3257
  protocol->store(status, status_len);
3259
3258
  if (protocol->write())
3260
3259
    return true;
3261
3260
  return false;