← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/protocol.cc

  • Committer: Monty Taylor
  • Date: 2008-12-24 18:50:40 UTC
  • mfrom: (750 testable)
  • mto: This revision was merged to the branch mainline in revision 751.
  • Revision ID: mordred@inaugust.com-20081224185040-ty52p3rcs3zg42fb
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/protocol.cc
492
492
  String tmp((char*) buff,sizeof(buff),&my_charset_bin);
493
493
  Protocol_text prot(session);
494
494
  String *local_packet= prot.storage_packet();
495
 
  const CHARSET_INFO * const session_charset= session->variables.character_set_results;
 
495
  const CHARSET_INFO * const session_charset= default_charset_info;
496
496
 
497
497
  if (flags & SEND_NUM_ROWS)
498
498
  {                             // Packet with number of elements
702
702
bool Protocol_text::store(const char *from, size_t length,
703
703
                          const CHARSET_INFO * const fromcs)
704
704
{
705
 
  const CHARSET_INFO * const tocs= this->session->variables.character_set_results;
 
705
  const CHARSET_INFO * const tocs= default_charset_info;
706
706
  return store_string_aux(from, length, fromcs, tocs);
707
707
}
708
708
 
772
772
    return store_null();
773
773
  char buff[MAX_FIELD_WIDTH];
774
774
  String str(buff,sizeof(buff), &my_charset_bin);
775
 
  const CHARSET_INFO * const tocs= this->session->variables.character_set_results;
 
775
  const CHARSET_INFO * const tocs= default_charset_info;
776
776
 
777
777
  field->val_str(&str);
778
778