summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index b299ab96b1d..92324c6a073 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3040,9 +3040,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
init_pager();
char last_char= 0;
- int num_name= 0, num_cat= 0;
- LINT_INIT(num_name);
- LINT_INIT(num_cat);
+ int UNINIT_VAR(num_name), UNINIT_VAR(num_cat);
if (num_fields == 2)
{
@@ -3179,7 +3177,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
}
/* Remove garbage for nicer messages */
- LINT_INIT(buff[0]);
+ LINT_INIT_STRUCT(buff[0]);
remove_cntrl(*buffer);
if (buffer->is_empty())
@@ -4698,8 +4696,7 @@ com_status(String *buffer __attribute__((unused)),
const char *status_str;
char buff[40];
ulonglong id;
- MYSQL_RES *result;
- LINT_INIT(result);
+ MYSQL_RES *UNINIT_VAR(result);
if (mysql_real_query_for_lazy(
C_STRING_WITH_LEN("select DATABASE(), USER() limit 1")))
@@ -5258,8 +5255,7 @@ static void init_username()
my_free(full_username);
my_free(part_username);
- MYSQL_RES *result;
- LINT_INIT(result);
+ MYSQL_RES *UNINIT_VAR(result);
if (!mysql_query(&mysql,"select USER()") &&
(result=mysql_use_result(&mysql)))
{