diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-04-30 22:50:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-05-05 01:05:05 +0200 |
| commit | 09464ddec49355a90fdd32abe2daaa1dff8e1106 (patch) | |
| tree | 6d338e7ba3714c58674aee39d8471468dfabff42 /sql/share | |
| parent | bf9404d3a493ba122bc46c0fadf33d8cda9d0d3f (diff) | |
| download | mariadb-git-09464ddec49355a90fdd32abe2daaa1dff8e1106.tar.gz | |
small parser cleanup
* my_yyabort_error() helper
* s/lex->thd/thd/
* remove 'else' after MYSQL_YYABORT (for consistency,
95% of the parser did not use 'else' in this case)
* simplify ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/errmsg-utf8.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 1bd87e0b393..c05ffb4866a 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -6136,7 +6136,7 @@ ER_SLAVE_HEARTBEAT_FAILURE eng "Unexpected master's heartbeat data: %s" ger "Unerwartete Daten vom Heartbeat des Masters: %s" ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE - eng "The requested value for the heartbeat period is either negative or exceeds the maximum allowed (%s seconds)." + eng "The requested value for the heartbeat period is either negative or exceeds the maximum allowed (%u seconds)." ER_UNUSED_14 eng "You should never see it" ER_CONFLICT_FN_PARSE_ERROR |