← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Mark Atwood
  • Date: 2011-10-25 19:08:35 UTC
  • mfrom: (2445.1.6 rf)
  • Revision ID: me@mark.atwood.name-20111025190835-g21cn911ypxjd5fi
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
102
102
 
103
103
bool Key_part_spec::operator==(const Key_part_spec& other) const
104
104
{
105
 
  return length == other.length &&
106
 
         field_name.size() == other.field_name.size() &&
107
 
    !my_strcasecmp(system_charset_info, field_name.data(), other.field_name.data());
 
105
  return length == other.length 
 
106
    && field_name.size() == other.field_name.size()
 
107
    && not my_strcasecmp(system_charset_info, field_name.data(), other.field_name.data());
108
108
}
109
109
 
110
110
Open_tables_state::Open_tables_state(Session& session, uint64_t version_arg) :
710
710
void Session::readAndStoreQuery(const char *in_packet, uint32_t in_packet_length)
711
711
{
712
712
  /* Remove garbage at start and end of query */
713
 
  while (in_packet_length > 0 && my_isspace(charset(), in_packet[0]))
 
713
  while (in_packet_length > 0 && charset()->isspace(in_packet[0]))
714
714
  {
715
715
    in_packet++;
716
716
    in_packet_length--;
717
717
  }
718
718
  const char *pos= in_packet + in_packet_length; /* Point at end null */
719
 
  while (in_packet_length > 0 && (pos[-1] == ';' || my_isspace(charset() ,pos[-1])))
 
719
  while (in_packet_length > 0 && (pos[-1] == ';' || charset()->isspace(pos[-1])))
720
720
  {
721
721
    pos--;
722
722
    in_packet_length--;
1163
1163
        const charset_info_st * const res_charset= res->charset();
1164
1164
        const charset_info_st * const character_set_client= default_charset_info;
1165
1165
 
1166
 
        bool check_second_byte= (res_charset == &my_charset_bin) &&
1167
 
          character_set_client->
1168
 
          escape_with_backslash_is_dangerous;
1169
 
        assert(character_set_client->mbmaxlen == 2 ||
1170
 
               !character_set_client->escape_with_backslash_is_dangerous);
 
1166
        bool check_second_byte= false;
 
1167
        assert(character_set_client->mbmaxlen == 2 || not false);
1171
1168
        for (start=pos=(char*) res->ptr(),end=pos+used_length ;
1172
1169
             pos != end ;
1173
1170
             pos++)