summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-11-10 10:31:33 +0300
committerAlexander Nozdrin <alik@sun.com>2009-11-10 10:31:33 +0300
commitb712dce3d57335d3957afe94d1c3200880aebe99 (patch)
treeb118b585c21710f0fef58c3d009fdd39a4578791 /sql-common
parent49bb8cba8e964bec96c1ca9cdc486b3a468dd822 (diff)
parentd476bbb0becb27d7d3cb1fc5cc0ac4d401622893 (diff)
downloadmariadb-git-b712dce3d57335d3957afe94d1c3200880aebe99.tar.gz
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 537a992e770..5114b645818 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2479,7 +2479,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
for (i= 0; status && hp->h_addr_list[i]; i++)
{
- IF_DBUG(char ipaddr[18];)
+ char ipaddr[18] __attribute__((unused));
memcpy(&sock_addr.sin_addr, hp->h_addr_list[i],
min(sizeof(sock_addr.sin_addr), (size_t) hp->h_length));
DBUG_PRINT("info",("Trying %s...",