← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/set_collation.cc

  • Committer: Monty Taylor
  • Date: 2009-02-09 20:45:49 UTC
  • mfrom: (864 drizzle)
  • mto: This revision was merged to the branch mainline in revision 865.
  • Revision ID: mordred@inaugust.com-20090209204549-hcaonir5zwelh0t9
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/set_collation.cc
39
39
  String tmp, *str= args[1]->val_str(&tmp);
40
40
  colname= str->c_ptr();
41
41
  if (colname == binary_keyword)
42
 
    set_collation= get_charset_by_csname(args[0]->collation.collation->csname,
43
 
                                         MY_CS_BINSORT,MYF(0));
 
42
    set_collation= get_charset_by_csname(args[0]->collation.collation->csname, MY_CS_BINSORT);
44
43
  else
45
44
  {
46
 
    if (!(set_collation= get_charset_by_name(colname,MYF(0))))
 
45
    if (!(set_collation= get_charset_by_name(colname)))
47
46
    {
48
47
      my_error(ER_UNKNOWN_COLLATION, MYF(0), colname);
49
48
      return;