typo (or bad merge?) fixed

dd733967 · Sergei Golubchik · c96b82f6 · dd733967
Commit dd733967 authored Oct 06, 2013 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_yacc.yy sql/sql_yacc.yy +1 -1

No files found.
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -6550,7 +6550,7 @@ unicode:
        | UNICODE_SYM BINARY
          {
            if (!(Lex->charset= mysqld_collation_get_by_name("ucs2_bin")))
-              my_error(ER_UNKNOWN_COLLATION, MYF(0), "ucs2_bin");
+              MYSQL_YYABORT;
          }
        | BINARY UNICODE_SYM
          {