diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-01-22 15:29:36 +0100 |
commit | 37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6 (patch) | |
tree | 6bd2508d867303d8830aab0f246cd61a7ec5a835 /sql-common | |
parent | e8f6f402922295ec36aab42976f3e494455407d4 (diff) | |
parent | 5caddbfd5b4a7ec377f3d40a5830436e0e6e993b (diff) | |
download | mariadb-git-37d240ecf9213a29d6a0a236ebeb1e72c0b43ce6.tar.gz |
MySQL-5.5.35 merge
Diffstat (limited to 'sql-common')
-rw-r--r-- | sql-common/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql-common/client.c b/sql-common/client.c index 19d09e1bcfb..913dab75fda 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -4201,6 +4201,7 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg) mysql->options.methods_to_use= option; break; case MYSQL_SET_CLIENT_IP: + my_free(mysql->options.client_ip); mysql->options.client_ip= my_strdup(arg, MYF(MY_WME)); break; case MYSQL_SECURE_AUTH: |