summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
Diffstat (limited to 'mysys')
-rw-r--r--mysys/Makefile.am3
-rw-r--r--mysys/array.c3
-rw-r--r--mysys/base64.c3
-rw-r--r--mysys/charset-def.c3
-rw-r--r--mysys/charset.c3
-rw-r--r--mysys/checksum.c3
-rw-r--r--mysys/default.c3
-rw-r--r--mysys/default_modify.c3
-rw-r--r--mysys/errors.c3
-rw-r--r--mysys/hash.c3
-rw-r--r--mysys/list.c3
-rw-r--r--mysys/make-conf.c3
-rw-r--r--mysys/md5.c3
-rw-r--r--mysys/mf_brkhant.c3
-rw-r--r--mysys/mf_cache.c3
-rw-r--r--mysys/mf_dirname.c3
-rw-r--r--mysys/mf_fn_ext.c3
-rw-r--r--mysys/mf_format.c3
-rw-r--r--mysys/mf_getdate.c3
-rw-r--r--mysys/mf_iocache.c3
-rw-r--r--mysys/mf_iocache2.c3
-rw-r--r--mysys/mf_keycache.c3
-rw-r--r--mysys/mf_keycaches.c3
-rw-r--r--mysys/mf_loadpath.c3
-rw-r--r--mysys/mf_pack.c3
-rw-r--r--mysys/mf_path.c3
-rw-r--r--mysys/mf_qsort.c3
-rw-r--r--mysys/mf_qsort2.c3
-rw-r--r--mysys/mf_radix.c3
-rw-r--r--mysys/mf_same.c3
-rw-r--r--mysys/mf_sort.c3
-rw-r--r--mysys/mf_soundex.c3
-rw-r--r--mysys/mf_strip.c3
-rw-r--r--mysys/mf_tempdir.c3
-rw-r--r--mysys/mf_tempfile.c3
-rw-r--r--mysys/mf_unixpath.c3
-rw-r--r--mysys/mf_util.c3
-rw-r--r--mysys/mf_wcomp.c3
-rw-r--r--mysys/mf_wfile.c3
-rw-r--r--mysys/mulalloc.c3
-rw-r--r--mysys/my_access.c3
-rw-r--r--mysys/my_aes.c3
-rw-r--r--mysys/my_alarm.c3
-rw-r--r--mysys/my_alloc.c3
-rw-r--r--mysys/my_append.c3
-rw-r--r--mysys/my_bit.c3
-rw-r--r--mysys/my_bitmap.c3
-rw-r--r--mysys/my_chsize.c3
-rw-r--r--mysys/my_clock.c3
-rw-r--r--mysys/my_compress.c3
-rw-r--r--mysys/my_conio.c3
-rw-r--r--mysys/my_copy.c3
-rw-r--r--mysys/my_crc32.c3
-rw-r--r--mysys/my_create.c3
-rw-r--r--mysys/my_delete.c3
-rw-r--r--mysys/my_div.c3
-rw-r--r--mysys/my_dup.c3
-rw-r--r--mysys/my_error.c3
-rw-r--r--mysys/my_file.c3
-rw-r--r--mysys/my_fopen.c3
-rw-r--r--mysys/my_fstream.c3
-rw-r--r--mysys/my_gethostbyname.c4
-rw-r--r--mysys/my_gethwaddr.c3
-rw-r--r--mysys/my_getopt.c3
-rw-r--r--mysys/my_getpagesize.c3
-rw-r--r--mysys/my_getsystime.c3
-rw-r--r--mysys/my_getwd.c3
-rw-r--r--mysys/my_handler.c4
-rw-r--r--mysys/my_init.c3
-rw-r--r--mysys/my_largepage.c3
-rw-r--r--mysys/my_lib.c3
-rw-r--r--mysys/my_libwrap.c3
-rw-r--r--mysys/my_lock.c3
-rw-r--r--mysys/my_lockmem.c3
-rw-r--r--mysys/my_lread.c3
-rw-r--r--mysys/my_lwrite.c3
-rw-r--r--mysys/my_malloc.c3
-rw-r--r--mysys/my_messnc.c3
-rw-r--r--mysys/my_mkdir.c3
-rw-r--r--mysys/my_mmap.c3
-rw-r--r--mysys/my_net.c3
-rw-r--r--mysys/my_netware.c3
-rw-r--r--mysys/my_new.cc3
-rw-r--r--mysys/my_once.c3
-rw-r--r--mysys/my_open.c3
-rw-r--r--mysys/my_os2cond.c4
-rw-r--r--mysys/my_os2dirsrch.c4
-rw-r--r--mysys/my_os2dirsrch.h4
-rw-r--r--mysys/my_os2dlfcn.c4
-rw-r--r--mysys/my_os2dlfcn.h04
-rw-r--r--mysys/my_os2file64.c4
-rw-r--r--mysys/my_os2thread.c4
-rw-r--r--mysys/my_os2tls.c4
-rw-r--r--mysys/my_port.c4
-rw-r--r--mysys/my_pread.c3
-rw-r--r--mysys/my_pthread.c3
-rw-r--r--mysys/my_quick.c3
-rw-r--r--mysys/my_read.c3
-rw-r--r--mysys/my_realloc.c3
-rw-r--r--mysys/my_redel.c3
-rw-r--r--mysys/my_rename.c3
-rw-r--r--mysys/my_seek.c3
-rw-r--r--mysys/my_semaphore.c3
-rw-r--r--mysys/my_sleep.c3
-rw-r--r--mysys/my_static.c3
-rw-r--r--mysys/my_static.h3
-rw-r--r--mysys/my_symlink.c3
-rw-r--r--mysys/my_symlink2.c3
-rw-r--r--mysys/my_sync.c3
-rw-r--r--mysys/my_thr_init.c3
-rw-r--r--mysys/my_wincond.c3
-rw-r--r--mysys/my_windac.c3
-rw-r--r--mysys/my_winthread.c3
-rw-r--r--mysys/my_write.c3
-rw-r--r--mysys/mysys_priv.h3
-rw-r--r--mysys/ptr_cmp.c3
-rw-r--r--mysys/queues.c3
-rw-r--r--mysys/raid.cc3
-rw-r--r--mysys/raid2.c4
-rw-r--r--mysys/rijndael.c3
-rw-r--r--mysys/safemalloc.c3
-rw-r--r--mysys/sha1.c3
-rw-r--r--mysys/string.c3
-rw-r--r--mysys/test_charset.c3
-rw-r--r--mysys/test_dir.c3
-rw-r--r--mysys/test_fn.c3
-rw-r--r--mysys/test_xml.c3
-rw-r--r--mysys/testhash.c3
-rw-r--r--mysys/thr_alarm.c3
-rw-r--r--mysys/thr_lock.c3
-rw-r--r--mysys/thr_mutex.c3
-rw-r--r--mysys/thr_rwlock.c3
-rw-r--r--mysys/tree.c3
-rw-r--r--mysys/typelib.c3
134 files changed, 146 insertions, 268 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index 47480e8f363..5ab0fea748c 100644
--- a/mysys/Makefile.am
+++ b/mysys/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/mysys/array.c b/mysys/array.c
index 6d00585f24d..e3ebe8ddb42 100644
--- a/mysys/array.c
+++ b/mysys/array.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
diff --git a/mysys/base64.c b/mysys/base64.c
index 2d1b7f2aeba..6a6b7eae359 100644
--- a/mysys/base64.c
+++ b/mysys/base64.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
diff --git a/mysys/charset-def.c b/mysys/charset-def.c
index 0559fe59d06..394fe6de1f3 100644
--- a/mysys/charset-def.c
+++ b/mysys/charset-def.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
diff --git a/mysys/charset.c b/mysys/charset.c
index d10a580ae4e..9fb02f1a39f 100644
--- a/mysys/charset.c
+++ b/mysys/charset.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
diff --git a/mysys/checksum.c b/mysys/checksum.c
index 92ec3d550f1..09e9c5b3730 100644
--- a/mysys/checksum.c
+++ b/mysys/checksum.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
diff --git a/mysys/default.c b/mysys/default.c
index d93f4135e73..97c52d01031 100644
--- a/mysys/default.c
+++ b/mysys/default.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
diff --git a/mysys/default_modify.c b/mysys/default_modify.c
index 0f58b8a930c..be40d3b3660 100644
--- a/mysys/default_modify.c
+++ b/mysys/default_modify.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
diff --git a/mysys/errors.c b/mysys/errors.c
index 4472b7173fa..857de1325d4 100644
--- a/mysys/errors.c
+++ b/mysys/errors.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
diff --git a/mysys/hash.c b/mysys/hash.c
index 9a268a7e218..0c949b3a0d8 100644
--- a/mysys/hash.c
+++ b/mysys/hash.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
diff --git a/mysys/list.c b/mysys/list.c
index c4ce5b5e36f..ccc3f495093 100644
--- a/mysys/list.c
+++ b/mysys/list.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
diff --git a/mysys/make-conf.c b/mysys/make-conf.c
index 404299e1726..0dacde4dee0 100644
--- a/mysys/make-conf.c
+++ b/mysys/make-conf.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
diff --git a/mysys/md5.c b/mysys/md5.c
index 5de95288141..a88fb279a0b 100644
--- a/mysys/md5.c
+++ b/mysys/md5.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
diff --git a/mysys/mf_brkhant.c b/mysys/mf_brkhant.c
index 4180bd6df66..3573b9973b2 100644
--- a/mysys/mf_brkhant.c
+++ b/mysys/mf_brkhant.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
diff --git a/mysys/mf_cache.c b/mysys/mf_cache.c
index 2c5d8658625..a3abb3bc974 100644
--- a/mysys/mf_cache.c
+++ b/mysys/mf_cache.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
diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c
index 4d78f039799..d1672e55b65 100644
--- a/mysys/mf_dirname.c
+++ b/mysys/mf_dirname.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
diff --git a/mysys/mf_fn_ext.c b/mysys/mf_fn_ext.c
index d7b1f8c1d61..20e835fe641 100644
--- a/mysys/mf_fn_ext.c
+++ b/mysys/mf_fn_ext.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
diff --git a/mysys/mf_format.c b/mysys/mf_format.c
index 50f354df1cd..7a861c9f1e6 100644
--- a/mysys/mf_format.c
+++ b/mysys/mf_format.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
diff --git a/mysys/mf_getdate.c b/mysys/mf_getdate.c
index 8998da8aefa..1ced312848e 100644
--- a/mysys/mf_getdate.c
+++ b/mysys/mf_getdate.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
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index e0962999015..d458bf528d0 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.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
diff --git a/mysys/mf_iocache2.c b/mysys/mf_iocache2.c
index f1ea21c2a47..429954a9162 100644
--- a/mysys/mf_iocache2.c
+++ b/mysys/mf_iocache2.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
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index d658e6fe055..3c4197f847e 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.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
diff --git a/mysys/mf_keycaches.c b/mysys/mf_keycaches.c
index e5086014a27..51ad54159e5 100644
--- a/mysys/mf_keycaches.c
+++ b/mysys/mf_keycaches.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
diff --git a/mysys/mf_loadpath.c b/mysys/mf_loadpath.c
index a46b43c34d4..ffa83cb20ec 100644
--- a/mysys/mf_loadpath.c
+++ b/mysys/mf_loadpath.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
diff --git a/mysys/mf_pack.c b/mysys/mf_pack.c
index 049aa59a578..d14c24f35d7 100644
--- a/mysys/mf_pack.c
+++ b/mysys/mf_pack.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
diff --git a/mysys/mf_path.c b/mysys/mf_path.c
index 1ecd5fbb2b1..9af6173b417 100644
--- a/mysys/mf_path.c
+++ b/mysys/mf_path.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
diff --git a/mysys/mf_qsort.c b/mysys/mf_qsort.c
index 9cc937f6e8b..3d52d56c952 100644
--- a/mysys/mf_qsort.c
+++ b/mysys/mf_qsort.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
diff --git a/mysys/mf_qsort2.c b/mysys/mf_qsort2.c
index 160bb6df817..ca2bd1a4952 100644
--- a/mysys/mf_qsort2.c
+++ b/mysys/mf_qsort2.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
diff --git a/mysys/mf_radix.c b/mysys/mf_radix.c
index 7ee96b966b9..6b750181558 100644
--- a/mysys/mf_radix.c
+++ b/mysys/mf_radix.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
diff --git a/mysys/mf_same.c b/mysys/mf_same.c
index efd6e7b2ca4..e7cdb012c9f 100644
--- a/mysys/mf_same.c
+++ b/mysys/mf_same.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
diff --git a/mysys/mf_sort.c b/mysys/mf_sort.c
index 0dc6c78a589..e7fd6873eee 100644
--- a/mysys/mf_sort.c
+++ b/mysys/mf_sort.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
diff --git a/mysys/mf_soundex.c b/mysys/mf_soundex.c
index c0c6105a6eb..fa393d1a94a 100644
--- a/mysys/mf_soundex.c
+++ b/mysys/mf_soundex.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
diff --git a/mysys/mf_strip.c b/mysys/mf_strip.c
index ef2aab2c0a3..712b0e1d28a 100644
--- a/mysys/mf_strip.c
+++ b/mysys/mf_strip.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
diff --git a/mysys/mf_tempdir.c b/mysys/mf_tempdir.c
index 4d244aa7d74..c24e2a0101b 100644
--- a/mysys/mf_tempdir.c
+++ b/mysys/mf_tempdir.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
diff --git a/mysys/mf_tempfile.c b/mysys/mf_tempfile.c
index a15bda4da6d..431674c5d61 100644
--- a/mysys/mf_tempfile.c
+++ b/mysys/mf_tempfile.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
diff --git a/mysys/mf_unixpath.c b/mysys/mf_unixpath.c
index 9efc3e5d9b8..11292e231ba 100644
--- a/mysys/mf_unixpath.c
+++ b/mysys/mf_unixpath.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
diff --git a/mysys/mf_util.c b/mysys/mf_util.c
index 132c83b4623..248b72b8748 100644
--- a/mysys/mf_util.c
+++ b/mysys/mf_util.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
diff --git a/mysys/mf_wcomp.c b/mysys/mf_wcomp.c
index 1a01388a3db..4786537d1a5 100644
--- a/mysys/mf_wcomp.c
+++ b/mysys/mf_wcomp.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
diff --git a/mysys/mf_wfile.c b/mysys/mf_wfile.c
index 7d537eaa06a..b574d158b9e 100644
--- a/mysys/mf_wfile.c
+++ b/mysys/mf_wfile.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
diff --git a/mysys/mulalloc.c b/mysys/mulalloc.c
index e1eb1c00602..bada0a55a6a 100644
--- a/mysys/mulalloc.c
+++ b/mysys/mulalloc.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
diff --git a/mysys/my_access.c b/mysys/my_access.c
index 99e7a28914d..9ee20cc942b 100644
--- a/mysys/my_access.c
+++ b/mysys/my_access.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
diff --git a/mysys/my_aes.c b/mysys/my_aes.c
index 16d326d7d1f..c46027e59f9 100644
--- a/mysys/my_aes.c
+++ b/mysys/my_aes.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
diff --git a/mysys/my_alarm.c b/mysys/my_alarm.c
index 70daf4a9dd0..d6a0da1bd13 100644
--- a/mysys/my_alarm.c
+++ b/mysys/my_alarm.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
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index c97ae83f6bc..cfa2dd6216d 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.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
diff --git a/mysys/my_append.c b/mysys/my_append.c
index c3549c670c3..274f2110575 100644
--- a/mysys/my_append.c
+++ b/mysys/my_append.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
diff --git a/mysys/my_bit.c b/mysys/my_bit.c
index 01c9b5ea68d..81d63246e7a 100644
--- a/mysys/my_bit.c
+++ b/mysys/my_bit.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
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c
index 25ff2651e90..2cf16111f67 100644
--- a/mysys/my_bitmap.c
+++ b/mysys/my_bitmap.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
diff --git a/mysys/my_chsize.c b/mysys/my_chsize.c
index 4b26085c870..a5dd1564692 100644
--- a/mysys/my_chsize.c
+++ b/mysys/my_chsize.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
diff --git a/mysys/my_clock.c b/mysys/my_clock.c
index a192bde056d..c5fa516a622 100644
--- a/mysys/my_clock.c
+++ b/mysys/my_clock.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
diff --git a/mysys/my_compress.c b/mysys/my_compress.c
index 0e37d2fef9b..c054bf155b1 100644
--- a/mysys/my_compress.c
+++ b/mysys/my_compress.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
diff --git a/mysys/my_conio.c b/mysys/my_conio.c
index e381f9f23ef..23b0c55e7a9 100644
--- a/mysys/my_conio.c
+++ b/mysys/my_conio.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
diff --git a/mysys/my_copy.c b/mysys/my_copy.c
index 2fb022a25f2..6143700befc 100644
--- a/mysys/my_copy.c
+++ b/mysys/my_copy.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
diff --git a/mysys/my_crc32.c b/mysys/my_crc32.c
index db1beb58263..51c553da5ea 100644
--- a/mysys/my_crc32.c
+++ b/mysys/my_crc32.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
diff --git a/mysys/my_create.c b/mysys/my_create.c
index a85417c7701..d612926c1a5 100644
--- a/mysys/my_create.c
+++ b/mysys/my_create.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
diff --git a/mysys/my_delete.c b/mysys/my_delete.c
index de2a9814a56..bac3e2513e1 100644
--- a/mysys/my_delete.c
+++ b/mysys/my_delete.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
diff --git a/mysys/my_div.c b/mysys/my_div.c
index 9141ff4fcc5..656c6cfde91 100644
--- a/mysys/my_div.c
+++ b/mysys/my_div.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
diff --git a/mysys/my_dup.c b/mysys/my_dup.c
index cdc15b3ebce..2c6a42726e4 100644
--- a/mysys/my_dup.c
+++ b/mysys/my_dup.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
diff --git a/mysys/my_error.c b/mysys/my_error.c
index d7177e7a047..836f851322b 100644
--- a/mysys/my_error.c
+++ b/mysys/my_error.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
diff --git a/mysys/my_file.c b/mysys/my_file.c
index 6a9d39cf944..c97a512f8a1 100644
--- a/mysys/my_file.c
+++ b/mysys/my_file.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
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index 6e81d40a2d6..b56be263ba4 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.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
diff --git a/mysys/my_fstream.c b/mysys/my_fstream.c
index 0f7f4cc888f..ea30509ca8c 100644
--- a/mysys/my_fstream.c
+++ b/mysys/my_fstream.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
diff --git a/mysys/my_gethostbyname.c b/mysys/my_gethostbyname.c
index 27281f3489d..2aa87fbd18a 100644
--- a/mysys/my_gethostbyname.c
+++ b/mysys/my_gethostbyname.c
@@ -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/mysys/my_gethwaddr.c b/mysys/my_gethwaddr.c
index 222abe81933..65738b09d36 100644
--- a/mysys/my_gethwaddr.c
+++ b/mysys/my_gethwaddr.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
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 878e4b5103c..727f733bf5b 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.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
diff --git a/mysys/my_getpagesize.c b/mysys/my_getpagesize.c
index ac4bd775ba9..b0560cede35 100644
--- a/mysys/my_getpagesize.c
+++ b/mysys/my_getpagesize.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
diff --git a/mysys/my_getsystime.c b/mysys/my_getsystime.c
index 91c977f0b5a..29270880f33 100644
--- a/mysys/my_getsystime.c
+++ b/mysys/my_getsystime.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
diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c
index b6b6ee610a5..3870a5d61b0 100644
--- a/mysys/my_getwd.c
+++ b/mysys/my_getwd.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
diff --git a/mysys/my_handler.c b/mysys/my_handler.c
index 46144c0dff2..07155c2446b 100644
--- a/mysys/my_handler.c
+++ b/mysys/my_handler.c
@@ -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/mysys/my_init.c b/mysys/my_init.c
index 8346fab95da..cc4bef10e8d 100644
--- a/mysys/my_init.c
+++ b/mysys/my_init.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
diff --git a/mysys/my_largepage.c b/mysys/my_largepage.c
index 0639c360b46..9714c582acb 100644
--- a/mysys/my_largepage.c
+++ b/mysys/my_largepage.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
diff --git a/mysys/my_lib.c b/mysys/my_lib.c
index ae7b0baafbd..75e31c4d555 100644
--- a/mysys/my_lib.c
+++ b/mysys/my_lib.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
diff --git a/mysys/my_libwrap.c b/mysys/my_libwrap.c
index 80fca127716..e72334ba806 100644
--- a/mysys/my_libwrap.c
+++ b/mysys/my_libwrap.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
diff --git a/mysys/my_lock.c b/mysys/my_lock.c
index b8307f366c0..a07f0c072a0 100644
--- a/mysys/my_lock.c
+++ b/mysys/my_lock.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
diff --git a/mysys/my_lockmem.c b/mysys/my_lockmem.c
index 6712c387a71..a58a5a340b1 100644
--- a/mysys/my_lockmem.c
+++ b/mysys/my_lockmem.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
diff --git a/mysys/my_lread.c b/mysys/my_lread.c
index ccf795631b8..1399b197119 100644
--- a/mysys/my_lread.c
+++ b/mysys/my_lread.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
diff --git a/mysys/my_lwrite.c b/mysys/my_lwrite.c
index 85f4677932e..d26825397e3 100644
--- a/mysys/my_lwrite.c
+++ b/mysys/my_lwrite.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
diff --git a/mysys/my_malloc.c b/mysys/my_malloc.c
index c6d51e29f18..3baf55d4c57 100644
--- a/mysys/my_malloc.c
+++ b/mysys/my_malloc.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
diff --git a/mysys/my_messnc.c b/mysys/my_messnc.c
index 1f9df3c7c2c..e2431959b7a 100644
--- a/mysys/my_messnc.c
+++ b/mysys/my_messnc.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
diff --git a/mysys/my_mkdir.c b/mysys/my_mkdir.c
index ba1f4c1f2d8..25176e4b823 100644
--- a/mysys/my_mkdir.c
+++ b/mysys/my_mkdir.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
diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c
index eb74aaeaae4..147bdfdcbf2 100644
--- a/mysys/my_mmap.c
+++ b/mysys/my_mmap.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
diff --git a/mysys/my_net.c b/mysys/my_net.c
index be92adae353..136d987f500 100644
--- a/mysys/my_net.c
+++ b/mysys/my_net.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
diff --git a/mysys/my_netware.c b/mysys/my_netware.c
index 9c604778c2d..5b5c39c0ac0 100644
--- a/mysys/my_netware.c
+++ b/mysys/my_netware.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
diff --git a/mysys/my_new.cc b/mysys/my_new.cc
index 66f3a14eeb4..babfe04d695 100644
--- a/mysys/my_new.cc
+++ b/mysys/my_new.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/mysys/my_once.c b/mysys/my_once.c
index ab5fcc51c0e..d83eba95b9d 100644
--- a/mysys/my_once.c
+++ b/mysys/my_once.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
diff --git a/mysys/my_open.c b/mysys/my_open.c
index a0168b23b16..2ba84f92ac2 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.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
diff --git a/mysys/my_os2cond.c b/mysys/my_os2cond.c
index bf3e85c26a9..f0cf91404d2 100644
--- a/mysys/my_os2cond.c
+++ b/mysys/my_os2cond.c
@@ -5,8 +5,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/mysys/my_os2dirsrch.c b/mysys/my_os2dirsrch.c
index 8d1f6ddd947..27e774c8e04 100644
--- a/mysys/my_os2dirsrch.c
+++ b/mysys/my_os2dirsrch.c
@@ -5,8 +5,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/mysys/my_os2dirsrch.h b/mysys/my_os2dirsrch.h
index 3889f628bad..e3af6740769 100644
--- a/mysys/my_os2dirsrch.h
+++ b/mysys/my_os2dirsrch.h
@@ -5,8 +5,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/mysys/my_os2dlfcn.c b/mysys/my_os2dlfcn.c
index 9c9a6061e8d..74be940d0d4 100644
--- a/mysys/my_os2dlfcn.c
+++ b/mysys/my_os2dlfcn.c
@@ -5,8 +5,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/mysys/my_os2dlfcn.h0 b/mysys/my_os2dlfcn.h0
index 7f84d430230..ec05eebc47b 100644
--- a/mysys/my_os2dlfcn.h0
+++ b/mysys/my_os2dlfcn.h0
@@ -5,8 +5,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/mysys/my_os2file64.c b/mysys/my_os2file64.c
index 786e083adc4..52156903b80 100644
--- a/mysys/my_os2file64.c
+++ b/mysys/my_os2file64.c
@@ -5,8 +5,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/mysys/my_os2thread.c b/mysys/my_os2thread.c
index 785ff07954d..e34fd18d596 100644
--- a/mysys/my_os2thread.c
+++ b/mysys/my_os2thread.c
@@ -5,8 +5,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/mysys/my_os2tls.c b/mysys/my_os2tls.c
index f7cf3b09283..49100c65516 100644
--- a/mysys/my_os2tls.c
+++ b/mysys/my_os2tls.c
@@ -5,8 +5,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/mysys/my_port.c b/mysys/my_port.c
index bf5dbcbace1..f987f961743 100644
--- a/mysys/my_port.c
+++ b/mysys/my_port.c
@@ -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/mysys/my_pread.c b/mysys/my_pread.c
index b1b9d9da950..2d42a6ebbc4 100644
--- a/mysys/my_pread.c
+++ b/mysys/my_pread.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
diff --git a/mysys/my_pthread.c b/mysys/my_pthread.c
index 315e966bf43..fe3480ea10f 100644
--- a/mysys/my_pthread.c
+++ b/mysys/my_pthread.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
diff --git a/mysys/my_quick.c b/mysys/my_quick.c
index ffc8160c371..15549dfb751 100644
--- a/mysys/my_quick.c
+++ b/mysys/my_quick.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
diff --git a/mysys/my_read.c b/mysys/my_read.c
index 33eb3ddf334..a6c45340b0c 100644
--- a/mysys/my_read.c
+++ b/mysys/my_read.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
diff --git a/mysys/my_realloc.c b/mysys/my_realloc.c
index b521ae36b94..43fbb0c1eee 100644
--- a/mysys/my_realloc.c
+++ b/mysys/my_realloc.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
diff --git a/mysys/my_redel.c b/mysys/my_redel.c
index 9af360424b0..1e3cfceb495 100644
--- a/mysys/my_redel.c
+++ b/mysys/my_redel.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
diff --git a/mysys/my_rename.c b/mysys/my_rename.c
index b5d813ad787..c4aeb95b2c0 100644
--- a/mysys/my_rename.c
+++ b/mysys/my_rename.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
diff --git a/mysys/my_seek.c b/mysys/my_seek.c
index e8c109acacd..fd2344e0d36 100644
--- a/mysys/my_seek.c
+++ b/mysys/my_seek.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
diff --git a/mysys/my_semaphore.c b/mysys/my_semaphore.c
index aa216cbc289..8bb87f4ad14 100644
--- a/mysys/my_semaphore.c
+++ b/mysys/my_semaphore.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
diff --git a/mysys/my_sleep.c b/mysys/my_sleep.c
index 31eaf7eeb96..50e6fae17fc 100644
--- a/mysys/my_sleep.c
+++ b/mysys/my_sleep.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
diff --git a/mysys/my_static.c b/mysys/my_static.c
index 8448afdc158..694e5058bb0 100644
--- a/mysys/my_static.c
+++ b/mysys/my_static.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
diff --git a/mysys/my_static.h b/mysys/my_static.h
index 51f9fbc922f..cbd293a0431 100644
--- a/mysys/my_static.h
+++ b/mysys/my_static.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/mysys/my_symlink.c b/mysys/my_symlink.c
index 7be3fcd36f0..810c0c72632 100644
--- a/mysys/my_symlink.c
+++ b/mysys/my_symlink.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
diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c
index 603248e186b..2ad08ef67de 100644
--- a/mysys/my_symlink2.c
+++ b/mysys/my_symlink2.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
diff --git a/mysys/my_sync.c b/mysys/my_sync.c
index c557324b52c..64fce3aac21 100644
--- a/mysys/my_sync.c
+++ b/mysys/my_sync.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
diff --git a/mysys/my_thr_init.c b/mysys/my_thr_init.c
index fcae18d4686..b44e5ced99f 100644
--- a/mysys/my_thr_init.c
+++ b/mysys/my_thr_init.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
diff --git a/mysys/my_wincond.c b/mysys/my_wincond.c
index 8c497e8f250..560d1788ae0 100644
--- a/mysys/my_wincond.c
+++ b/mysys/my_wincond.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
diff --git a/mysys/my_windac.c b/mysys/my_windac.c
index 2c1027e4aa6..c711093b48f 100644
--- a/mysys/my_windac.c
+++ b/mysys/my_windac.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
diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c
index 8aaf3b1e31c..27ccaef4f23 100644
--- a/mysys/my_winthread.c
+++ b/mysys/my_winthread.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
diff --git a/mysys/my_write.c b/mysys/my_write.c
index 26b9a4f2444..4c3d187e4e8 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.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
diff --git a/mysys/mysys_priv.h b/mysys/mysys_priv.h
index 89a6d8aa2a7..8a636e94626 100644
--- a/mysys/mysys_priv.h
+++ b/mysys/mysys_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/mysys/ptr_cmp.c b/mysys/ptr_cmp.c
index 57778574bb6..a3bc3702c34 100644
--- a/mysys/ptr_cmp.c
+++ b/mysys/ptr_cmp.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
diff --git a/mysys/queues.c b/mysys/queues.c
index 6a285ce7417..7809c97131c 100644
--- a/mysys/queues.c
+++ b/mysys/queues.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
diff --git a/mysys/raid.cc b/mysys/raid.cc
index 29819a878c4..c70c01fde4b 100644
--- a/mysys/raid.cc
+++ b/mysys/raid.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/mysys/raid2.c b/mysys/raid2.c
index 94b085b0074..4feace7410f 100644
--- a/mysys/raid2.c
+++ b/mysys/raid2.c
@@ -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/mysys/rijndael.c b/mysys/rijndael.c
index 43cd14101ca..8ba12b69b0d 100644
--- a/mysys/rijndael.c
+++ b/mysys/rijndael.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
diff --git a/mysys/safemalloc.c b/mysys/safemalloc.c
index b3466e36197..f43c860adb0 100644
--- a/mysys/safemalloc.c
+++ b/mysys/safemalloc.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
diff --git a/mysys/sha1.c b/mysys/sha1.c
index 110d24f8bfc..3cb8dfe706f 100644
--- a/mysys/sha1.c
+++ b/mysys/sha1.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
diff --git a/mysys/string.c b/mysys/string.c
index dfd42d137dd..e64156d430e 100644
--- a/mysys/string.c
+++ b/mysys/string.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
diff --git a/mysys/test_charset.c b/mysys/test_charset.c
index 419332cb997..08154e67863 100644
--- a/mysys/test_charset.c
+++ b/mysys/test_charset.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
diff --git a/mysys/test_dir.c b/mysys/test_dir.c
index f3d220e942f..f1e4987371b 100644
--- a/mysys/test_dir.c
+++ b/mysys/test_dir.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
diff --git a/mysys/test_fn.c b/mysys/test_fn.c
index d0fb9f59fd6..249cc878390 100644
--- a/mysys/test_fn.c
+++ b/mysys/test_fn.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
diff --git a/mysys/test_xml.c b/mysys/test_xml.c
index 2a679906cbf..0cb10e1c8d9 100644
--- a/mysys/test_xml.c
+++ b/mysys/test_xml.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
diff --git a/mysys/testhash.c b/mysys/testhash.c
index d15016113cd..fd2bc73b2ae 100644
--- a/mysys/testhash.c
+++ b/mysys/testhash.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
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index 41914080a9d..acb4ac5dbf9 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.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
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index 66848b94651..27203c2d23c 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.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
diff --git a/mysys/thr_mutex.c b/mysys/thr_mutex.c
index 1791bb6e4c4..425e5fce459 100644
--- a/mysys/thr_mutex.c
+++ b/mysys/thr_mutex.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
diff --git a/mysys/thr_rwlock.c b/mysys/thr_rwlock.c
index 29db2b997a0..0aa4d3fc3c4 100644
--- a/mysys/thr_rwlock.c
+++ b/mysys/thr_rwlock.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
diff --git a/mysys/tree.c b/mysys/tree.c
index f295fa15575..2e6868e0777 100644
--- a/mysys/tree.c
+++ b/mysys/tree.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
diff --git a/mysys/typelib.c b/mysys/typelib.c
index d329b687668..95bd16cfefd 100644
--- a/mysys/typelib.c
+++ b/mysys/typelib.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