← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item/string.h

  • Committer: Olaf van der Spek
  • Date: 2011-07-04 14:32:29 UTC
  • mto: This revision was merged to the branch mainline in revision 2367.
  • Revision ID: olafvdspek@gmail.com-20110704143229-70ssw23smubzdcru
Remove String::set_or_copy_aligned()

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item/string.h
32
32
              const charset_info_st * const cs, Derivation dv= DERIVATION_COERCIBLE)
33
33
    : m_cs_specified(false)
34
34
  {
35
 
    str_value.set_or_copy_aligned(str, length, cs);
 
35
    assert(not (length % cs->mbminlen));
 
36
    str_value.set(str, length, cs);
36
37
    collation.set(cs, dv);
37
38
    /*
38
39
      We have to have a different max_length than 'length' here to
61
62
              const charset_info_st * const cs, Derivation dv= DERIVATION_COERCIBLE)
62
63
    : m_cs_specified(false)
63
64
  {
64
 
    str_value.set_or_copy_aligned(str, length, cs);
 
65
    assert(not (length % cs->mbminlen));
 
66
    str_value.set(str, length, cs);
65
67
    collation.set(cs, dv);
66
68
    max_length= str_value.numchars()*cs->mbmaxlen;
67
69
    set_name(name_par, 0, cs);