summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-09 09:28:51 -0300
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2010-07-09 09:28:51 -0300
commite1f748c0bd7e347dbefb831d64755d834845d15b (patch)
tree8edee282fc8a225a291cd9be2e44e38709e31b1a /sql/mysqld.cc
parent80935b8659411177bc3fca4e0eb9f7747577eb1d (diff)
parented9ffc6b09a13197f3aadaf89c1dd3accee2dfd1 (diff)
downloadmariadb-git-e1f748c0bd7e347dbefb831d64755d834845d15b.tar.gz
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index d1bf387cc5f..1e5c3f43f5e 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -6439,7 +6439,7 @@ static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff)
{
var->type= SHOW_CHAR;
var->value= buff;
- my_sprintf(buff, (buff, "%.3f",active_mi->heartbeat_period));
+ sprintf(buff, "%.3f", active_mi->heartbeat_period);
}
else
var->type= SHOW_UNDEF;