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 | 32e0eeb14415a49ebdb1c1c6f91ab5f838680ce8 (patch) | |
| tree | bd2ccb10df21dbf734ede36704fc7486bcc0f491 /sql/sql_servers.cc | |
| parent | cd1585c9258da5cad3c3905ad93526beb4a79a46 (diff) | |
| parent | 68d41d6e65be79e7733b7193b78abb00ecc4a92f (diff) | |
| download | mariadb-git-32e0eeb14415a49ebdb1c1c6f91ab5f838680ce8.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 'sql/sql_servers.cc')
| -rw-r--r-- | sql/sql_servers.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_servers.cc b/sql/sql_servers.cc index 384135c069b..0ec7c54487a 100644 --- a/sql/sql_servers.cc +++ b/sql/sql_servers.cc @@ -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 |