← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/ctype-simple.cc

Merged remove-dead-find_field_in_table_sef into remove-dead-Item-save_in_field_no_warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/ctype-simple.cc
27
27
 
28
28
using namespace std;
29
29
 
 
30
namespace drizzled
 
31
{
30
32
 
31
33
/*
32
34
  Returns the number of bytes required for strnxfrm().
564
566
  if (length == INT32_MAX)
565
567
    length= 65535;                          /* Should be big enough */
566
568
  *end= str + length;
567
 
  return my_strtod(str, end, err);
 
569
  return internal::my_strtod(str, end, err);
568
570
}
569
571
 
570
572
 
901
903
                        const char *ptr, size_t length)
902
904
{
903
905
  const char *end;
904
 
  end= (const char *) skip_trailing_space((const unsigned char *)ptr, length);
 
906
  end= (const char *) internal::skip_trailing_space((const unsigned char *)ptr, length);
905
907
  return (size_t) (end-ptr);
906
908
}
907
909
 
1103
1105
int64_t my_strtoll10_8bit(const CHARSET_INFO * const,
1104
1106
                          const char *nptr, char **endptr, int *error)
1105
1107
{
1106
 
  return my_strtoll10(nptr, endptr, error);
 
1108
  return internal::my_strtoll10(nptr, endptr, error);
1107
1109
}
1108
1110
 
1109
1111
 
1634
1636
  my_strxfrm_desc_and_reverse(str, frmend, flags, level);
1635
1637
  return frmend - str;
1636
1638
}
 
1639
 
 
1640
} /* namespace drizzled */