summaryrefslogtreecommitdiff
path: root/sql/sql_help.cc
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-10-20 17:02:59 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-10-20 17:02:59 -0200
commit6997cff45975168618f387e380a3ce62ac93bc8d (patch)
tree8b9671ed7e4c19f1f97d8f8347422f15f2432a03 /sql/sql_help.cc
parentdc0412d5899538c89a2922406168a5e70ddbceb5 (diff)
parent3e9c52250a3ab6664c53ea6b3923acfbe8e09e4e (diff)
downloadmariadb-git-6997cff45975168618f387e380a3ce62ac93bc8d.tar.gz
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'sql/sql_help.cc')
-rw-r--r--sql/sql_help.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index 4e3df950134..7d106fbe936 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -699,7 +699,7 @@ bool mysqld_help(THD *thd, const char *mask)
if (count_topics == 0)
{
- int key_id;
+ int UNINIT_VAR(key_id);
if (!(select=
prepare_select_for_name(thd,mask,mlen,tables,tables[3].table,
used_fields[help_keyword_name].field,