diff options
| author | acurtis/antony@xiphis.org/ltamd64.xiphis.org <> | 2006-12-26 16:23:05 -0800 |
|---|---|---|
| committer | acurtis/antony@xiphis.org/ltamd64.xiphis.org <> | 2006-12-26 16:23:05 -0800 |
| commit | 82b03f29aca45ac4796ab6db8615651c75648328 (patch) | |
| tree | a659f9a60eff4e3c972feb3204d501eca9bba470 /server-tools/instance-manager/mysqlmanager.cc | |
| parent | 591712f53fb0c81bbec4a0b2eb087088280c1468 (diff) | |
| parent | 226a5c833f3084bc634996c70d47a1c0d9164e0d (diff) | |
| download | mariadb-git-82b03f29aca45ac4796ab6db8615651c75648328.tar.gz | |
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge
Diffstat (limited to 'server-tools/instance-manager/mysqlmanager.cc')
| -rw-r--r-- | server-tools/instance-manager/mysqlmanager.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc index ef714099de7..f23cee2ba03 100644 --- a/server-tools/instance-manager/mysqlmanager.cc +++ b/server-tools/instance-manager/mysqlmanager.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 |