← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item.cc

  • Committer: Monty Taylor
  • Date: 2009-06-08 18:19:53 UTC
  • mto: This revision was merged to the branch mainline in revision 1060.
  • Revision ID: mordred@inaugust.com-20090608181953-9n1u3im0kezu2aoy
Removed copy_and_convert.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item.cc
498
498
                            str + length - orig_len);
499
499
    }
500
500
  }
501
 
  if (!my_charset_same(cs, system_charset_info))
502
 
  {
503
 
    size_t res_length;
504
 
    name= sql_strmake_with_convert(str, name_length= length, cs,
505
 
                                   length, system_charset_info,
506
 
                                   &res_length);
507
 
  }
508
 
  else
509
 
      name= sql_strmake(str, length);
 
501
  name= sql_strmake(str, length);
510
502
}
511
503
 
512
504