From: Alexander Nozdrin Date: April 15 2011 9:34am Subject: bzr commit into mysql-trunk branch (alexander.nozdrin:3321) WL#5787 List-Archive: http://lists.mysql.com/commits/135512 Message-Id: <201104150934.p3F9YA6T010214@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7613040248223851346==" --===============7613040248223851346== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-wl5787.2/ based on revid:alexander.nozdrin@stripped 3321 Alexander Nozdrin 2011-04-15 Preliminary patch for WL#5787 (IPv6-capable INET_ATON and INET_NTOA functions). The patch move the "#include " directive into my_net.h and remove that directrive from other files. modified: include/my_net.h libmysql/libmysql.c libmysqld/libmysqld.c sql-common/client.c sql/hostname.cc sql/mysqld.cc sql/sql_connect.cc vio/vio_priv.h === modified file 'include/my_net.h' --- a/include/my_net.h 2011-03-29 12:43:49 +0000 +++ b/include/my_net.h 2011-04-15 09:33:58 +0000 @@ -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 St, Fifth Floor, Boston, MA 02110-1301 USA */ /* This file is also used to make handling of sockets and ioctl() @@ -27,18 +27,23 @@ C_MODE_START #include + #ifdef HAVE_SYS_SOCKET_H #include #endif + #ifdef HAVE_NETINET_IN_H #include #endif + #ifdef HAVE_ARPA_INET_H #include #endif + #ifdef HAVE_POLL #include #endif + #ifdef HAVE_SYS_IOCTL_H #include #endif @@ -47,9 +52,9 @@ C_MODE_START #include #include #include -#if !defined(alpha_linux_port) -#include -#endif +# if !defined(alpha_linux_port) +# include +# endif #endif #if defined(__WIN__) @@ -61,7 +66,8 @@ C_MODE_START #define SD_BOTH 0x02 */ #define SHUT_RDWR 0x02 - +#else +#include /* getaddrinfo() & co */ #endif /* === modified file 'libmysql/libmysql.c' --- a/libmysql/libmysql.c 2011-03-08 19:14:42 +0000 +++ b/libmysql/libmysql.c 2011-04-15 09:33:58 +0000 @@ -1,11 +1,8 @@ -/* Copyright (C) 2000-2004 MySQL AB +/* Copyright (c) 2000, 2011, 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 - the Free Software Foundation. - - There are special exceptions to the terms and conditions of the GPL as it - is applied to this software. + the Free Software Foundation; version 2 of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */ #include #include @@ -34,10 +31,6 @@ #include #endif #if !defined(__WIN__) -#include -#include -#include -#include #ifdef HAVE_SELECT_H #include #endif === modified file 'libmysqld/libmysqld.c' --- a/libmysqld/libmysqld.c 2010-08-09 08:32:50 +0000 +++ b/libmysqld/libmysqld.c 2011-04-15 09:33:58 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2011, 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 @@ -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 St, Fifth Floor, Boston, MA 02110-1301 USA */ #include #include @@ -33,10 +33,6 @@ #include #endif #if !defined(__WIN__) -#include -#include -#include -#include #ifdef HAVE_SELECT_H # include #endif === modified file 'sql-common/client.c' --- a/sql-common/client.c 2011-03-17 09:43:28 +0000 +++ b/sql-common/client.c 2011-04-15 09:33:58 +0000 @@ -37,10 +37,6 @@ #include "mysql.h" -#ifndef __WIN__ -#include -#endif - /* Remove client convenience wrappers */ #undef max_allowed_packet #undef net_buffer_length @@ -61,6 +57,7 @@ my_bool net_flush(NET *net); #else /*EMBEDDED_LIBRARY*/ #define CLI_MYSQL_REAL_CONNECT STDCALL mysql_real_connect #endif /*EMBEDDED_LIBRARY*/ + #include #include #include @@ -69,6 +66,7 @@ my_bool net_flush(NET *net); #include "mysqld_error.h" #include "errmsg.h" #include + #if !defined(__WIN__) #include /* because of signal() */ #endif /* !defined(__WIN__) */ @@ -76,21 +74,20 @@ my_bool net_flush(NET *net); #include #include #include + #ifdef HAVE_PWD_H #include #endif + #if !defined(__WIN__) -#include -#include -#include -#include #ifdef HAVE_SELECT_H # include #endif #ifdef HAVE_SYS_SELECT_H -#include +# include #endif #endif /* !defined(__WIN__) */ + #ifdef HAVE_SYS_UN_H # include #endif @@ -111,6 +108,7 @@ my_bool net_flush(NET *net); #include "client_settings.h" #include #include + #define native_password_plugin_name "mysql_native_password" #define old_password_plugin_name "mysql_old_password" === modified file 'sql/hostname.cc' --- a/sql/hostname.cc 2011-04-08 10:32:40 +0000 +++ b/sql/hostname.cc 2011-04-15 09:33:58 +0000 @@ -26,10 +26,6 @@ #include "sql_priv.h" #include "hostname.h" -#include "my_global.h" -#ifndef __WIN__ -#include // getservbyname, servent -#endif #include "hash_filo.h" #include #include "log.h" // sql_print_warning, === modified file 'sql/mysqld.cc' --- a/sql/mysqld.cc 2011-04-13 19:16:45 +0000 +++ b/sql/mysqld.cc 2011-04-15 09:33:58 +0000 @@ -17,9 +17,6 @@ #include "sql_priv.h" #include "unireg.h" #include -#ifndef __WIN__ -#include // getservbyname, servent -#endif #include "sql_parse.h" // test_if_data_home_dir #include "sql_cache.h" // query_cache, query_cache_* #include "sql_locale.h" // MY_LOCALES, my_locales, my_locale_by_name === modified file 'sql/sql_connect.cc' --- a/sql/sql_connect.cc 2011-03-15 15:49:50 +0000 +++ b/sql/sql_connect.cc 2011-04-15 09:33:58 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2011, 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 @@ -20,9 +20,6 @@ #include "my_global.h" #include "sql_priv.h" -#ifndef __WIN__ -#include // getservbyname, servent -#endif #include "sql_audit.h" #include "sql_connect.h" #include "my_global.h" === modified file 'vio/vio_priv.h' --- a/vio/vio_priv.h 2010-06-07 14:01:39 +0000 +++ b/vio/vio_priv.h 2011-04-15 09:33:58 +0000 @@ -1,7 +1,7 @@ #ifndef VIO_PRIV_INCLUDED #define VIO_PRIV_INCLUDED -/* Copyright (C) 2003 MySQL AB +/* Copyright (c) 2003, 2011, 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 @@ -14,7 +14,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 St, Fifth Floor, Boston, MA 02110-1301 USA */ /* Structures and functions private to the vio package */ @@ -25,11 +25,6 @@ #include #include -#ifndef __WIN__ -#include -#include -#endif - #ifdef _WIN32 void vio_win32_timeout(Vio *vio, uint which, uint timeout); #endif --===============7613040248223851346== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/alexander.nozdrin@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: alexander.nozdrin@stripped\ # 838p6rdv9fpoh9dp # target_branch: file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-\ # wl5787.2/ # testament_sha1: c1ed9850b14974e975f3b8e473cc0dffa478b316 # timestamp: 2011-04-15 13:34:06 +0400 # source_branch: file:///home/alik/MySQL/bzr/00/wl5787/mysql-trunk-\ # wl5787/ # base_revision_id: alexander.nozdrin@stripped\ # io2etb9tn2knwl73 # # Begin bundle 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 --===============7613040248223851346==--