summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am4
-rw-r--r--include/base64.h3
-rw-r--r--include/config-netware.h3
-rw-r--r--include/config-win.h3
-rw-r--r--include/decimal.h3
-rw-r--r--include/errmsg.h3
-rw-r--r--include/ft_global.h3
-rw-r--r--include/hash.h3
-rw-r--r--include/heap.h3
-rw-r--r--include/keycache.h3
-rw-r--r--include/m_ctype.h3
-rw-r--r--include/m_string.h3
-rw-r--r--include/md5.h3
-rw-r--r--include/my_aes.h3
-rw-r--r--include/my_alarm.h3
-rw-r--r--include/my_alloc.h3
-rw-r--r--include/my_base.h3
-rw-r--r--include/my_bitmap.h3
-rw-r--r--include/my_dbug.h3
-rw-r--r--include/my_dir.h3
-rw-r--r--include/my_getopt.h3
-rw-r--r--include/my_global.h3
-rw-r--r--include/my_handler.h4
-rw-r--r--include/my_libwrap.h3
-rw-r--r--include/my_list.h3
-rw-r--r--include/my_net.h3
-rw-r--r--include/my_no_pthread.h3
-rw-r--r--include/my_nosys.h3
-rw-r--r--include/my_pthread.h3
-rw-r--r--include/my_sys.h3
-rw-r--r--include/my_time.h3
-rw-r--r--include/my_tree.h3
-rw-r--r--include/my_user.h3
-rw-r--r--include/my_xml.h3
-rw-r--r--include/myisam.h3
-rw-r--r--include/myisammrg.h3
-rw-r--r--include/myisampack.h3
-rw-r--r--include/mysql.h3
-rw-r--r--include/mysql_com.h3
-rw-r--r--include/mysql_embed.h3
-rw-r--r--include/mysql_time.h3
-rw-r--r--include/mysys_err.h3
-rw-r--r--include/queues.h3
-rw-r--r--include/rijndael.h3
-rw-r--r--include/sha1.h3
-rw-r--r--include/sql_common.h3
-rw-r--r--include/sslopt-case.h3
-rw-r--r--include/sslopt-longopts.h3
-rw-r--r--include/sslopt-vars.h3
-rw-r--r--include/t_ctype.h3
-rw-r--r--include/thr_alarm.h3
-rw-r--r--include/thr_lock.h3
-rw-r--r--include/typelib.h3
-rw-r--r--include/violite.h3
54 files changed, 56 insertions, 108 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 8651a2dd9b1..f1b96bf9345 100644
--- a/include/Makefile.am
+++ b/include/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/include/base64.h b/include/base64.h
index a6bffebfe07..4ac0aa72ad8 100644
--- a/include/base64.h
+++ b/include/base64.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/include/config-netware.h b/include/config-netware.h
index c30fc099985..f287699249b 100644
--- a/include/config-netware.h
+++ b/include/config-netware.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/include/config-win.h b/include/config-win.h
index 5290cf83896..edecf8d2fc8 100644
--- a/include/config-win.h
+++ b/include/config-win.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/include/decimal.h b/include/decimal.h
index 3b4cafbfd26..c5385b58658 100644
--- a/include/decimal.h
+++ b/include/decimal.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/include/errmsg.h b/include/errmsg.h
index f24ea2bf396..e4d20b061a5 100644
--- a/include/errmsg.h
+++ b/include/errmsg.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/include/ft_global.h b/include/ft_global.h
index 8f02e48f61d..6c3457541a5 100644
--- a/include/ft_global.h
+++ b/include/ft_global.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/include/hash.h b/include/hash.h
index 4d6ee77fa0c..97e947d7c6a 100644
--- a/include/hash.h
+++ b/include/hash.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/include/heap.h b/include/heap.h
index ea02b30e49b..af053341203 100644
--- a/include/heap.h
+++ b/include/heap.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/include/keycache.h b/include/keycache.h
index 9fe1cce5da5..dc763b8cc08 100644
--- a/include/keycache.h
+++ b/include/keycache.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/include/m_ctype.h b/include/m_ctype.h
index d98663c8db4..20f681c432d 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.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/include/m_string.h b/include/m_string.h
index caccc59abd5..4f098c3206d 100644
--- a/include/m_string.h
+++ b/include/m_string.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/include/md5.h b/include/md5.h
index aa4116ff17f..f92976b3beb 100644
--- a/include/md5.h
+++ b/include/md5.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/include/my_aes.h b/include/my_aes.h
index 5852baa5892..78c156a681e 100644
--- a/include/my_aes.h
+++ b/include/my_aes.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/include/my_alarm.h b/include/my_alarm.h
index fdfce9c65c9..750135d64ed 100644
--- a/include/my_alarm.h
+++ b/include/my_alarm.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/include/my_alloc.h b/include/my_alloc.h
index 1641b3acf3e..657394a363b 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.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/include/my_base.h b/include/my_base.h
index cf254f5e0d0..d0c46b35c24 100644
--- a/include/my_base.h
+++ b/include/my_base.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/include/my_bitmap.h b/include/my_bitmap.h
index 0b16a1b4832..488c41ffb22 100644
--- a/include/my_bitmap.h
+++ b/include/my_bitmap.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/include/my_dbug.h b/include/my_dbug.h
index f4aaa41b201..4d86e3e27c6 100644
--- a/include/my_dbug.h
+++ b/include/my_dbug.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/include/my_dir.h b/include/my_dir.h
index 851b6d8d7e9..06509a3af19 100644
--- a/include/my_dir.h
+++ b/include/my_dir.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/include/my_getopt.h b/include/my_getopt.h
index e6ca1130f85..bd5141a34c6 100644
--- a/include/my_getopt.h
+++ b/include/my_getopt.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/include/my_global.h b/include/my_global.h
index 80654051b5b..e96a378fb2f 100644
--- a/include/my_global.h
+++ b/include/my_global.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/include/my_handler.h b/include/my_handler.h
index 61665090853..e02de6c4d6c 100644
--- a/include/my_handler.h
+++ b/include/my_handler.h
@@ -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/include/my_libwrap.h b/include/my_libwrap.h
index 6437cbaed84..9a8579475fb 100644
--- a/include/my_libwrap.h
+++ b/include/my_libwrap.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/include/my_list.h b/include/my_list.h
index 92598696fc4..4a1737d4c53 100644
--- a/include/my_list.h
+++ b/include/my_list.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/include/my_net.h b/include/my_net.h
index 678025b31f4..3af79ea3db5 100644
--- a/include/my_net.h
+++ b/include/my_net.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/include/my_no_pthread.h b/include/my_no_pthread.h
index c47da5b1978..b11dbff42f0 100644
--- a/include/my_no_pthread.h
+++ b/include/my_no_pthread.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/include/my_nosys.h b/include/my_nosys.h
index 41b919c1a72..f8422699041 100644
--- a/include/my_nosys.h
+++ b/include/my_nosys.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/include/my_pthread.h b/include/my_pthread.h
index b3d84e70d6a..17b7b98da02 100644
--- a/include/my_pthread.h
+++ b/include/my_pthread.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/include/my_sys.h b/include/my_sys.h
index 7faffd6a18f..77367c1f246 100644
--- a/include/my_sys.h
+++ b/include/my_sys.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/include/my_time.h b/include/my_time.h
index c680c92ce46..41602123597 100644
--- a/include/my_time.h
+++ b/include/my_time.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/include/my_tree.h b/include/my_tree.h
index 68a2ea777c0..380fc1c9b26 100644
--- a/include/my_tree.h
+++ b/include/my_tree.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/include/my_user.h b/include/my_user.h
index 2bd4208a34c..0c86d0f90f6 100644
--- a/include/my_user.h
+++ b/include/my_user.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/include/my_xml.h b/include/my_xml.h
index 0d779ea6fb9..114805c7cc0 100644
--- a/include/my_xml.h
+++ b/include/my_xml.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/include/myisam.h b/include/myisam.h
index 9e492372f34..f763bf07719 100644
--- a/include/myisam.h
+++ b/include/myisam.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/include/myisammrg.h b/include/myisammrg.h
index f23759e22e1..6587613697a 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.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/include/myisampack.h b/include/myisampack.h
index c92429e4c01..7d4871bd1cb 100644
--- a/include/myisampack.h
+++ b/include/myisampack.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/include/mysql.h b/include/mysql.h
index 7f8941e68f1..451fe01a6ba 100644
--- a/include/mysql.h
+++ b/include/mysql.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/include/mysql_com.h b/include/mysql_com.h
index 7a1e2e30ac7..e2ab9601f5f 100644
--- a/include/mysql_com.h
+++ b/include/mysql_com.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/include/mysql_embed.h b/include/mysql_embed.h
index 311d95eda73..7416283d83d 100644
--- a/include/mysql_embed.h
+++ b/include/mysql_embed.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/include/mysql_time.h b/include/mysql_time.h
index 5f4fc12c005..56f0602cf74 100644
--- a/include/mysql_time.h
+++ b/include/mysql_time.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/include/mysys_err.h b/include/mysys_err.h
index 9f104357f41..b92027a4e3c 100644
--- a/include/mysys_err.h
+++ b/include/mysys_err.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/include/queues.h b/include/queues.h
index 8cb053831f2..d46f867f3bf 100644
--- a/include/queues.h
+++ b/include/queues.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/include/rijndael.h b/include/rijndael.h
index e286c89cbdc..481feb6e619 100644
--- a/include/rijndael.h
+++ b/include/rijndael.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/include/sha1.h b/include/sha1.h
index e67acbf96b8..9b2a4aee886 100644
--- a/include/sha1.h
+++ b/include/sha1.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/include/sql_common.h b/include/sql_common.h
index 29a9cbd4b08..b2b08f46180 100644
--- a/include/sql_common.h
+++ b/include/sql_common.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/include/sslopt-case.h b/include/sslopt-case.h
index ea23c31aa82..adb9a28503b 100644
--- a/include/sslopt-case.h
+++ b/include/sslopt-case.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/include/sslopt-longopts.h b/include/sslopt-longopts.h
index 0435ddb815a..d4aaf50992d 100644
--- a/include/sslopt-longopts.h
+++ b/include/sslopt-longopts.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/include/sslopt-vars.h b/include/sslopt-vars.h
index 7204145fc28..3369f870db2 100644
--- a/include/sslopt-vars.h
+++ b/include/sslopt-vars.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/include/t_ctype.h b/include/t_ctype.h
index 3e190977e6c..15600019cd6 100644
--- a/include/t_ctype.h
+++ b/include/t_ctype.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/include/thr_alarm.h b/include/thr_alarm.h
index c49bc2588d1..90f785c022f 100644
--- a/include/thr_alarm.h
+++ b/include/thr_alarm.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/include/thr_lock.h b/include/thr_lock.h
index c3a7909175f..363babeaa63 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.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/include/typelib.h b/include/typelib.h
index 4d6a90ad51e..28554f739d3 100644
--- a/include/typelib.h
+++ b/include/typelib.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/include/violite.h b/include/violite.h
index 323e72e82d3..2647342ed65 100644
--- a/include/violite.h
+++ b/include/violite.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