summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorkent@mysql.com/kent-amd64.(none) <>2006-12-23 20:17:15 +0100
committerkent@mysql.com/kent-amd64.(none) <>2006-12-23 20:17:15 +0100
commit226a5c833f3084bc634996c70d47a1c0d9164e0d (patch)
tree8015408b1fab2e4bb245c305831b84124d59d5ca /libmysqld
parent51fcec6a2070835b5bda4166be2b9db3a598b0b4 (diff)
downloadmariadb-git-226a5c833f3084bc634996c70d47a1c0d9164e0d.tar.gz
Many files:
Changed header to GPL version 2 only
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/Makefile.am4
-rw-r--r--libmysqld/emb_qcache.cc3
-rw-r--r--libmysqld/emb_qcache.h3
-rw-r--r--libmysqld/embedded_priv.h3
-rw-r--r--libmysqld/examples/Makefile.am3
-rw-r--r--libmysqld/libmysqld.c3
6 files changed, 7 insertions, 12 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index cdd71724166..acf0d5a5bc8 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 01429378dfb..f30951a5d81 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