summaryrefslogtreecommitdiff
path: root/sql/sql_map.h
diff options
context:
space:
mode:
authortsmith/tim@siva.hindu.god <>2006-12-26 22:28:28 -0700
committertsmith/tim@siva.hindu.god <>2006-12-26 22:28:28 -0700
commit682596d7ce081c6382316f9efa7a8b7e6881bdf2 (patch)
tree5f7a3a3b0a880c0f3e9cd49a429b8febcd020650 /sql/sql_map.h
parent828121bd6d3e2fc3fbbde554fbf5182517698bb8 (diff)
parent82b03f29aca45ac4796ab6db8615651c75648328 (diff)
downloadmariadb-git-682596d7ce081c6382316f9efa7a8b7e6881bdf2.tar.gz
Merge siva.hindu.god:/usr/home/tim/m/bk/g50
into siva.hindu.god:/usr/home/tim/m/bk/50
Diffstat (limited to 'sql/sql_map.h')
-rw-r--r--sql/sql_map.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_map.h b/sql/sql_map.h
index bfa6011ac54..e6dd60eb5aa 100644
--- a/sql/sql_map.h
+++ b/sql/sql_map.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