extra/comp_err.c : Fix a merge error.

5da306b5 · joerg@mysql.com · fa91e05b · 5da306b5
Commit 5da306b5 authored Jan 16, 2006 by joerg@mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

extra/comp_err.c extra/comp_err.c +2 -1

No files found.
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -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)))