summaryrefslogtreecommitdiff
path: root/ndb/test/odbc
diff options
context:
space:
mode:
Diffstat (limited to 'ndb/test/odbc')
-rw-r--r--ndb/test/odbc/SQL99_test/SQL99_test.cpp3
-rw-r--r--ndb/test/odbc/SQL99_test/SQL99_test.h3
-rw-r--r--ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp3
-rw-r--r--ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp3
-rw-r--r--ndb/test/odbc/client/NDBT_SQLConnect.cpp3
-rw-r--r--ndb/test/odbc/client/NDBT_SQLPrepare.cpp3
-rw-r--r--ndb/test/odbc/client/SQLAllocEnvTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLAllocHandleTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp3
-rw-r--r--ndb/test/odbc/client/SQLBindColTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLBindParameterTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLCancelTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLCloseCursorTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLColAttributeTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLColAttributeTest1.cpp3
-rw-r--r--ndb/test/odbc/client/SQLColAttributeTest2.cpp3
-rw-r--r--ndb/test/odbc/client/SQLColAttributeTest3.cpp3
-rw-r--r--ndb/test/odbc/client/SQLConnectTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLCopyDescTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLDescribeColTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLDisconnectTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLDriverConnectTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLEndTranTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLErrorTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLExecDirectTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLExecuteTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLFetchScrollTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLFetchTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLFreeHandleTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLFreeStmtTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetConnectAttrTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetCursorNameTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetDataTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetDescFieldTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetDescRecTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetDiagFieldTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetDiagRecTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetEnvAttrTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetFunctionsTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetInfoTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetStmtAttrTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLGetTypeInfoTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLMoreResultsTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLNumResultColsTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLParamDataTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLPrepareTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLPutDataTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLRowCountTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLSetConnectAttrTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLSetCursorNameTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLSetDescFieldTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLSetDescRecTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLSetEnvAttrTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLSetStmtAttrTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLTablesTest.cpp3
-rw-r--r--ndb/test/odbc/client/SQLTransactTest.cpp3
-rw-r--r--ndb/test/odbc/client/common.hpp3
-rw-r--r--ndb/test/odbc/client/main.cpp3
-rw-r--r--ndb/test/odbc/driver/testOdbcDriver.cpp19
-rw-r--r--ndb/test/odbc/test_compiler/test_compiler.cpp3
61 files changed, 61 insertions, 138 deletions
diff --git a/ndb/test/odbc/SQL99_test/SQL99_test.cpp b/ndb/test/odbc/SQL99_test/SQL99_test.cpp
index eda9ff33834..039a77f4d53 100644
--- a/ndb/test/odbc/SQL99_test/SQL99_test.cpp
+++ b/ndb/test/odbc/SQL99_test/SQL99_test.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.
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/ndb/test/odbc/SQL99_test/SQL99_test.h b/ndb/test/odbc/SQL99_test/SQL99_test.h
index 1c49f4a9a51..0af4e79be47 100644
--- a/ndb/test/odbc/SQL99_test/SQL99_test.h
+++ b/ndb/test/odbc/SQL99_test/SQL99_test.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
diff --git a/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp b/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
index 336f4a46554..4f5f8455349 100644
--- a/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
+++ b/ndb/test/odbc/client/NDBT_ALLOCHANDLE.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.
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/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp b/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
index 8477a71edbf..7154409efa5 100644
--- a/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
+++ b/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.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.
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/ndb/test/odbc/client/NDBT_SQLConnect.cpp b/ndb/test/odbc/client/NDBT_SQLConnect.cpp
index da97ffebea4..11522d7cf5a 100644
--- a/ndb/test/odbc/client/NDBT_SQLConnect.cpp
+++ b/ndb/test/odbc/client/NDBT_SQLConnect.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.
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/ndb/test/odbc/client/NDBT_SQLPrepare.cpp b/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
index 4aaff6a7df9..ce4300caf75 100644
--- a/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
+++ b/ndb/test/odbc/client/NDBT_SQLPrepare.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.
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/ndb/test/odbc/client/SQLAllocEnvTest.cpp b/ndb/test/odbc/client/SQLAllocEnvTest.cpp
index ce50c4b7ccd..e44672b2dbc 100644
--- a/ndb/test/odbc/client/SQLAllocEnvTest.cpp
+++ b/ndb/test/odbc/client/SQLAllocEnvTest.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.
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/ndb/test/odbc/client/SQLAllocHandleTest.cpp b/ndb/test/odbc/client/SQLAllocHandleTest.cpp
index 0c51e2e46b7..b66f7ebc2f6 100644
--- a/ndb/test/odbc/client/SQLAllocHandleTest.cpp
+++ b/ndb/test/odbc/client/SQLAllocHandleTest.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.
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/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp b/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
index 7786675243a..fc9a9d504ba 100644
--- a/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
+++ b/ndb/test/odbc/client/SQLAllocHandleTest_bf.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.
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/ndb/test/odbc/client/SQLBindColTest.cpp b/ndb/test/odbc/client/SQLBindColTest.cpp
index e2cd4ce73d1..aa6effe1831 100644
--- a/ndb/test/odbc/client/SQLBindColTest.cpp
+++ b/ndb/test/odbc/client/SQLBindColTest.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.
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/ndb/test/odbc/client/SQLBindParameterTest.cpp b/ndb/test/odbc/client/SQLBindParameterTest.cpp
index 2ffd2892064..913c1d82230 100644
--- a/ndb/test/odbc/client/SQLBindParameterTest.cpp
+++ b/ndb/test/odbc/client/SQLBindParameterTest.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.
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/ndb/test/odbc/client/SQLCancelTest.cpp b/ndb/test/odbc/client/SQLCancelTest.cpp
index 904ffab6979..355dc4f3189 100644
--- a/ndb/test/odbc/client/SQLCancelTest.cpp
+++ b/ndb/test/odbc/client/SQLCancelTest.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.
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/ndb/test/odbc/client/SQLCloseCursorTest.cpp b/ndb/test/odbc/client/SQLCloseCursorTest.cpp
index 35f125df59d..e6a630319d5 100644
--- a/ndb/test/odbc/client/SQLCloseCursorTest.cpp
+++ b/ndb/test/odbc/client/SQLCloseCursorTest.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.
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/ndb/test/odbc/client/SQLColAttributeTest.cpp b/ndb/test/odbc/client/SQLColAttributeTest.cpp
index 4c067c21d7d..ade640173fe 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest.cpp
+++ b/ndb/test/odbc/client/SQLColAttributeTest.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.
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/ndb/test/odbc/client/SQLColAttributeTest1.cpp b/ndb/test/odbc/client/SQLColAttributeTest1.cpp
index 322a21eefc1..45b1dd15967 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest1.cpp
+++ b/ndb/test/odbc/client/SQLColAttributeTest1.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.
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/ndb/test/odbc/client/SQLColAttributeTest2.cpp b/ndb/test/odbc/client/SQLColAttributeTest2.cpp
index 18cffae76c1..fb1f2a9aa4a 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest2.cpp
+++ b/ndb/test/odbc/client/SQLColAttributeTest2.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.
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/ndb/test/odbc/client/SQLColAttributeTest3.cpp b/ndb/test/odbc/client/SQLColAttributeTest3.cpp
index f8817565711..ef4943a8cdb 100644
--- a/ndb/test/odbc/client/SQLColAttributeTest3.cpp
+++ b/ndb/test/odbc/client/SQLColAttributeTest3.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.
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/ndb/test/odbc/client/SQLConnectTest.cpp b/ndb/test/odbc/client/SQLConnectTest.cpp
index 552fc8640fe..1adbd865f0c 100644
--- a/ndb/test/odbc/client/SQLConnectTest.cpp
+++ b/ndb/test/odbc/client/SQLConnectTest.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.
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/ndb/test/odbc/client/SQLCopyDescTest.cpp b/ndb/test/odbc/client/SQLCopyDescTest.cpp
index 4a3742f97ae..d944da5acbb 100644
--- a/ndb/test/odbc/client/SQLCopyDescTest.cpp
+++ b/ndb/test/odbc/client/SQLCopyDescTest.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.
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/ndb/test/odbc/client/SQLDescribeColTest.cpp b/ndb/test/odbc/client/SQLDescribeColTest.cpp
index 9f55c6a1cfe..abb31b53c5b 100644
--- a/ndb/test/odbc/client/SQLDescribeColTest.cpp
+++ b/ndb/test/odbc/client/SQLDescribeColTest.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.
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/ndb/test/odbc/client/SQLDisconnectTest.cpp b/ndb/test/odbc/client/SQLDisconnectTest.cpp
index 823b446ab84..700fadfed33 100644
--- a/ndb/test/odbc/client/SQLDisconnectTest.cpp
+++ b/ndb/test/odbc/client/SQLDisconnectTest.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.
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/ndb/test/odbc/client/SQLDriverConnectTest.cpp b/ndb/test/odbc/client/SQLDriverConnectTest.cpp
index fc3b1d10f91..376b0970f2e 100644
--- a/ndb/test/odbc/client/SQLDriverConnectTest.cpp
+++ b/ndb/test/odbc/client/SQLDriverConnectTest.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.
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/ndb/test/odbc/client/SQLEndTranTest.cpp b/ndb/test/odbc/client/SQLEndTranTest.cpp
index 06c497954fd..953336ec909 100644
--- a/ndb/test/odbc/client/SQLEndTranTest.cpp
+++ b/ndb/test/odbc/client/SQLEndTranTest.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.
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/ndb/test/odbc/client/SQLErrorTest.cpp b/ndb/test/odbc/client/SQLErrorTest.cpp
index 5220e7b5eed..f4effa464c8 100644
--- a/ndb/test/odbc/client/SQLErrorTest.cpp
+++ b/ndb/test/odbc/client/SQLErrorTest.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.
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/ndb/test/odbc/client/SQLExecDirectTest.cpp b/ndb/test/odbc/client/SQLExecDirectTest.cpp
index b9b4e770412..d0b7955f928 100644
--- a/ndb/test/odbc/client/SQLExecDirectTest.cpp
+++ b/ndb/test/odbc/client/SQLExecDirectTest.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.
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/ndb/test/odbc/client/SQLExecuteTest.cpp b/ndb/test/odbc/client/SQLExecuteTest.cpp
index 5f6bdb5d4bf..bcff66ff287 100644
--- a/ndb/test/odbc/client/SQLExecuteTest.cpp
+++ b/ndb/test/odbc/client/SQLExecuteTest.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.
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/ndb/test/odbc/client/SQLFetchScrollTest.cpp b/ndb/test/odbc/client/SQLFetchScrollTest.cpp
index 4a11ccd143e..1a92ac058a8 100644
--- a/ndb/test/odbc/client/SQLFetchScrollTest.cpp
+++ b/ndb/test/odbc/client/SQLFetchScrollTest.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.
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/ndb/test/odbc/client/SQLFetchTest.cpp b/ndb/test/odbc/client/SQLFetchTest.cpp
index bd62fcb2f04..0dcb3571bf7 100644
--- a/ndb/test/odbc/client/SQLFetchTest.cpp
+++ b/ndb/test/odbc/client/SQLFetchTest.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.
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/ndb/test/odbc/client/SQLFreeHandleTest.cpp b/ndb/test/odbc/client/SQLFreeHandleTest.cpp
index 3a7241dbe68..d8ab766a362 100644
--- a/ndb/test/odbc/client/SQLFreeHandleTest.cpp
+++ b/ndb/test/odbc/client/SQLFreeHandleTest.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.
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/ndb/test/odbc/client/SQLFreeStmtTest.cpp b/ndb/test/odbc/client/SQLFreeStmtTest.cpp
index e636b3063de..ce804283358 100644
--- a/ndb/test/odbc/client/SQLFreeStmtTest.cpp
+++ b/ndb/test/odbc/client/SQLFreeStmtTest.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.
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/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp b/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
index 8d5a5c0dbbb..7eb6432904e 100644
--- a/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
+++ b/ndb/test/odbc/client/SQLGetConnectAttrTest.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.
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/ndb/test/odbc/client/SQLGetCursorNameTest.cpp b/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
index 1e3ed9f557e..da66d976f34 100644
--- a/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
+++ b/ndb/test/odbc/client/SQLGetCursorNameTest.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.
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/ndb/test/odbc/client/SQLGetDataTest.cpp b/ndb/test/odbc/client/SQLGetDataTest.cpp
index 9d958c6c953..12b7969c092 100644
--- a/ndb/test/odbc/client/SQLGetDataTest.cpp
+++ b/ndb/test/odbc/client/SQLGetDataTest.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.
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/ndb/test/odbc/client/SQLGetDescFieldTest.cpp b/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
index b789ed75378..0bae4ae58b2 100644
--- a/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
+++ b/ndb/test/odbc/client/SQLGetDescFieldTest.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.
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/ndb/test/odbc/client/SQLGetDescRecTest.cpp b/ndb/test/odbc/client/SQLGetDescRecTest.cpp
index 5944f393a71..46ecbfeaa83 100644
--- a/ndb/test/odbc/client/SQLGetDescRecTest.cpp
+++ b/ndb/test/odbc/client/SQLGetDescRecTest.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.
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/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp b/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
index ef9bc3eb3fc..c8d381abd56 100644
--- a/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
+++ b/ndb/test/odbc/client/SQLGetDiagFieldTest.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.
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/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp b/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
index 8fa4a2b3dbb..22a4e07f470 100644
--- a/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
+++ b/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.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.
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/ndb/test/odbc/client/SQLGetDiagRecTest.cpp b/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
index 27c78edaa4d..2a8aed12a57 100644
--- a/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
+++ b/ndb/test/odbc/client/SQLGetDiagRecTest.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.
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/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp b/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
index efc8117d6d2..0c6b2ab51b8 100644
--- a/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
+++ b/ndb/test/odbc/client/SQLGetEnvAttrTest.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.
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/ndb/test/odbc/client/SQLGetFunctionsTest.cpp b/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
index c6feb8ec033..917f63d7e18 100644
--- a/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
+++ b/ndb/test/odbc/client/SQLGetFunctionsTest.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.
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/ndb/test/odbc/client/SQLGetInfoTest.cpp b/ndb/test/odbc/client/SQLGetInfoTest.cpp
index 95f7562dafe..0322cc47250 100644
--- a/ndb/test/odbc/client/SQLGetInfoTest.cpp
+++ b/ndb/test/odbc/client/SQLGetInfoTest.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.
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/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp b/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
index 2052af60ee0..4a268ce99c1 100644
--- a/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
+++ b/ndb/test/odbc/client/SQLGetStmtAttrTest.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.
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/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp b/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
index 5925d1cc1ae..fb114d06c26 100644
--- a/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
+++ b/ndb/test/odbc/client/SQLGetTypeInfoTest.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.
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/ndb/test/odbc/client/SQLMoreResultsTest.cpp b/ndb/test/odbc/client/SQLMoreResultsTest.cpp
index cba8b0dc53e..8b7ed0e4581 100644
--- a/ndb/test/odbc/client/SQLMoreResultsTest.cpp
+++ b/ndb/test/odbc/client/SQLMoreResultsTest.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.
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/ndb/test/odbc/client/SQLNumResultColsTest.cpp b/ndb/test/odbc/client/SQLNumResultColsTest.cpp
index 8f0c1dba94c..ca70d42018e 100644
--- a/ndb/test/odbc/client/SQLNumResultColsTest.cpp
+++ b/ndb/test/odbc/client/SQLNumResultColsTest.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.
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/ndb/test/odbc/client/SQLParamDataTest.cpp b/ndb/test/odbc/client/SQLParamDataTest.cpp
index 92d491dfaf5..e502a9e15fa 100644
--- a/ndb/test/odbc/client/SQLParamDataTest.cpp
+++ b/ndb/test/odbc/client/SQLParamDataTest.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.
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/ndb/test/odbc/client/SQLPrepareTest.cpp b/ndb/test/odbc/client/SQLPrepareTest.cpp
index 2ebbc224b85..aa20b1992a2 100644
--- a/ndb/test/odbc/client/SQLPrepareTest.cpp
+++ b/ndb/test/odbc/client/SQLPrepareTest.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.
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/ndb/test/odbc/client/SQLPutDataTest.cpp b/ndb/test/odbc/client/SQLPutDataTest.cpp
index 38a8458fec4..ea1a34651c3 100644
--- a/ndb/test/odbc/client/SQLPutDataTest.cpp
+++ b/ndb/test/odbc/client/SQLPutDataTest.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.
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/ndb/test/odbc/client/SQLRowCountTest.cpp b/ndb/test/odbc/client/SQLRowCountTest.cpp
index f298017c519..1cc2929c2dc 100644
--- a/ndb/test/odbc/client/SQLRowCountTest.cpp
+++ b/ndb/test/odbc/client/SQLRowCountTest.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.
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/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp b/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
index c41ef885521..4e5f08a4a4c 100644
--- a/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
+++ b/ndb/test/odbc/client/SQLSetConnectAttrTest.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.
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/ndb/test/odbc/client/SQLSetCursorNameTest.cpp b/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
index b35cf9fefc2..8676ab6eddf 100644
--- a/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
+++ b/ndb/test/odbc/client/SQLSetCursorNameTest.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.
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/ndb/test/odbc/client/SQLSetDescFieldTest.cpp b/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
index 798622e0f75..9ea93013312 100644
--- a/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
+++ b/ndb/test/odbc/client/SQLSetDescFieldTest.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.
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/ndb/test/odbc/client/SQLSetDescRecTest.cpp b/ndb/test/odbc/client/SQLSetDescRecTest.cpp
index d97af576cb0..52a6b81ee84 100644
--- a/ndb/test/odbc/client/SQLSetDescRecTest.cpp
+++ b/ndb/test/odbc/client/SQLSetDescRecTest.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.
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/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp b/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
index 16ae5671ca3..e843c5509b8 100644
--- a/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
+++ b/ndb/test/odbc/client/SQLSetEnvAttrTest.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.
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/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp b/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
index 646f82cd306..dc37fc64e1c 100644
--- a/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
+++ b/ndb/test/odbc/client/SQLSetStmtAttrTest.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.
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/ndb/test/odbc/client/SQLTablesTest.cpp b/ndb/test/odbc/client/SQLTablesTest.cpp
index 735efd81e9c..ff55f217d0a 100644
--- a/ndb/test/odbc/client/SQLTablesTest.cpp
+++ b/ndb/test/odbc/client/SQLTablesTest.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.
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/ndb/test/odbc/client/SQLTransactTest.cpp b/ndb/test/odbc/client/SQLTransactTest.cpp
index e9abe42129d..d7444794d5a 100644
--- a/ndb/test/odbc/client/SQLTransactTest.cpp
+++ b/ndb/test/odbc/client/SQLTransactTest.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.
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/ndb/test/odbc/client/common.hpp b/ndb/test/odbc/client/common.hpp
index 236decf1b95..1eb61f44bd9 100644
--- a/ndb/test/odbc/client/common.hpp
+++ b/ndb/test/odbc/client/common.hpp
@@ -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
diff --git a/ndb/test/odbc/client/main.cpp b/ndb/test/odbc/client/main.cpp
index b202b6de111..187ac96c6a7 100644
--- a/ndb/test/odbc/client/main.cpp
+++ b/ndb/test/odbc/client/main.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.
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/ndb/test/odbc/driver/testOdbcDriver.cpp b/ndb/test/odbc/driver/testOdbcDriver.cpp
index d3b3802ebe1..bdda4d447f8 100644
--- a/ndb/test/odbc/driver/testOdbcDriver.cpp
+++ b/ndb/test/odbc/driver/testOdbcDriver.cpp
@@ -2,24 +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.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-
-/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
-
- 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/ndb/test/odbc/test_compiler/test_compiler.cpp b/ndb/test/odbc/test_compiler/test_compiler.cpp
index 042e9e6d4bf..d64d8f2a63d 100644
--- a/ndb/test/odbc/test_compiler/test_compiler.cpp
+++ b/ndb/test/odbc/test_compiler/test_compiler.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.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of