← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • 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/sql_yacc.yy
1907
1907
collation_name:
1908
1908
          ident_or_text
1909
1909
          {
1910
 
            if (!($$=get_charset_by_name($1.str,MYF(0))))
 
1910
            if (!($$=get_charset_by_name($1.str)))
1911
1911
            {
1912
1912
              my_error(ER_UNKNOWN_COLLATION, MYF(0), $1.str);
1913
1913
              DRIZZLE_YYABORT;