diff options
author | unknown <knielsen@knielsen-hq.org> | 2013-03-27 08:19:48 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2013-03-27 08:19:48 +0100 |
commit | 466ceba6f09e83d7d176c750377da0d1c6cd93dd (patch) | |
tree | 7add2798ff8719972b40bdce947929a5b75038f1 /sql | |
parent | f66e3474a82e0b44c4738f8c722305bb1a65cee7 (diff) | |
download | mariadb-git-466ceba6f09e83d7d176c750377da0d1c6cd93dd.tar.gz |
MDEV-26: Global transaction ID.
Silence compiler warning.
Diffstat (limited to 'sql')
-rw-r--r-- | sql/mysqld.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 6cfe402e40e..97cc5ed85aa 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6682,6 +6682,7 @@ static int show_slave_running(THD *thd, SHOW_VAR *var, char *buff) { Master_info *mi; bool tmp; + LINT_INIT(tmp); var->type= SHOW_MY_BOOL; var->value= buff; @@ -6707,6 +6708,7 @@ static int show_slave_received_heartbeats(THD *thd, SHOW_VAR *var, char *buff) { Master_info *mi; longlong tmp; + LINT_INIT(tmp); var->type= SHOW_LONGLONG; var->value= buff; @@ -6730,7 +6732,8 @@ static int show_slave_received_heartbeats(THD *thd, SHOW_VAR *var, char *buff) static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff) { Master_info *mi; - float heartbeat_period; + float tmp; + LINT_INIT(tmp); var->type= SHOW_CHAR; var->value= buff; @@ -6740,11 +6743,11 @@ static int show_heartbeat_period(THD *thd, SHOW_VAR *var, char *buff) get_master_info(&thd->variables.default_master_connection, MYSQL_ERROR::WARN_LEVEL_NOTE); if (mi) - heartbeat_period= mi->heartbeat_period; + tmp= mi->heartbeat_period; mysql_mutex_unlock(&LOCK_active_mi); mysql_mutex_lock(&LOCK_status); if (mi) - sprintf(buff, "%.3f", heartbeat_period); + sprintf(buff, "%.3f", tmp); else var->type= SHOW_UNDEF; return 0; |