diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-04-24 22:34:57 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-04-24 22:34:57 +0200 |
| commit | 55b01e95b90a68764de305dbda620142bf4dcdc1 (patch) | |
| tree | 18f0ba43427de40e1d749edef20ccf104b7d3793 /storage | |
| parent | f85b5bd937696f8ef4b3f4d526e337fb755ee435 (diff) | |
| parent | 879e0a124518f1601c51461509d79b759b57f875 (diff) | |
| download | mariadb-git-55b01e95b90a68764de305dbda620142bf4dcdc1.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
storage/ndb/test/ndbapi/testScanFilter.cpp:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/ndb/test/ndbapi/testScanFilter.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/ndb/test/ndbapi/testScanFilter.cpp b/storage/ndb/test/ndbapi/testScanFilter.cpp index 958b50d6701..0b2f7686c38 100644 --- a/storage/ndb/test/ndbapi/testScanFilter.cpp +++ b/storage/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 |