diff options
| author | unknown <paul@ice.snake.net> | 2004-06-15 23:23:56 -0500 |
|---|---|---|
| committer | unknown <paul@ice.snake.net> | 2004-06-15 23:23:56 -0500 |
| commit | fe2211b6c939d4ef693cd9a023f81526b372c446 (patch) | |
| tree | 85f82f6a5b66d122df58d59393b9ab579b6151a7 /sql/share/english | |
| parent | 44d2934f0bf11d86ab7491142a4e5ca9d16f3259 (diff) | |
| download | mariadb-git-fe2211b6c939d4ef693cd9a023f81526b372c446.tar.gz | |
Language/consistency edits to error messages.
Diffstat (limited to 'sql/share/english')
| -rw-r--r-- | sql/share/english/errmsg.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt index 1e948fd0e45..0939537a73b 100644 --- a/sql/share/english/errmsg.txt +++ b/sql/share/english/errmsg.txt @@ -311,10 +311,10 @@ character-set=latin1 "SELECT in a stored procedure must have INTO" "RETURN is only allowed in a FUNCTION" "Statements like SELECT, INSERT, UPDATE (and others) are not allowed in a FUNCTION" -"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been ignored." -"The update log is deprecated and replaced by the binary log. SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN." +"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored" +"The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN" "Query execution was interrupted" -"Wrong number of arguments for %s %s, expected %u, got %u" +"Incorrect number of arguments for %s %s; expected %u, got %u" "Undefined CONDITION: %s" "No RETURN found in FUNCTION %s" "FUNCTION %s ended without RETURN" @@ -338,6 +338,6 @@ character-set=latin1 "Case not found for CASE statement" "Configuration file '%-.64s' is too big" "Malformed file type header in file '%-.64s'" -"Unexpected end of file during parsing comment '%-.64s'" +"Unexpected end of file while parsing comment '%-.64s'" "Error during parsing parameter '%-.64s' (line: '%-.64s')" -"Unexpected end of file during skipping unknown parameter '%-.64s'" +"Unexpected end of file while skipping unknown parameter '%-.64s'" |