diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-09 09:28:51 -0300 |
| commit | 1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20 (patch) | |
| tree | 8edee282fc8a225a291cd9be2e44e38709e31b1a /sql/sql_yacc.yy | |
| parent | 024dba64b64f395151f6b95650e8ee69a1591428 (diff) | |
| parent | 11fae04527098cb6c266eae41188504bd22a5b52 (diff) | |
| download | mariadb-git-1c924a165259dc8ffb9c1cdcdb1f0d43876bcb20.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 1c673f4ca42..3ba67368565 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1932,11 +1932,9 @@ master_def: { const char format[]= "%d seconds"; char buf[4*sizeof(SLAVE_MAX_HEARTBEAT_PERIOD) + sizeof(format)]; - my_sprintf(buf, (buf, format, SLAVE_MAX_HEARTBEAT_PERIOD)); + sprintf(buf, format, SLAVE_MAX_HEARTBEAT_PERIOD); my_error(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE, - MYF(0), - " is negative or exceeds the maximum ", - buf); + MYF(0), " is negative or exceeds the maximum ", buf); MYSQL_YYABORT; } if (Lex->mi.heartbeat_period > slave_net_timeout) |