← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

Merge in Monty's rename patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
155
155
namespace drizzled
156
156
{
157
157
 
158
 
#define mysqld_charset &my_charset_utf8_general_ci
159
158
inline void setup_fpu()
160
159
{
161
160
#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H)
563
562
  {
564
563
    // Allow a numeric uid to be used
565
564
    const char *pos;
566
 
    for (pos= user; my_isdigit(mysqld_charset,*pos); pos++) ;
 
565
    for (pos= user; my_isdigit(&my_charset_utf8_general_ci,*pos); pos++) ;
567
566
    if (*pos)                                   // Not numeric id
568
567
      goto err;
569
568
    if (!(tmp_user_info= getpwuid(atoi(user))))