summaryrefslogtreecommitdiff
path: root/ndb
diff options
context:
space:
mode:
authorunknown <joerg@trift-lap.fambruehe>2007-04-26 16:06:44 +0200
committerunknown <joerg@trift-lap.fambruehe>2007-04-26 16:06:44 +0200
commit8a6629e1f4e4e8fec75e973ccc59c1df992eb232 (patch)
tree0122eecfb2051d0a90c61f33cfcdef2bf4102f0f /ndb
parent4573d03411f90e5a9fe7c403814af837ade33e51 (diff)
parent246232268c598e68a376d634a79ed4eb5cb040e4 (diff)
downloadmariadb-git-8a6629e1f4e4e8fec75e973ccc59c1df992eb232.tar.gz
Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0
into trift-lap.fambruehe:/MySQL/M50/push-5.0 configure.in: Auto merged include/Makefile.am: Auto merged
Diffstat (limited to 'ndb')
-rw-r--r--ndb/test/ndbapi/testScanFilter.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/ndb/test/ndbapi/testScanFilter.cpp b/ndb/test/ndbapi/testScanFilter.cpp
index e195c04bd93..4ce9145bc1e 100644
--- a/ndb/test/ndbapi/testScanFilter.cpp
+++ b/ndb/test/ndbapi/testScanFilter.cpp
@@ -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 only.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of