diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-02-28 19:39:30 +0200 |
| commit | 3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e (patch) | |
| tree | da0e622896425203d23ecdfd1bc77b57e3502edf /scripts | |
| parent | 869f5d0e81d5cbecaec3605f292fbb363b9ccbf6 (diff) | |
| parent | f83e594218a6d19da2fa1ea2a01d860c30fe2913 (diff) | |
| download | mariadb-git-3358cdd5048671ee6cbbf50c291f7e0d0fda8e1e.tar.gz | |
Merge with 5.1 to get in changes from MySQL 5.1.55
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fill_help_tables.sql | 7 |
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); - |