← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/time.cc

  • Committer: Monty Taylor
  • Date: 2008-09-13 20:24:20 UTC
  • mfrom: (383.1.35 drizzle)
  • Revision ID: monty@inaugust.com-20080913202420-lkj76ewbabl8ljvp
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/time.cc
443
443
      allow_separator= 0;                       // Don't allow two separators
444
444
      separators++;
445
445
      /* Store in separator_map which parts are punct characters */
446
 
      if (my_ispunct(&my_charset_latin1, *ptr))
 
446
      if (my_ispunct(&my_charset_utf8_general_ci, *ptr))
447
447
        separator_map|= (ulong) 1 << (offset-1);
448
 
      else if (!my_isspace(&my_charset_latin1, *ptr))
 
448
      else if (!my_isspace(&my_charset_utf8_general_ci, *ptr))
449
449
        return 1;
450
450
    }
451
451
  }
720
720
{
721
721
  char warn_buff[DRIZZLE_ERRMSG_SIZE];
722
722
  const char *type_str;
723
 
  CHARSET_INFO *cs= &my_charset_latin1;
 
723
  CHARSET_INFO *cs= &my_charset_utf8_general_ci;
724
724
  char buff[128];
725
725
  String str(buff,(uint32_t) sizeof(buff), system_charset_info);
726
726
  str.copy(str_val, str_length, system_charset_info);