diff --git a/include/Makefile.am b/include/Makefile.am deleted file mode 100644 index 50976c77..00000000 --- a/include/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Library General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Library General Public License for more details. -# -# You should have received a copy of the GNU Library General Public -# License along with this library; if not, write to the Free -# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -# MA 02111-1307, USA - -BUILT_SOURCES = mysql_version.h my_config.h -pkginclude_HEADERS = dbug.h m_string.h my_sys.h mysql.h mysql_com.h \ - mysqld_error.h my_list.h m_ctype.h \ - my_pthread.h my_no_pthread.h errmsg.h \ - my_global.h my_net.h \ - $(BUILT_SOURCES) -noinst_HEADERS = config-win.h \ - my_dir.h mysys_err.h \ - my_alarm.h \ - hash.h thr_alarm.h \ - getopt.h violite.h \ - mysql_version.h.in - diff --git a/include/errmsg.h b/include/errmsg.h index 87d3eed7..a6600b4b 100644 --- a/include/errmsg.h +++ b/include/errmsg.h @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Error messages for mysql clients */ /* error messages for the demon is in share/language/errmsg.sys */ diff --git a/include/ma_common.h b/include/ma_common.h index 41683760..b1c15d37 100644 --- a/include/ma_common.h +++ b/include/ma_common.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* defines for the libmariadb library */ diff --git a/include/ma_global.h b/include/ma_global.h index 84f35f5e..5c48f89a 100644 --- a/include/ma_global.h +++ b/include/ma_global.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* This is the main include file that should included 'first' in every C file. */ diff --git a/include/ma_list.h b/include/ma_list.h index 7a2a3307..b81cbf4e 100644 --- a/include/ma_list.h +++ b/include/ma_list.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #ifndef _list_h_ #define _list_h_ diff --git a/include/ma_pthread.h b/include/ma_pthread.h index ef938938..c1ee9151 100644 --- a/include/ma_pthread.h +++ b/include/ma_pthread.h @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Defines to make different thread packages compatible */ diff --git a/include/ma_string.h b/include/ma_string.h index 643ab0a6..f00f4805 100644 --- a/include/ma_string.h +++ b/include/ma_string.h @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* defines for the libmariadb library */ diff --git a/include/ma_sys.h b/include/ma_sys.h index de32a433..e365fc25 100644 --- a/include/ma_sys.h +++ b/include/ma_sys.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #ifndef _my_sys_h #define _my_sys_h diff --git a/include/mariadb/ma_io.h b/include/mariadb/ma_io.h index 6636bc80..bfbc706c 100644 --- a/include/mariadb/ma_io.h +++ b/include/mariadb/ma_io.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #ifndef _ma_io_h_ #define _ma_io_h_ diff --git a/include/mariadb_async.h b/include/mariadb_async.h index 5ccf5758..d655bd8e 100644 --- a/include/mariadb_async.h +++ b/include/mariadb_async.h @@ -11,7 +11,8 @@ 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 02111-1301, USA */ /* Common definitions for MariaDB non-blocking client library. */ diff --git a/include/mariadb_ctype.h b/include/mariadb_ctype.h index 6f3ba9af..bc65fcdc 100644 --- a/include/mariadb_ctype.h +++ b/include/mariadb_ctype.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* A better inplementation of the UNIX ctype(3) library. diff --git a/include/mariadb_stmt.h b/include/mariadb_stmt.h index b05db81f..d29dce10 100644 --- a/include/mariadb_stmt.h +++ b/include/mariadb_stmt.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA Part of this code includes code from PHP's mysqlnd extension (written by Andrey Hristov, Georg Richter and Ulf Wendel), freely diff --git a/include/mysql.h b/include/mysql.h index 6374552b..ffa308f1 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* defines for the libmariadb library */ diff --git a/include/mysql/plugin_auth.h b/include/mysql/plugin_auth.h index 513bcea5..2be64a6b 100644 --- a/include/mysql/plugin_auth.h +++ b/include/mysql/plugin_auth.h @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /** @file diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h index f3966b9a..ee4b8b9c 100644 --- a/include/mysql/plugin_auth_common.h +++ b/include/mysql/plugin_auth_common.h @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #ifndef MYSQL_PLUGIN_AUTH_COMMON_INCLUDED diff --git a/libmariadb/bmove_upp.c b/libmariadb/bmove_upp.c index ee7798bc..599b38be 100644 --- a/libmariadb/bmove_upp.c +++ b/libmariadb/bmove_upp.c @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* File : bmove.c Author : Michael widenius diff --git a/libmariadb/ma_alloc.c b/libmariadb/ma_alloc.c index 8894637b..300a107d 100644 --- a/libmariadb/ma_alloc.c +++ b/libmariadb/ma_alloc.c @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Routines to handle mallocing of results which will be freed the same time */ diff --git a/libmariadb/ma_array.c b/libmariadb/ma_array.c index aa1affda..a39e1a19 100644 --- a/libmariadb/ma_array.c +++ b/libmariadb/ma_array.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Handling of arrays that can grow dynamicly. */ diff --git a/libmariadb/ma_compress.c b/libmariadb/ma_compress.c index c040af87..55184a03 100644 --- a/libmariadb/ma_compress.c +++ b/libmariadb/ma_compress.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Written by Sinisa Milivojevic */ diff --git a/libmariadb/ma_default.c b/libmariadb/ma_default.c index 7d6931a0..e156b1ea 100644 --- a/libmariadb/ma_default.c +++ b/libmariadb/ma_default.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #include #include diff --git a/libmariadb/ma_errmsg.c b/libmariadb/ma_errmsg.c index 353e7431..cfb3027f 100644 --- a/libmariadb/ma_errmsg.c +++ b/libmariadb/ma_errmsg.c @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Error messages for MySQL clients */ /* error messages for the demon is in share/language/errmsg.sys */ diff --git a/libmariadb/ma_init.c b/libmariadb/ma_init.c index 83242501..077bb87e 100644 --- a/libmariadb/ma_init.c +++ b/libmariadb/ma_init.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #include #include diff --git a/libmariadb/ma_io.c b/libmariadb/ma_io.c index ddf903c2..7ce34adb 100644 --- a/libmariadb/ma_io.c +++ b/libmariadb/ma_io.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #include diff --git a/libmariadb/ma_list.c b/libmariadb/ma_list.c index 4e14c945..471e9bd6 100644 --- a/libmariadb/ma_list.c +++ b/libmariadb/ma_list.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Code for handling dubble-linked lists in C diff --git a/libmariadb/ma_ll2str.c b/libmariadb/ma_ll2str.c index 36987767..8f3a73b8 100644 --- a/libmariadb/ma_ll2str.c +++ b/libmariadb/ma_ll2str.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #include #include "ma_string.h" diff --git a/libmariadb/ma_net.c b/libmariadb/ma_net.c index 6b469c83..19601d85 100644 --- a/libmariadb/ma_net.c +++ b/libmariadb/ma_net.c @@ -12,8 +12,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Write and read of logical packets to/from socket ** Writes are cached into net_buffer_length big packets. diff --git a/libmariadb/ma_password.c b/libmariadb/ma_password.c index 4bd14a70..b7a18e77 100644 --- a/libmariadb/ma_password.c +++ b/libmariadb/ma_password.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* password checking routines */ /***************************************************************************** diff --git a/libmariadb/ma_string.c b/libmariadb/ma_string.c index b164e7a7..be3a21f2 100644 --- a/libmariadb/ma_string.c +++ b/libmariadb/ma_string.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ /* Code for handling strings with can grow dynamicly. diff --git a/libmariadb/mariadb_async.c b/libmariadb/mariadb_async.c index babcb212..b6d89423 100644 --- a/libmariadb/mariadb_async.c +++ b/libmariadb/mariadb_async.c @@ -13,7 +13,7 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, */ /* diff --git a/libmariadb/mariadb_charset.c b/libmariadb/mariadb_charset.c index 1fd51994..fd89aeaf 100644 --- a/libmariadb/mariadb_charset.c +++ b/libmariadb/mariadb_charset.c @@ -13,8 +13,8 @@ You should have received a copy of the GNU Library General Public License along with this library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA */ + Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + MA 02111-1301, USA */ #include #include diff --git a/unittest/mytap/tap.c b/unittest/mytap/tap.c index 546acd8e..40f79366 100644 --- a/unittest/mytap/tap.c +++ b/unittest/mytap/tap.c @@ -11,7 +11,8 @@ 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 02111-1301, USA Library for providing TAP support for testing C and C++ was written by Mats Kindahl . diff --git a/unittest/mytap/tap.h b/unittest/mytap/tap.h index 2b4545cb..15b1842b 100644 --- a/unittest/mytap/tap.h +++ b/unittest/mytap/tap.h @@ -11,7 +11,8 @@ 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 02111-1301, USA Library for providing TAP support for testing C and C++ was written by Mats Kindahl .