← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Mark Atwood
  • Date: 2011-11-08 19:06:32 UTC
  • mfrom: (2445.1.22 rf)
  • Revision ID: me@mark.atwood.name-20111108190632-7pfvz4ggbolmlnnu
merge lp:~olafvdspek/drizzle/refactor10

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1555
1555
  int well_formed_error;
1556
1556
  uint32_t res= cs->cset->well_formed_len(*cs, str, max_char_length, &well_formed_error);
1557
1557
 
1558
 
  if (!well_formed_error &&  str.size() == res)
 
1558
  if (!well_formed_error && str.size() == res)
1559
1559
    return false;
1560
1560
 
1561
 
  if (!no_error)
 
1561
  if (not no_error)
1562
1562
    my_error(ER_WRONG_STRING_LENGTH, MYF(0), str.data(), err_msg, max_char_length);
1563
1563
  return true;
1564
1564
}