summaryrefslogtreecommitdiff
path: root/myisam/mi_rsamepos.c
diff options
context:
space:
mode:
authorunknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>2006-12-26 16:23:05 -0800
committerunknown <acurtis/antony@xiphis.org/ltamd64.xiphis.org>2006-12-26 16:23:05 -0800
commit0a9f2f5b8cba116f812fc6ff0d7897a02cf151d3 (patch)
treea659f9a60eff4e3c972feb3204d501eca9bba470 /myisam/mi_rsamepos.c
parent8e95ddc69d8137a8f0a65de9d3c7a1a795390a7a (diff)
parent2d27fea513314324fe3487f4f501cec1d5e7896c (diff)
downloadmariadb-git-0a9f2f5b8cba116f812fc6ff0d7897a02cf151d3.tar.gz
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
into xiphis.org:/home/antony/work2/mysql-5.0-engines-merge myisam/mi_check.c: Auto merged myisam/mi_dynrec.c: Auto merged myisam/mi_packrec.c: Auto merged myisam/mi_range.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_write.c: Auto merged myisam/rt_split.c: Auto merged sql/ha_federated.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'myisam/mi_rsamepos.c')
-rw-r--r--myisam/mi_rsamepos.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/myisam/mi_rsamepos.c b/myisam/mi_rsamepos.c
index 35cdd41e297..5f680e7f86e 100644
--- a/myisam/mi_rsamepos.c
+++ b/myisam/mi_rsamepos.c
@@ -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