summaryrefslogtreecommitdiff
path: root/netware
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-12-23 20:20:40 +0100
committerkent@kent-amd64.(none) <>2006-12-23 20:20:40 +0100
commitbe15e3bc15921085ea558f8764ed1fad137ccaa1 (patch)
tree5283b715c9535e3fdade4d3cf17559c467d87078 /netware
parent3368730535915c58d8bb68cffc35c53192002de6 (diff)
parent226a5c833f3084bc634996c70d47a1c0d9164e0d (diff)
downloadmariadb-git-be15e3bc15921085ea558f8764ed1fad137ccaa1.tar.gz
Merge mysql.com:/home/kent/bk/main/mysql-5.0
into mysql.com:/home/kent/bk/main/mysql-5.1
Diffstat (limited to 'netware')
-rw-r--r--netware/mysql_fix_privilege_tables.pl3
-rw-r--r--netware/mysql_secure_installation.pl3
2 files changed, 2 insertions, 4 deletions
diff --git a/netware/mysql_fix_privilege_tables.pl b/netware/mysql_fix_privilege_tables.pl
index 20af37be2d7..e40b4158e1c 100644
--- a/netware/mysql_fix_privilege_tables.pl
+++ b/netware/mysql_fix_privilege_tables.pl
@@ -3,8 +3,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
diff --git a/netware/mysql_secure_installation.pl b/netware/mysql_secure_installation.pl
index e363cacbc0d..8550f0e6d6e 100644
--- a/netware/mysql_secure_installation.pl
+++ b/netware/mysql_secure_installation.pl
@@ -3,8 +3,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