diff options
| author | unknown <guilhem@gbichot3.local> | 2007-03-02 11:20:23 +0100 |
|---|---|---|
| committer | unknown <guilhem@gbichot3.local> | 2007-03-02 11:20:23 +0100 |
| commit | 46922b5125e1cdbc0a79e7ba161aaa5fc515ae6b (patch) | |
| tree | 835f3f5d470f7c0a3aa080d1a89af02f7e8a9179 | |
| parent | a19644ceeefe80c5392810d932bf536ad6a4b23b (diff) | |
| download | mariadb-git-46922b5125e1cdbc0a79e7ba161aaa5fc515ae6b.tar.gz | |
GPL license update (same change as was done for all files in 5.1).
storage/maria/Makefile.am:
GPL license update
storage/maria/ft_maria.c:
GPL license update
storage/maria/ha_maria.cc:
GPL license update
storage/maria/ha_maria.h:
GPL license update
storage/maria/lockman.c:
GPL license update
storage/maria/lockman.h:
GPL license update
storage/maria/ma_bitmap.c:
GPL license update
storage/maria/ma_blockrec.c:
GPL license update
storage/maria/ma_blockrec.h:
GPL license update
storage/maria/ma_cache.c:
GPL license update
storage/maria/ma_changed.c:
GPL license update
storage/maria/ma_check.c:
GPL license update
storage/maria/ma_checkpoint.c:
GPL license update
storage/maria/ma_checkpoint.h:
GPL license update
storage/maria/ma_checksum.c:
GPL license update
storage/maria/ma_close.c:
GPL license update
storage/maria/ma_control_file.c:
GPL license update
storage/maria/ma_control_file.h:
GPL license update
storage/maria/ma_create.c:
GPL license update
storage/maria/ma_dbug.c:
GPL license update
storage/maria/ma_delete.c:
GPL license update
storage/maria/ma_delete_all.c:
GPL license update
storage/maria/ma_delete_table.c:
GPL license update
storage/maria/ma_dynrec.c:
GPL license update
storage/maria/ma_extra.c:
GPL license update
storage/maria/ma_ft_boolean_search.c:
GPL license update
storage/maria/ma_ft_eval.c:
GPL license update
storage/maria/ma_ft_eval.h:
GPL license update
storage/maria/ma_ft_nlq_search.c:
GPL license update
storage/maria/ma_ft_parser.c:
GPL license update
storage/maria/ma_ft_stem.c:
GPL license update
storage/maria/ma_ft_test1.c:
GPL license update
storage/maria/ma_ft_test1.h:
GPL license update
storage/maria/ma_ft_update.c:
GPL license update
storage/maria/ma_ftdefs.h:
GPL license update
storage/maria/ma_fulltext.h:
GPL license update
storage/maria/ma_info.c:
GPL license update
storage/maria/ma_init.c:
GPL license update
storage/maria/ma_key.c:
GPL license update
storage/maria/ma_keycache.c:
GPL license update
storage/maria/ma_least_recently_dirtied.c:
GPL license update
storage/maria/ma_least_recently_dirtied.h:
GPL license update
storage/maria/ma_locking.c:
GPL license update
storage/maria/ma_open.c:
GPL license update
storage/maria/ma_packrec.c:
GPL license update
storage/maria/ma_page.c:
GPL license update
storage/maria/ma_panic.c:
GPL license update
storage/maria/ma_preload.c:
GPL license update
storage/maria/ma_range.c:
GPL license update
storage/maria/ma_recovery.c:
GPL license update
storage/maria/ma_recovery.h:
GPL license update
storage/maria/ma_rename.c:
GPL license update
storage/maria/ma_rfirst.c:
GPL license update
storage/maria/ma_rkey.c:
GPL license update
storage/maria/ma_rlast.c:
GPL license update
storage/maria/ma_rnext.c:
GPL license update
storage/maria/ma_rnext_same.c:
GPL license update
storage/maria/ma_rprev.c:
GPL license update
storage/maria/ma_rrnd.c:
GPL license update
storage/maria/ma_rsame.c:
GPL license update
storage/maria/ma_rsamepos.c:
GPL license update
storage/maria/ma_rt_index.c:
GPL license update
storage/maria/ma_rt_index.h:
GPL license update
storage/maria/ma_rt_key.c:
GPL license update
storage/maria/ma_rt_key.h:
GPL license update
storage/maria/ma_rt_mbr.c:
GPL license update
storage/maria/ma_rt_mbr.h:
GPL license update
storage/maria/ma_rt_split.c:
GPL license update
storage/maria/ma_rt_test.c:
GPL license update
storage/maria/ma_scan.c:
GPL license update
storage/maria/ma_search.c:
GPL license update
storage/maria/ma_sort.c:
GPL license update
storage/maria/ma_sp_defs.h:
GPL license update
storage/maria/ma_sp_key.c:
GPL license update
storage/maria/ma_sp_test.c:
GPL license update
storage/maria/ma_static.c:
GPL license update
storage/maria/ma_statrec.c:
GPL license update
storage/maria/ma_test1.c:
GPL license update
storage/maria/ma_test2.c:
GPL license update
storage/maria/ma_test3.c:
GPL license update
storage/maria/ma_unique.c:
GPL license update
storage/maria/ma_update.c:
GPL license update
storage/maria/ma_write.c:
GPL license update
storage/maria/maria_chk.c:
GPL license update
storage/maria/maria_def.h:
GPL license update
storage/maria/maria_ftdump.c:
GPL license update
storage/maria/maria_pack.c:
GPL license update
storage/maria/tablockman.c:
GPL license update
storage/maria/tablockman.h:
GPL license update
storage/maria/trnman.c:
GPL license update
storage/maria/trnman.h:
GPL license update
91 files changed, 91 insertions, 182 deletions
diff --git a/storage/maria/Makefile.am b/storage/maria/Makefile.am index 8f3de170e16..78c711693d3 100644 --- a/storage/maria/Makefile.am +++ b/storage/maria/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/storage/maria/ft_maria.c b/storage/maria/ft_maria.c index 7104c6704ba..06e7c4bd59c 100644 --- a/storage/maria/ft_maria.c +++ b/storage/maria/ft_maria.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/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index a5e0722fd4a..5ffd991d58a 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.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/storage/maria/ha_maria.h b/storage/maria/ha_maria.h index 1f243f9ec59..e856189829e 100644 --- a/storage/maria/ha_maria.h +++ b/storage/maria/ha_maria.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/storage/maria/lockman.c b/storage/maria/lockman.c index fdacda84875..cb305dc9bd6 100644 --- a/storage/maria/lockman.c +++ b/storage/maria/lockman.c @@ -6,8 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of 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/storage/maria/lockman.h b/storage/maria/lockman.h index fd96f8930d5..279a5537f76 100644 --- a/storage/maria/lockman.h +++ b/storage/maria/lockman.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/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c index 5ed5a776658..f5cbaefb6bc 100644 --- a/storage/maria/ma_bitmap.c +++ b/storage/maria/ma_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/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index f1345b2c2f3..94209b8e41c 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.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/storage/maria/ma_blockrec.h b/storage/maria/ma_blockrec.h index ec99dbfcae2..bdb86eb717d 100644 --- a/storage/maria/ma_blockrec.h +++ b/storage/maria/ma_blockrec.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/storage/maria/ma_cache.c b/storage/maria/ma_cache.c index d6061c647ec..e8a4b20571b 100644 --- a/storage/maria/ma_cache.c +++ b/storage/maria/ma_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/storage/maria/ma_changed.c b/storage/maria/ma_changed.c index 9e86212baa6..4d0964581f6 100644 --- a/storage/maria/ma_changed.c +++ b/storage/maria/ma_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/storage/maria/ma_check.c b/storage/maria/ma_check.c index a247d36144c..f262917b706 100644 --- a/storage/maria/ma_check.c +++ b/storage/maria/ma_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/storage/maria/ma_checkpoint.c b/storage/maria/ma_checkpoint.c index 02d887f758a..ed5520f66bf 100644 --- a/storage/maria/ma_checkpoint.c +++ b/storage/maria/ma_checkpoint.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/storage/maria/ma_checkpoint.h b/storage/maria/ma_checkpoint.h index 1b8064fa755..1ce2ccb7012 100644 --- a/storage/maria/ma_checkpoint.h +++ b/storage/maria/ma_checkpoint.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/storage/maria/ma_checksum.c b/storage/maria/ma_checksum.c index 1b0f683fe63..140f500e64d 100644 --- a/storage/maria/ma_checksum.c +++ b/storage/maria/ma_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/storage/maria/ma_close.c b/storage/maria/ma_close.c index 508334fcf67..b38ce2a8cc3 100644 --- a/storage/maria/ma_close.c +++ b/storage/maria/ma_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/storage/maria/ma_control_file.c b/storage/maria/ma_control_file.c index 07eddb956a2..2caa0038df2 100644 --- a/storage/maria/ma_control_file.c +++ b/storage/maria/ma_control_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/storage/maria/ma_control_file.h b/storage/maria/ma_control_file.h index 616babc3bb2..159cd15b3d6 100644 --- a/storage/maria/ma_control_file.h +++ b/storage/maria/ma_control_file.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/storage/maria/ma_create.c b/storage/maria/ma_create.c index bd9382ff9b0..2e491448a71 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_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/storage/maria/ma_dbug.c b/storage/maria/ma_dbug.c index 596bf18bfe5..10c570c5794 100644 --- a/storage/maria/ma_dbug.c +++ b/storage/maria/ma_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/storage/maria/ma_delete.c b/storage/maria/ma_delete.c index 9198989dcb7..b576eec5e5e 100644 --- a/storage/maria/ma_delete.c +++ b/storage/maria/ma_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/storage/maria/ma_delete_all.c b/storage/maria/ma_delete_all.c index 428724ec313..5a5ec98fe06 100644 --- a/storage/maria/ma_delete_all.c +++ b/storage/maria/ma_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/storage/maria/ma_delete_table.c b/storage/maria/ma_delete_table.c index 47ba56e031c..aafe7a1dee9 100644 --- a/storage/maria/ma_delete_table.c +++ b/storage/maria/ma_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/storage/maria/ma_dynrec.c b/storage/maria/ma_dynrec.c index 52780ab4f6f..a3fd323d059 100644 --- a/storage/maria/ma_dynrec.c +++ b/storage/maria/ma_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/storage/maria/ma_extra.c b/storage/maria/ma_extra.c index 59ae18d949a..d654d5b2656 100644 --- a/storage/maria/ma_extra.c +++ b/storage/maria/ma_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/storage/maria/ma_ft_boolean_search.c b/storage/maria/ma_ft_boolean_search.c index af76f0858a7..6e95262fe84 100644 --- a/storage/maria/ma_ft_boolean_search.c +++ b/storage/maria/ma_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/storage/maria/ma_ft_eval.c b/storage/maria/ma_ft_eval.c index fe4900aeb64..50584459b7d 100644 --- a/storage/maria/ma_ft_eval.c +++ b/storage/maria/ma_ft_eval.c @@ -1,8 +1,7 @@ /* Copyright (C) 2006 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/storage/maria/ma_ft_eval.h b/storage/maria/ma_ft_eval.h index d9b5c51642c..481943dfb0b 100644 --- a/storage/maria/ma_ft_eval.h +++ b/storage/maria/ma_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/storage/maria/ma_ft_nlq_search.c b/storage/maria/ma_ft_nlq_search.c index 4c922516455..145b7891dd1 100644 --- a/storage/maria/ma_ft_nlq_search.c +++ b/storage/maria/ma_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/storage/maria/ma_ft_parser.c b/storage/maria/ma_ft_parser.c index 24713c1344f..f41b53bf3f7 100644 --- a/storage/maria/ma_ft_parser.c +++ b/storage/maria/ma_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/storage/maria/ma_ft_stem.c b/storage/maria/ma_ft_stem.c index 7a2f8cfd7c5..06fc0b2df6c 100644 --- a/storage/maria/ma_ft_stem.c +++ b/storage/maria/ma_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/storage/maria/ma_ft_test1.c b/storage/maria/ma_ft_test1.c index 595c31e774c..2b087dde35e 100644 --- a/storage/maria/ma_ft_test1.c +++ b/storage/maria/ma_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/storage/maria/ma_ft_test1.h b/storage/maria/ma_ft_test1.h index 9449f063125..5883c42f5c5 100644 --- a/storage/maria/ma_ft_test1.h +++ b/storage/maria/ma_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/storage/maria/ma_ft_update.c b/storage/maria/ma_ft_update.c index 25f4d5a67a0..cd2e121d0ed 100644 --- a/storage/maria/ma_ft_update.c +++ b/storage/maria/ma_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/storage/maria/ma_ftdefs.h b/storage/maria/ma_ftdefs.h index def7e92e6e0..e25687d54b9 100644 --- a/storage/maria/ma_ftdefs.h +++ b/storage/maria/ma_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/storage/maria/ma_fulltext.h b/storage/maria/ma_fulltext.h index cf21471b316..778ffd49196 100644 --- a/storage/maria/ma_fulltext.h +++ b/storage/maria/ma_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/storage/maria/ma_info.c b/storage/maria/ma_info.c index 397cd2465d4..45a67db605c 100644 --- a/storage/maria/ma_info.c +++ b/storage/maria/ma_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/storage/maria/ma_init.c b/storage/maria/ma_init.c index 679aa8c6f8f..271eac6c6d1 100644 --- a/storage/maria/ma_init.c +++ b/storage/maria/ma_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/storage/maria/ma_key.c b/storage/maria/ma_key.c index 036fd305c4d..920b59b5b54 100644 --- a/storage/maria/ma_key.c +++ b/storage/maria/ma_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/storage/maria/ma_keycache.c b/storage/maria/ma_keycache.c index 64725baae86..c52188a1717 100644 --- a/storage/maria/ma_keycache.c +++ b/storage/maria/ma_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/storage/maria/ma_least_recently_dirtied.c b/storage/maria/ma_least_recently_dirtied.c index 170e59a601a..3d2c85bbf98 100644 --- a/storage/maria/ma_least_recently_dirtied.c +++ b/storage/maria/ma_least_recently_dirtied.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/storage/maria/ma_least_recently_dirtied.h b/storage/maria/ma_least_recently_dirtied.h index f6d7420febc..1d57f3596f8 100644 --- a/storage/maria/ma_least_recently_dirtied.h +++ b/storage/maria/ma_least_recently_dirtied.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/storage/maria/ma_locking.c b/storage/maria/ma_locking.c index e41b2d490dc..f280af130ac 100644 --- a/storage/maria/ma_locking.c +++ b/storage/maria/ma_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/storage/maria/ma_open.c b/storage/maria/ma_open.c index 7c4ad4c4a0a..86376404f74 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_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/storage/maria/ma_packrec.c b/storage/maria/ma_packrec.c index 4e74653192e..7134297710d 100644 --- a/storage/maria/ma_packrec.c +++ b/storage/maria/ma_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/storage/maria/ma_page.c b/storage/maria/ma_page.c index d0a11ad08ab..1b013b6a0da 100644 --- a/storage/maria/ma_page.c +++ b/storage/maria/ma_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/storage/maria/ma_panic.c b/storage/maria/ma_panic.c index c1312cb1e77..e2e582bb390 100644 --- a/storage/maria/ma_panic.c +++ b/storage/maria/ma_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/storage/maria/ma_preload.c b/storage/maria/ma_preload.c index f387f2b7de3..4b2df2bbf17 100644 --- a/storage/maria/ma_preload.c +++ b/storage/maria/ma_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/storage/maria/ma_range.c b/storage/maria/ma_range.c index 4c5a037eb67..798ca348f92 100644 --- a/storage/maria/ma_range.c +++ b/storage/maria/ma_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/storage/maria/ma_recovery.c b/storage/maria/ma_recovery.c index b6739b86874..a42fbdf0458 100644 --- a/storage/maria/ma_recovery.c +++ b/storage/maria/ma_recovery.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/storage/maria/ma_recovery.h b/storage/maria/ma_recovery.h index 05026f4b52a..d2901f5724c 100644 --- a/storage/maria/ma_recovery.h +++ b/storage/maria/ma_recovery.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/storage/maria/ma_rename.c b/storage/maria/ma_rename.c index 59a2315b18b..a80bbcd398f 100644 --- a/storage/maria/ma_rename.c +++ b/storage/maria/ma_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/storage/maria/ma_rfirst.c b/storage/maria/ma_rfirst.c index 6fa8af75c40..04c496d9c56 100644 --- a/storage/maria/ma_rfirst.c +++ b/storage/maria/ma_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/storage/maria/ma_rkey.c b/storage/maria/ma_rkey.c index ad27d3c286c..c02c18094e8 100644 --- a/storage/maria/ma_rkey.c +++ b/storage/maria/ma_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/storage/maria/ma_rlast.c b/storage/maria/ma_rlast.c index 504cc89aed3..ebd039843c8 100644 --- a/storage/maria/ma_rlast.c +++ b/storage/maria/ma_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/storage/maria/ma_rnext.c b/storage/maria/ma_rnext.c index c7feded933e..ccca05ff3ad 100644 --- a/storage/maria/ma_rnext.c +++ b/storage/maria/ma_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/storage/maria/ma_rnext_same.c b/storage/maria/ma_rnext_same.c index a5ce0cfe15c..207a438e10b 100644 --- a/storage/maria/ma_rnext_same.c +++ b/storage/maria/ma_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/storage/maria/ma_rprev.c b/storage/maria/ma_rprev.c index ea562359ded..5e7cfc9f41a 100644 --- a/storage/maria/ma_rprev.c +++ b/storage/maria/ma_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/storage/maria/ma_rrnd.c b/storage/maria/ma_rrnd.c index 33940d5f23f..8d1bf9aa4f6 100644 --- a/storage/maria/ma_rrnd.c +++ b/storage/maria/ma_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/storage/maria/ma_rsame.c b/storage/maria/ma_rsame.c index 7556c1e7332..052fe79af58 100644 --- a/storage/maria/ma_rsame.c +++ b/storage/maria/ma_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/storage/maria/ma_rsamepos.c b/storage/maria/ma_rsamepos.c index 92138693c62..1e09bdb8db4 100644 --- a/storage/maria/ma_rsamepos.c +++ b/storage/maria/ma_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/storage/maria/ma_rt_index.c b/storage/maria/ma_rt_index.c index cefbcffcbf9..b941c77f44d 100644 --- a/storage/maria/ma_rt_index.c +++ b/storage/maria/ma_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/storage/maria/ma_rt_index.h b/storage/maria/ma_rt_index.h index 76b6c6e230c..c98422144e2 100644 --- a/storage/maria/ma_rt_index.h +++ b/storage/maria/ma_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/storage/maria/ma_rt_key.c b/storage/maria/ma_rt_key.c index 1453195d263..d88b2582be4 100644 --- a/storage/maria/ma_rt_key.c +++ b/storage/maria/ma_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/storage/maria/ma_rt_key.h b/storage/maria/ma_rt_key.h index f44251782c1..03c9ef46438 100644 --- a/storage/maria/ma_rt_key.h +++ b/storage/maria/ma_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/storage/maria/ma_rt_mbr.c b/storage/maria/ma_rt_mbr.c index 851618a4300..2da4ffea7a4 100644 --- a/storage/maria/ma_rt_mbr.c +++ b/storage/maria/ma_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/storage/maria/ma_rt_mbr.h b/storage/maria/ma_rt_mbr.h index 3282ee0d7a3..01da74418a6 100644 --- a/storage/maria/ma_rt_mbr.h +++ b/storage/maria/ma_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/storage/maria/ma_rt_split.c b/storage/maria/ma_rt_split.c index a81b2b932ec..4e0abdcdb6d 100644 --- a/storage/maria/ma_rt_split.c +++ b/storage/maria/ma_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/storage/maria/ma_rt_test.c b/storage/maria/ma_rt_test.c index 04b0c88c222..4360e81c550 100644 --- a/storage/maria/ma_rt_test.c +++ b/storage/maria/ma_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/storage/maria/ma_scan.c b/storage/maria/ma_scan.c index 4538c87e2be..4ed4027378e 100644 --- a/storage/maria/ma_scan.c +++ b/storage/maria/ma_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/storage/maria/ma_search.c b/storage/maria/ma_search.c index 991115ad181..5db09cc9618 100644 --- a/storage/maria/ma_search.c +++ b/storage/maria/ma_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/storage/maria/ma_sort.c b/storage/maria/ma_sort.c index 2c5524906ad..d6256deb39c 100644 --- a/storage/maria/ma_sort.c +++ b/storage/maria/ma_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/storage/maria/ma_sp_defs.h b/storage/maria/ma_sp_defs.h index 6aac741bb2c..a2870bfa062 100644 --- a/storage/maria/ma_sp_defs.h +++ b/storage/maria/ma_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/storage/maria/ma_sp_key.c b/storage/maria/ma_sp_key.c index b365f8deb0f..06769e97d30 100644 --- a/storage/maria/ma_sp_key.c +++ b/storage/maria/ma_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/storage/maria/ma_sp_test.c b/storage/maria/ma_sp_test.c index 1ac1a74d7d7..bab346ca18d 100644 --- a/storage/maria/ma_sp_test.c +++ b/storage/maria/ma_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 diff --git a/storage/maria/ma_static.c b/storage/maria/ma_static.c index c5580e1e981..c747d07bc8e 100644 --- a/storage/maria/ma_static.c +++ b/storage/maria/ma_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/storage/maria/ma_statrec.c b/storage/maria/ma_statrec.c index 72c5e10d9ab..68864e7c170 100644 --- a/storage/maria/ma_statrec.c +++ b/storage/maria/ma_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/storage/maria/ma_test1.c b/storage/maria/ma_test1.c index 0f37391c1d4..1cb8c3e002a 100644 --- a/storage/maria/ma_test1.c +++ b/storage/maria/ma_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/storage/maria/ma_test2.c b/storage/maria/ma_test2.c index 46b8c710d4a..4ec5afd35e7 100644 --- a/storage/maria/ma_test2.c +++ b/storage/maria/ma_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/storage/maria/ma_test3.c b/storage/maria/ma_test3.c index f6ed248ce16..9177b87ac4b 100644 --- a/storage/maria/ma_test3.c +++ b/storage/maria/ma_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/storage/maria/ma_unique.c b/storage/maria/ma_unique.c index 5d0133c8ac1..06d29b9b037 100644 --- a/storage/maria/ma_unique.c +++ b/storage/maria/ma_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/storage/maria/ma_update.c b/storage/maria/ma_update.c index 29018b47bda..8c8e46bc024 100644 --- a/storage/maria/ma_update.c +++ b/storage/maria/ma_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/storage/maria/ma_write.c b/storage/maria/ma_write.c index b672ed1fe23..ec84eabd421 100644 --- a/storage/maria/ma_write.c +++ b/storage/maria/ma_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/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 533766e35f9..5796ae1a196 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.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/storage/maria/maria_def.h b/storage/maria/maria_def.h index f4684735938..8f54001ad45 100644 --- a/storage/maria/maria_def.h +++ b/storage/maria/maria_def.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/storage/maria/maria_ftdump.c b/storage/maria/maria_ftdump.c index ef30540bfce..f1d80d90828 100644 --- a/storage/maria/maria_ftdump.c +++ b/storage/maria/maria_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/storage/maria/maria_pack.c b/storage/maria/maria_pack.c index a76b1027179..dbd48e62d29 100644 --- a/storage/maria/maria_pack.c +++ b/storage/maria/maria_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/storage/maria/tablockman.c b/storage/maria/tablockman.c index 810c6c12ea4..4634f60a085 100644 --- a/storage/maria/tablockman.c +++ b/storage/maria/tablockman.c @@ -4,8 +4,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + the Free Software Foundation; version 2 of 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/storage/maria/tablockman.h b/storage/maria/tablockman.h index 2c6fb6996a3..58c852b5a21 100644 --- a/storage/maria/tablockman.h +++ b/storage/maria/tablockman.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/storage/maria/trnman.c b/storage/maria/trnman.c index 37978e4ff76..7918c1aa00d 100644 --- a/storage/maria/trnman.c +++ b/storage/maria/trnman.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/storage/maria/trnman.h b/storage/maria/trnman.h index 267e3cabd7a..87107ab52fb 100644 --- a/storage/maria/trnman.h +++ b/storage/maria/trnman.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 |