diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-15 18:24:15 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-15 18:24:15 +0100 |
| commit | d7304375e5e0ce30979c2b92e70eb0effaa30a25 (patch) | |
| tree | bb9d05f40e948d4b027f4da9c007c433a16fa1a6 /sql-common | |
| parent | cd29dc98216d822ad701d604b3eda886e1db2aaa (diff) | |
| parent | e0f3a0fae98bea144b962ef8dbbe62e0935aebb1 (diff) | |
| download | mariadb-git-d7304375e5e0ce30979c2b92e70eb0effaa30a25.tar.gz | |
mysql-5.1.73 merge
Diffstat (limited to 'sql-common')
| -rw-r--r-- | sql-common/Makefile.am | 2 | ||||
| -rw-r--r-- | sql-common/client.c | 3 | ||||
| -rw-r--r-- | sql-common/pack.c | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sql-common/Makefile.am b/sql-common/Makefile.am index 3193efee754..1a4e2e018f2 100644 --- a/sql-common/Makefile.am +++ b/sql-common/Makefile.am @@ -11,7 +11,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA ## Process this file with automake to create Makefile.in EXTRA_DIST = client.c pack.c my_time.c my_user.c diff --git a/sql-common/client.c b/sql-common/client.c index 55c73eb382c..af493de0612 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2003, 2012, Oracle and/or its affiliates. + Copyright (c) 2003, 2013, Oracle and/or its affiliates. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3202,6 +3202,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,MYF(MY_ALLOW_ZERO_PTR)); mysql->options.client_ip= my_strdup(arg, MYF(MY_WME)); break; case MYSQL_SECURE_AUTH: diff --git a/sql-common/pack.c b/sql-common/pack.c index 7ff89471b45..f3c5b049b2c 100644 --- a/sql-common/pack.c +++ b/sql-common/pack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000-2003, 2007 MySQL AB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -11,7 +11,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ #include <my_global.h> #include <mysql_com.h> |