← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/strfunc.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/strfunc.cc
45
45
static const char field_separator=',';
46
46
 
47
47
uint64_t TYPELIB::find_set(const char *str, uint32_t length,
48
 
                  const CHARSET_INFO * const cs,
 
48
                  const charset_info_st * const cs,
49
49
                  char **err_pos, uint32_t *err_len, bool *set_warning) const
50
50
{
51
 
  const CHARSET_INFO * const strip= cs ? cs : &my_charset_utf8_general_ci;
 
51
  const charset_info_st * const strip= cs ? cs : &my_charset_utf8_general_ci;
52
52
  const char *end= str + strip->cset->lengthsp(strip, str, length);
53
53
  uint64_t found= 0;
54
54
  *err_pos= 0;                  // No error yet
138
138
    >0  Offset+1 in typelib for matched string
139
139
*/
140
140
 
141
 
uint32_t TYPELIB::find_type2(const char *x, uint32_t length, const CHARSET_INFO *cs) const
 
141
uint32_t TYPELIB::find_type2(const char *x, uint32_t length, const charset_info_st *cs) const
142
142
{
143
143
  if (!count)
144
144
    return 0;