← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/strfunc.cc

Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/strfunc.cc
38
38
 
39
39
static const char field_separator=',';
40
40
 
41
 
ulonglong find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs,
 
41
uint64_t find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs,
42
42
                   char **err_pos, uint *err_len, bool *set_warning)
43
43
{
44
44
  CHARSET_INFO *strip= cs ? cs : &my_charset_latin1;
45
45
  const char *end= str + strip->cset->lengthsp(strip, str, length);
46
 
  ulonglong found= 0;
 
46
  uint64_t found= 0;
47
47
  *err_pos= 0;                  // No error yet
48
48
  if (str != end)
49
49
  {
78
78
        *set_warning= 1;
79
79
      }
80
80
      else
81
 
        found|= ((longlong) 1 << (find - 1));
 
81
        found|= ((int64_t) 1 << (find - 1));
82
82
      if (pos >= end)
83
83
        break;
84
84
      start= pos + mblen;