Commit 5da306b5 authored by joerg@mysql.com's avatar joerg@mysql.com
Browse files

extra/comp_err.c : Fix a merge error.

parent fa91e05b

extra/comp_err.c

+2 −1
Original line number Diff line number Diff line
@@ -542,6 +542,7 @@ static char *parse_default_language(char *str) 
    fprintf(stderr,

	    "Unexpected EOL: No short language name after the keyword\n");

    DBUG_RETURN(0);

  }



  /* reading the short language tag */

  if (!(slang= get_word(&str)))