summaryrefslogtreecommitdiff
path: root/include/mysql
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-12-27 02:24:40 +0100
committerkent@kent-amd64.(none) <>2006-12-27 02:24:40 +0100
commit2a10b999076b3a0378545f68bbf46ee4fe75dbe3 (patch)
treebd2ccb10df21dbf734ede36704fc7486bcc0f491 /include/mysql
parent54133c7e38a14847b5d2efe2e553c9affe846cd5 (diff)
parent1e3237fefa11f89318a51d8dcb39827ccc9d6180 (diff)
downloadmariadb-git-2a10b999076b3a0378545f68bbf46ee4fe75dbe3.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'include/mysql')
-rw-r--r--include/mysql/plugin.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h
index d5c4a975602..a98aeb25a47 100644
--- a/include/mysql/plugin.h
+++ b/include/mysql/plugin.h
@@ -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