From 053d7e775c3b369debbb71e26244fc4c76688f48 Mon Sep 17 00:00:00 2001 From: Murthy Narkedimilli Date: Mon, 25 Feb 2013 15:26:00 +0100 Subject: Updated/added copyright headers. --- sql-common/pack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql-common') diff --git a/sql-common/pack.c b/sql-common/pack.c index 7ff89471b45..ffaf6a4d67d 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 -- cgit v1.2.1 From fe85f546405b16259ab97721610c9b5a64c53e22 Mon Sep 17 00:00:00 2001 From: Murthy Narkedimilli Date: Tue, 19 Mar 2013 13:29:12 +0100 Subject: Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER --- sql-common/Makefile.am | 2 +- sql-common/pack.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sql-common') diff --git a/sql-common/Makefile.am b/sql-common/Makefile.am index 614ccffde9d..fef9b3a6db7 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/pack.c b/sql-common/pack.c index ffaf6a4d67d..f3c5b049b2c 100644 --- a/sql-common/pack.c +++ b/sql-common/pack.c @@ -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 #include -- cgit v1.2.1 From 28959a5661d14de784ab8b369613511727200811 Mon Sep 17 00:00:00 2001 From: Igor Solodovnikov Date: Fri, 30 Aug 2013 20:05:37 +0300 Subject: Bug #17297012 MEMORY LEAK IN MYSQL_OPTIONS WHILE CALLING WITH OPTION MYSQL_SET_CLIENT_IP Memory Leak in mysql_options() was caused by missing call to my_free() in MYSQL_SET_CLIENT_IP branch. Fixed by adding my_free() to cleanup mysql->options.client_ip value before assigning new value. --- sql-common/client.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql-common') diff --git a/sql-common/client.c b/sql-common/client.c index 51911d913c7..7ee0eabe0ef 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -1,5 +1,5 @@ /* - Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. 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 @@ -3167,6 +3167,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: -- cgit v1.2.1