Commit 7b614774 authored by unknown's avatar unknown
Browse files

- Fixed libmysql license texts: added reference to the FLOSS 

   EXCEPTIONS file and amended the GPL text as requested by Zak


libmysql/Makefile.am:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql/Makefile.shared:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql/conf_to_src.c:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql/dll.c:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql/errmsg.c:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql/get_password.c:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql/libmysql.c:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql/manager.c:
   - Fixed license text, added reference to the EXCEPTIONS file
libmysql_r/Makefile.am:
   - Fixed license text, added reference to the EXCEPTIONS file
parent dc82282e

libmysql/Makefile.am

+9 −6
Original line number Diff line number Diff line 
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB

# Copyright (C) 2000-2004 MySQL 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 program is free software; you can redistribute it and/or modify

# it under the terms of version 2 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. View the full text of the exception in file

# EXCEPTIONS in the directory of this software distribution.

# 

# This library is distributed in the hope that it will be useful,

# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,7 +17,7 @@ 
# License along with this library; if not, write to the Free

# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,

# MA 02111-1307, USA



#

# This file is public domain and comes with NO WARRANTY of any kind



target =	libmysqlclient.la

libmysql/Makefile.shared

+21 −18
Original line number Diff line number Diff line 
## 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

##

## This file is public domain and comes with NO WARRANTY of any kind

# Copyright (C) 2000-2004 MySQL AB

# 

# This program is free software; you can redistribute it and/or modify

# it under the terms of version 2 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. View the full text of the exception in file

# EXCEPTIONS in the directory of this software distribution.

# 

# 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

#

# This file is public domain and comes with NO WARRANTY of any kind



MYSQLDATAdir =			$(localstatedir)

MYSQLSHAREdir =			$(pkgdatadir)

libmysql/conf_to_src.c

+6 −3
Original line number Diff line number Diff line 
/* Copyright (C) 2000 MySQL AB

/* Copyright (C) 2000-2004 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

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.

   the Free Software Foundation.



   There are special exceptions to the terms and conditions of the GPL as it

   is applied to this software. View the full text of the exception in file

   EXCEPTIONS in the directory of this software distribution.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

libmysql/dll.c

+6 −3
Original line number Diff line number Diff line 
/* Copyright (C) 2000 MySQL AB

/* Copyright (C) 2000-2004 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

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.

   the Free Software Foundation.



   There are special exceptions to the terms and conditions of the GPL as it

   is applied to this software. View the full text of the exception in file

   EXCEPTIONS in the directory of this software distribution.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of

libmysql/errmsg.c

+6 −3
Original line number Diff line number Diff line 
/* Copyright (C) 2000 MySQL AB

/* Copyright (C) 2000-2004 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

   the Free Software Foundation; either version 2 of the License, or

   (at your option) any later version.

   the Free Software Foundation.



   There are special exceptions to the terms and conditions of the GPL as it

   is applied to this software. View the full text of the exception in file

   EXCEPTIONS in the directory of this software distribution.



   This program is distributed in the hope that it will be useful,

   but WITHOUT ANY WARRANTY; without even the implied warranty of