summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
Diffstat (limited to 'myisam')
-rw-r--r--myisam/Makefile.am3
-rw-r--r--myisam/ft_boolean_search.c3
-rw-r--r--myisam/ft_eval.c3
-rw-r--r--myisam/ft_eval.h3
-rw-r--r--myisam/ft_nlq_search.c3
-rw-r--r--myisam/ft_parser.c3
-rw-r--r--myisam/ft_static.c3
-rw-r--r--myisam/ft_stem.c3
-rw-r--r--myisam/ft_stopwords.c3
-rw-r--r--myisam/ft_test1.c3
-rw-r--r--myisam/ft_test1.h3
-rw-r--r--myisam/ft_update.c3
-rw-r--r--myisam/ftdefs.h3
-rw-r--r--myisam/fulltext.h3
-rw-r--r--myisam/mi_cache.c3
-rw-r--r--myisam/mi_changed.c3
-rw-r--r--myisam/mi_check.c3
-rw-r--r--myisam/mi_checksum.c3
-rw-r--r--myisam/mi_close.c3
-rw-r--r--myisam/mi_create.c3
-rw-r--r--myisam/mi_dbug.c3
-rw-r--r--myisam/mi_delete.c3
-rw-r--r--myisam/mi_delete_all.c3
-rw-r--r--myisam/mi_delete_table.c3
-rw-r--r--myisam/mi_dynrec.c3
-rw-r--r--myisam/mi_extra.c3
-rw-r--r--myisam/mi_info.c3
-rw-r--r--myisam/mi_key.c3
-rw-r--r--myisam/mi_keycache.c3
-rw-r--r--myisam/mi_locking.c3
-rw-r--r--myisam/mi_log.c3
-rw-r--r--myisam/mi_open.c3
-rw-r--r--myisam/mi_packrec.c3
-rw-r--r--myisam/mi_page.c3
-rw-r--r--myisam/mi_panic.c3
-rw-r--r--myisam/mi_preload.c3
-rw-r--r--myisam/mi_range.c3
-rw-r--r--myisam/mi_rename.c3
-rw-r--r--myisam/mi_rfirst.c3
-rw-r--r--myisam/mi_rkey.c3
-rw-r--r--myisam/mi_rlast.c3
-rw-r--r--myisam/mi_rnext.c3
-rw-r--r--myisam/mi_rnext_same.c3
-rw-r--r--myisam/mi_rprev.c3
-rw-r--r--myisam/mi_rrnd.c3
-rw-r--r--myisam/mi_rsame.c3
-rw-r--r--myisam/mi_rsamepos.c3
-rw-r--r--myisam/mi_scan.c3
-rw-r--r--myisam/mi_search.c3
-rw-r--r--myisam/mi_static.c3
-rw-r--r--myisam/mi_statrec.c3
-rw-r--r--myisam/mi_test1.c3
-rw-r--r--myisam/mi_test2.c3
-rw-r--r--myisam/mi_test3.c3
-rw-r--r--myisam/mi_unique.c3
-rw-r--r--myisam/mi_update.c3
-rw-r--r--myisam/mi_write.c3
-rw-r--r--myisam/myisam_ftdump.c3
-rw-r--r--myisam/myisamchk.c3
-rw-r--r--myisam/myisamdef.h3
-rw-r--r--myisam/myisamlog.c3
-rw-r--r--myisam/myisampack.c3
-rw-r--r--myisam/rt_index.c3
-rw-r--r--myisam/rt_index.h3
-rw-r--r--myisam/rt_key.c3
-rw-r--r--myisam/rt_key.h3
-rw-r--r--myisam/rt_mbr.c3
-rw-r--r--myisam/rt_mbr.h3
-rw-r--r--myisam/rt_split.c3
-rw-r--r--myisam/rt_test.c3
-rw-r--r--myisam/sort.c3
-rw-r--r--myisam/sp_defs.h3
-rw-r--r--myisam/sp_key.c3
-rw-r--r--myisam/sp_test.c3
74 files changed, 74 insertions, 148 deletions
diff --git a/myisam/Makefile.am b/myisam/Makefile.am
index 081d7facf3a..09ebae2db5c 100644
--- a/myisam/Makefile.am
+++ b/myisam/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/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index 19f0ef77136..e194ef1c8a0 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.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/myisam/ft_eval.c b/myisam/ft_eval.c
index 34248c69f20..1bc05cfab6e 100644
--- a/myisam/ft_eval.c
+++ b/myisam/ft_eval.c
@@ -1,8 +1,7 @@
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ the Free Software Foundation; 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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
diff --git a/myisam/ft_eval.h b/myisam/ft_eval.h
index 5501fe9d34b..9acc1a60d09 100644
--- a/myisam/ft_eval.h
+++ b/myisam/ft_eval.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/myisam/ft_nlq_search.c b/myisam/ft_nlq_search.c
index 8460db61a36..fc7137c9db0 100644
--- a/myisam/ft_nlq_search.c
+++ b/myisam/ft_nlq_search.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/myisam/ft_parser.c b/myisam/ft_parser.c
index 6e79696bd6e..95efa3eeb9a 100644
--- a/myisam/ft_parser.c
+++ b/myisam/ft_parser.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/myisam/ft_static.c b/myisam/ft_static.c
index e221950f445..0d3ac50be2a 100644
--- a/myisam/ft_static.c
+++ b/myisam/ft_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/myisam/ft_stem.c b/myisam/ft_stem.c
index 846d5d2247f..5600cb14e15 100644
--- a/myisam/ft_stem.c
+++ b/myisam/ft_stem.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/myisam/ft_stopwords.c b/myisam/ft_stopwords.c
index ab51afb0e82..b3f14a91985 100644
--- a/myisam/ft_stopwords.c
+++ b/myisam/ft_stopwords.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/myisam/ft_test1.c b/myisam/ft_test1.c
index 14be9aa1e8c..1f354eb7bae 100644
--- a/myisam/ft_test1.c
+++ b/myisam/ft_test1.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/myisam/ft_test1.h b/myisam/ft_test1.h
index e360244057b..4b991ff9502 100644
--- a/myisam/ft_test1.h
+++ b/myisam/ft_test1.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/myisam/ft_update.c b/myisam/ft_update.c
index 7fa86094144..d8be7268cf0 100644
--- a/myisam/ft_update.c
+++ b/myisam/ft_update.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/myisam/ftdefs.h b/myisam/ftdefs.h
index 91c679a1e58..545c3def1a8 100644
--- a/myisam/ftdefs.h
+++ b/myisam/ftdefs.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/myisam/fulltext.h b/myisam/fulltext.h
index d8c74d4e94b..5e50461edf6 100644
--- a/myisam/fulltext.h
+++ b/myisam/fulltext.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/myisam/mi_cache.c b/myisam/mi_cache.c
index 8dee068c50e..e9591d645df 100644
--- a/myisam/mi_cache.c
+++ b/myisam/mi_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/myisam/mi_changed.c b/myisam/mi_changed.c
index c2ab5568eba..aaac3b449ad 100644
--- a/myisam/mi_changed.c
+++ b/myisam/mi_changed.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/myisam/mi_check.c b/myisam/mi_check.c
index 06fdd3bff4c..51dbb59a55f 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.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/myisam/mi_checksum.c b/myisam/mi_checksum.c
index 33a51068fb0..41b26118a9f 100644
--- a/myisam/mi_checksum.c
+++ b/myisam/mi_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/myisam/mi_close.c b/myisam/mi_close.c
index 8a4f6ee7f5d..1691e9abb50 100644
--- a/myisam/mi_close.c
+++ b/myisam/mi_close.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/myisam/mi_create.c b/myisam/mi_create.c
index 7515438f3a4..a9914d6fdb7 100644
--- a/myisam/mi_create.c
+++ b/myisam/mi_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/myisam/mi_dbug.c b/myisam/mi_dbug.c
index ddc8a403a33..c328fd79e65 100644
--- a/myisam/mi_dbug.c
+++ b/myisam/mi_dbug.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/myisam/mi_delete.c b/myisam/mi_delete.c
index 471420d99c0..2016cd6dccc 100644
--- a/myisam/mi_delete.c
+++ b/myisam/mi_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/myisam/mi_delete_all.c b/myisam/mi_delete_all.c
index a30abb95070..ce6d3ddc539 100644
--- a/myisam/mi_delete_all.c
+++ b/myisam/mi_delete_all.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/myisam/mi_delete_table.c b/myisam/mi_delete_table.c
index 2fba31cf8be..2a41f687b85 100644
--- a/myisam/mi_delete_table.c
+++ b/myisam/mi_delete_table.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/myisam/mi_dynrec.c b/myisam/mi_dynrec.c
index 6590e6bd92b..0919569e66e 100644
--- a/myisam/mi_dynrec.c
+++ b/myisam/mi_dynrec.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/myisam/mi_extra.c b/myisam/mi_extra.c
index 7c0dd13b870..72030418d77 100644
--- a/myisam/mi_extra.c
+++ b/myisam/mi_extra.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/myisam/mi_info.c b/myisam/mi_info.c
index bdece9c2ee3..81df629d981 100644
--- a/myisam/mi_info.c
+++ b/myisam/mi_info.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/myisam/mi_key.c b/myisam/mi_key.c
index c6f9799bd67..8c3546938b3 100644
--- a/myisam/mi_key.c
+++ b/myisam/mi_key.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/myisam/mi_keycache.c b/myisam/mi_keycache.c
index d595be3a684..bb465dbecce 100644
--- a/myisam/mi_keycache.c
+++ b/myisam/mi_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/myisam/mi_locking.c b/myisam/mi_locking.c
index 36b793363c5..b8c9c0b5a16 100644
--- a/myisam/mi_locking.c
+++ b/myisam/mi_locking.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/myisam/mi_log.c b/myisam/mi_log.c
index 13842c56828..256522cd317 100644
--- a/myisam/mi_log.c
+++ b/myisam/mi_log.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/myisam/mi_open.c b/myisam/mi_open.c
index ab004ef8b5f..557880daef0 100644
--- a/myisam/mi_open.c
+++ b/myisam/mi_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/myisam/mi_packrec.c b/myisam/mi_packrec.c
index 13898df0466..10604fe22fc 100644
--- a/myisam/mi_packrec.c
+++ b/myisam/mi_packrec.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/myisam/mi_page.c b/myisam/mi_page.c
index d18a10c3cde..2c497dbcf46 100644
--- a/myisam/mi_page.c
+++ b/myisam/mi_page.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/myisam/mi_panic.c b/myisam/mi_panic.c
index 78698d88c54..aba41a1713f 100644
--- a/myisam/mi_panic.c
+++ b/myisam/mi_panic.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/myisam/mi_preload.c b/myisam/mi_preload.c
index d63399b519d..28228fcf976 100644
--- a/myisam/mi_preload.c
+++ b/myisam/mi_preload.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/myisam/mi_range.c b/myisam/mi_range.c
index a28aed81aec..5a6a5cb0c92 100644
--- a/myisam/mi_range.c
+++ b/myisam/mi_range.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/myisam/mi_rename.c b/myisam/mi_rename.c
index 8380ee1bfad..e07a4751e7c 100644
--- a/myisam/mi_rename.c
+++ b/myisam/mi_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/myisam/mi_rfirst.c b/myisam/mi_rfirst.c
index e30f61801a0..e95324976c6 100644
--- a/myisam/mi_rfirst.c
+++ b/myisam/mi_rfirst.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/myisam/mi_rkey.c b/myisam/mi_rkey.c
index 43be34f6ebb..4f0c8afcf0d 100644
--- a/myisam/mi_rkey.c
+++ b/myisam/mi_rkey.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/myisam/mi_rlast.c b/myisam/mi_rlast.c
index 61c3ff58fd5..4904c2c6280 100644
--- a/myisam/mi_rlast.c
+++ b/myisam/mi_rlast.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/myisam/mi_rnext.c b/myisam/mi_rnext.c
index 69bf5c8deae..eb5289500cf 100644
--- a/myisam/mi_rnext.c
+++ b/myisam/mi_rnext.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/myisam/mi_rnext_same.c b/myisam/mi_rnext_same.c
index 64d8d9b0baa..13962de635e 100644
--- a/myisam/mi_rnext_same.c
+++ b/myisam/mi_rnext_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/myisam/mi_rprev.c b/myisam/mi_rprev.c
index b787210e037..686d148bf94 100644
--- a/myisam/mi_rprev.c
+++ b/myisam/mi_rprev.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/myisam/mi_rrnd.c b/myisam/mi_rrnd.c
index f6a2f021662..c6098deae58 100644
--- a/myisam/mi_rrnd.c
+++ b/myisam/mi_rrnd.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/myisam/mi_rsame.c b/myisam/mi_rsame.c
index 321097744b9..94a72c7ec2a 100644
--- a/myisam/mi_rsame.c
+++ b/myisam/mi_rsame.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/myisam/mi_rsamepos.c b/myisam/mi_rsamepos.c
index 35cdd41e297..5f680e7f86e 100644
--- a/myisam/mi_rsamepos.c
+++ b/myisam/mi_rsamepos.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/myisam/mi_scan.c b/myisam/mi_scan.c
index 90bc3430ba7..f0ace427d67 100644
--- a/myisam/mi_scan.c
+++ b/myisam/mi_scan.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/myisam/mi_search.c b/myisam/mi_search.c
index 05f8459a4b4..ddd0cf03d77 100644
--- a/myisam/mi_search.c
+++ b/myisam/mi_search.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/myisam/mi_static.c b/myisam/mi_static.c
index fc585eb5543..1e9ecae93c2 100644
--- a/myisam/mi_static.c
+++ b/myisam/mi_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/myisam/mi_statrec.c b/myisam/mi_statrec.c
index 5e6ea939eca..e7bb1d56b00 100644
--- a/myisam/mi_statrec.c
+++ b/myisam/mi_statrec.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/myisam/mi_test1.c b/myisam/mi_test1.c
index 60225ccc7f3..1487f66d0de 100644
--- a/myisam/mi_test1.c
+++ b/myisam/mi_test1.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/myisam/mi_test2.c b/myisam/mi_test2.c
index 0959769992c..a155bbde693 100644
--- a/myisam/mi_test2.c
+++ b/myisam/mi_test2.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/myisam/mi_test3.c b/myisam/mi_test3.c
index be4277cc65c..5fd2756ade1 100644
--- a/myisam/mi_test3.c
+++ b/myisam/mi_test3.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/myisam/mi_unique.c b/myisam/mi_unique.c
index b698968127b..8f934cda42f 100644
--- a/myisam/mi_unique.c
+++ b/myisam/mi_unique.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/myisam/mi_update.c b/myisam/mi_update.c
index 9ddda3f5ea9..ef517266337 100644
--- a/myisam/mi_update.c
+++ b/myisam/mi_update.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/myisam/mi_write.c b/myisam/mi_write.c
index fb64ec2bb8b..43483df35a1 100644
--- a/myisam/mi_write.c
+++ b/myisam/mi_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/myisam/myisam_ftdump.c b/myisam/myisam_ftdump.c
index 2be95d11714..d6f2d822da0 100644
--- a/myisam/myisam_ftdump.c
+++ b/myisam/myisam_ftdump.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/myisam/myisamchk.c b/myisam/myisamchk.c
index e2c8b446322..eab06525cd4 100644
--- a/myisam/myisamchk.c
+++ b/myisam/myisamchk.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/myisam/myisamdef.h b/myisam/myisamdef.h
index 12e2c8e4bec..f3cf1684daa 100644
--- a/myisam/myisamdef.h
+++ b/myisam/myisamdef.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/myisam/myisamlog.c b/myisam/myisamlog.c
index 17af4ab34a2..d5d791e62c8 100644
--- a/myisam/myisamlog.c
+++ b/myisam/myisamlog.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/myisam/myisampack.c b/myisam/myisampack.c
index c71fcce1d50..b33c8fe87c3 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.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/myisam/rt_index.c b/myisam/rt_index.c
index 1806476dc39..26402380e5f 100644
--- a/myisam/rt_index.c
+++ b/myisam/rt_index.c
@@ -3,8 +3,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/myisam/rt_index.h b/myisam/rt_index.h
index d3fcd934719..65128f4fcfa 100644
--- a/myisam/rt_index.h
+++ b/myisam/rt_index.h
@@ -3,8 +3,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/myisam/rt_key.c b/myisam/rt_key.c
index e2a402fbefd..cb6a82c51f6 100644
--- a/myisam/rt_key.c
+++ b/myisam/rt_key.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/myisam/rt_key.h b/myisam/rt_key.h
index df4f8aa03a2..43d1c92a4c2 100644
--- a/myisam/rt_key.h
+++ b/myisam/rt_key.h
@@ -3,8 +3,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/myisam/rt_mbr.c b/myisam/rt_mbr.c
index 897862c1c9a..f73dd8ac516 100644
--- a/myisam/rt_mbr.c
+++ b/myisam/rt_mbr.c
@@ -3,8 +3,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/myisam/rt_mbr.h b/myisam/rt_mbr.h
index 2153faad2b4..c64383ecafd 100644
--- a/myisam/rt_mbr.h
+++ b/myisam/rt_mbr.h
@@ -3,8 +3,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/myisam/rt_split.c b/myisam/rt_split.c
index 31a7d09ab4f..b3312d37fc9 100644
--- a/myisam/rt_split.c
+++ b/myisam/rt_split.c
@@ -3,8 +3,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/myisam/rt_test.c b/myisam/rt_test.c
index 4f04aa11fce..353d70a5208 100644
--- a/myisam/rt_test.c
+++ b/myisam/rt_test.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/myisam/sort.c b/myisam/sort.c
index eebef888e4a..d8444b4846d 100644
--- a/myisam/sort.c
+++ b/myisam/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/myisam/sp_defs.h b/myisam/sp_defs.h
index 4cc2267a1bd..636e806ecfc 100644
--- a/myisam/sp_defs.h
+++ b/myisam/sp_defs.h
@@ -3,8 +3,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/myisam/sp_key.c b/myisam/sp_key.c
index 77cecdc0931..34c96a219c7 100644
--- a/myisam/sp_key.c
+++ b/myisam/sp_key.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/myisam/sp_test.c b/myisam/sp_test.c
index f0b48dbd5d8..0457a210f02 100644
--- a/myisam/sp_test.c
+++ b/myisam/sp_test.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