← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Monty Taylor
  • Date: 2009-07-09 00:04:44 UTC
  • mto: (1093.1.9 captain)
  • mto: This revision was merged to the branch mainline in revision 1097.
  • Revision ID: mordred@inaugust.com-20090709000444-1jf6qw4gvyhdab1a
Got rid of #ifdef have utf8 stuff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
1725
1725
 
1726
1726
  for (; pos != end ; pos++)
1727
1727
  {
1728
 
#if defined(USE_MB)
1729
1728
    uint32_t mblen;
1730
1729
    if (use_mb(default_charset_info) &&
1731
1730
        (mblen= my_ismbchar(default_charset_info, pos, end)))
1736
1735
        break;
1737
1736
      continue;
1738
1737
    }
1739
 
#endif
1740
1738
 
1741
1739
    switch (*pos) {
1742
1740
    case 0:                             /* Must be escaped for 'mysql' */
1899
1897
 
1900
1898
  while (*name)
1901
1899
  {
1902
 
#if defined(USE_MB)
1903
1900
    last_char_is_space= my_isspace(system_charset_info, *name);
1904
1901
    if (use_mb(system_charset_info))
1905
1902
    {
1914
1911
        continue;
1915
1912
      }
1916
1913
    }
1917
 
#else
1918
 
    last_char_is_space= *name==' ';
1919
 
#endif
1920
1914
    /*
1921
1915
      NAMES_SEP_CHAR is used in FRM format to separate SET and ENUM values.
1922
1916
      It is defined as 0xFF, which is a not valid byte in utf8.