← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Mark Atwood
  • Date: 2011-10-25 19:08:35 UTC
  • mfrom: (2445.1.6 rf)
  • Revision ID: me@mark.atwood.name-20111025190835-g21cn911ypxjd5fi
merge lp:~olafvdspek/drizzle/refactor7

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
413
413
  if (cs->ctype)
414
414
  {
415
415
    uint32_t orig_len= length;
416
 
    while (length && not my_isgraph(cs, *str))
 
416
    while (length && not cs->isgraph(*str))
417
417
    {
418
418
      /* Fix problem with yacc */
419
419
      length--;
1007
1007
  tmp_field->table_name= "";
1008
1008
  tmp_field->col_name= name;
1009
1009
  tmp_field->charsetnr= collation.collation->number;
1010
 
  tmp_field->flags= (maybe_null ? 0 : NOT_NULL_FLAG) | (my_binary_compare(collation.collation) ? BINARY_FLAG : 0);
 
1010
  tmp_field->flags= (maybe_null ? 0 : NOT_NULL_FLAG) | (collation.collation->binary_compare() ? BINARY_FLAG : 0);
1011
1011
  tmp_field->type= field_type_arg;
1012
1012
  tmp_field->length= max_length;
1013
1013
  tmp_field->decimals= decimals;