summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-03-09 15:47:59 +0200
committerMichael Widenius <monty@askmonty.org>2011-03-09 15:47:59 +0200
commit139a2b64bf8ec2e248656835e23a5c98ffc667a8 (patch)
tree7d77d6f1073f8090f275b30cb3f10254497da243 /scripts
parentb3f7eac5301529c2d069ebe4d0558980412af3a2 (diff)
parentce675406ca8dbc1532a908803a1371de8432d466 (diff)
downloadmariadb-git-139a2b64bf8ec2e248656835e23a5c98ffc667a8.tar.gz
Merge with 5.2
Diffstat (limited to 'scripts')
-rw-r--r--scripts/fill_help_tables.sql7
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/fill_help_tables.sql b/scripts/fill_help_tables.sql
index e3c230bfaca..30d30328e3d 100644
--- a/scripts/fill_help_tables.sql
+++ b/scripts/fill_help_tables.sql
@@ -1,4 +1,4 @@
--- Copyright (c) 2003, &year, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (C) 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
@@ -11,9 +11,7 @@
--
-- 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
--- DO NOT EDIT THIS FILE. It is generated automatically.
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- To use this file, load its contents into the mysql database. For example,
-- with the mysql client program, process the file like this, where
@@ -2012,4 +2010,3 @@ insert into help_relation (help_topic_id,help_keyword_id) values (206,447);
insert into help_relation (help_topic_id,help_keyword_id) values (464,447);
insert into help_relation (help_topic_id,help_keyword_id) values (198,448);
insert into help_relation (help_topic_id,help_keyword_id) values (464,449);
-