diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-12-27 02:24:40 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-12-27 02:24:40 +0100 |
| commit | 3099886cda04701283645d1c59d04c7b2e66966c (patch) | |
| tree | bd2ccb10df21dbf734ede36704fc7486bcc0f491 /storage/federated | |
| parent | fcbfb41f30d794a14241070a44bba841ea0417d7 (diff) | |
| parent | 92e68d49d7318d7dc1eb1305e37ed4046fd85cb8 (diff) | |
| download | mariadb-git-3099886cda04701283645d1c59d04c7b2e66966c.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/main/mysql-5.1
include/mysql/plugin.h:
Auto merged
sql/sql_plugin.cc:
Auto merged
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/Makefile.am | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/federated/Makefile.am b/storage/federated/Makefile.am index a9f0bfcbb4a..66c82bcac96 100644 --- a/storage/federated/Makefile.am +++ b/storage/federated/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 |