diff options
| author | kent@kent-amd64.(none) <> | 2006-12-23 20:20:40 +0100 |
|---|---|---|
| committer | kent@kent-amd64.(none) <> | 2006-12-23 20:20:40 +0100 |
| commit | be15e3bc15921085ea558f8764ed1fad137ccaa1 (patch) | |
| tree | 5283b715c9535e3fdade4d3cf17559c467d87078 /libmysqld | |
| parent | 3368730535915c58d8bb68cffc35c53192002de6 (diff) | |
| parent | 226a5c833f3084bc634996c70d47a1c0d9164e0d (diff) | |
| download | mariadb-git-be15e3bc15921085ea558f8764ed1fad137ccaa1.tar.gz | |
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 4 | ||||
| -rw-r--r-- | libmysqld/emb_qcache.cc | 3 | ||||
| -rw-r--r-- | libmysqld/emb_qcache.h | 3 | ||||
| -rw-r--r-- | libmysqld/embedded_priv.h | 3 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 3 | ||||
| -rw-r--r-- | libmysqld/libmysqld.c | 3 |
6 files changed, 7 insertions, 12 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 463cd187c2b..0c3aaa8f2df 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -2,8 +2,8 @@ # # 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. +# License as published by the Free Software Foundation; version 2 +# of the License. # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/libmysqld/emb_qcache.cc b/libmysqld/emb_qcache.cc index 078243a6d5e..e6f35aa33a0 100644 --- a/libmysqld/emb_qcache.cc +++ b/libmysqld/emb_qcache.cc @@ -2,8 +2,7 @@ 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; 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 diff --git a/libmysqld/emb_qcache.h b/libmysqld/emb_qcache.h index 6201058ce56..ca7bbec15cd 100644 --- a/libmysqld/emb_qcache.h +++ b/libmysqld/emb_qcache.h @@ -2,8 +2,7 @@ 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; 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 diff --git a/libmysqld/embedded_priv.h b/libmysqld/embedded_priv.h index 5ba6f34a2eb..bbcf8886cc1 100644 --- a/libmysqld/embedded_priv.h +++ b/libmysqld/embedded_priv.h @@ -2,8 +2,7 @@ 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; 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 diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index c705fb1e68d..f8c60ab3694 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -2,8 +2,7 @@ # # 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; 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 diff --git a/libmysqld/libmysqld.c b/libmysqld/libmysqld.c index 58a22686199..eb47a045669 100644 --- a/libmysqld/libmysqld.c +++ b/libmysqld/libmysqld.c @@ -2,8 +2,7 @@ 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; 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 |