← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/catalog.cc

  • Committer: Mark Atwood
  • Date: 2011-10-21 14:25:19 UTC
  • mfrom: (2440.2.28 rf)
  • Revision ID: me@mark.atwood.name-20111021142519-bqnyqrkthibv70rc
Tags: 2011.10.28
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/catalog.cc
69
69
    return false;
70
70
  const charset_info_st& cs= my_charset_utf8mb4_general_ci;
71
71
  int well_formed_error;
72
 
  uint32_t res= cs.cset->well_formed_len(&cs, _name.c_str(), _name.c_str() + _name.length(), NAME_CHAR_LEN, &well_formed_error);
 
72
  uint32_t res= cs.cset->well_formed_len(cs, _name, NAME_CHAR_LEN, &well_formed_error);
73
73
  if (well_formed_error)
74
74
  {
75
75
    my_error(ER_INVALID_CHARACTER_STRING, MYF(0), "identifier", _name.c_str());