Merge mysql.com:/space/my/mysql-4.1-merge

into mysql.com:/space/my/mysql-5.0


mysql-test/Makefile.am:
  Auto merged

1 files changed, 18 insertions, 0 deletions

diff --git a/scripts/fill_help_tables.sh b/scripts/fill_help_tables.sh
index fbe7c597b34..fc0c684c2dc 100644
--- a/scripts/fill_help_tables.sh
+++ b/scripts/fill_help_tables.sh
@@ -493,6 +493,24 @@ sub print_insert_header
   }
 }
 
+print <<EOF;
+-- Copyright (C) 2000-2005 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
+
+EOF
 print "delete from help_topic;\n";
 print "delete from help_category;\n";
 print "delete from help_keyword;\n";