merge with 3.23.51

1 files changed, 17 insertions, 14 deletions

diff --git a/isam/pack_isam.c b/isam/pack_isam.c
index 4a3a787ff5c..37aa33cdeee 100644
--- a/isam/pack_isam.c
+++ b/isam/pack_isam.c
@@ -1,17 +1,20 @@
-/* Copyright (C) 1979-1999 TcX AB & Monty Program KB & Detron HB
-
-   This software is distributed with NO WARRANTY OF ANY KIND.  No author or
-   distributor accepts any responsibility for the consequences of using it, or
-   for whether it serves any particular purpose or works at all, unless he or
-   she says so in writing.  Refer to the Free Public License (the "License")
-   for full details.
-   Every copy of this file must include a copy of the License, normally in a
-   plain ASCII text file named PUBLIC.	The License grants you the right to
-   copy, modify and redistribute this file, but only under certain conditions
-   described in the License.  Among other things, the License requires that
-   the copyright notice and this notice be preserved on all copies. */
-
-/* Pack isam file*/
+/* Copyright (C) 1979-2002 MySQL 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.
+   
+   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
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
+
+/* Pack isam file */
 
 #ifndef USE_MY_FUNC
 #define USE_MY_FUNC			/* We nead at least my_malloc */