← 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-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/sql_parse.cc
1554
1554
                              bool no_error)
1555
1555
{
1556
1556
  int well_formed_error;
1557
 
  uint32_t res= cs->cset->well_formed_len(cs, str.begin(), str.end(), max_char_length, &well_formed_error);
 
1557
  uint32_t res= cs->cset->well_formed_len(*cs, str, max_char_length, &well_formed_error);
1558
1558
 
1559
1559
  if (!well_formed_error &&  str.size() == res)
1560
1560
    return false;
1576
1576
  const charset_info_st * const cs= &my_charset_utf8mb4_general_ci;
1577
1577
 
1578
1578
  int well_formed_error;
1579
 
  uint32_t res= cs->cset->well_formed_len(cs, str.begin(), str.end(), max_char_length, &well_formed_error);
 
1579
  uint32_t res= cs->cset->well_formed_len(*cs, str, max_char_length, &well_formed_error);
1580
1580
 
1581
1581
  if (well_formed_error)
1582
1582
  {