Merge 4.1 -> 5.0

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
VC++Files/sql/mysqld.dsp:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/union.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
mysql-test/t/rpl_error_ignored_table.test:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_test.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
tests/client_test.c:
  Auto merged

1 files changed, 82 insertions, 0 deletions

diff --git a/ndb/test/odbc/client/SQLFetchScrollTest.cpp b/ndb/test/odbc/client/SQLFetchScrollTest.cpp
new file mode 100644
index 00000000000..4a11ccd143e
--- /dev/null
+++ b/ndb/test/odbc/client/SQLFetchScrollTest.cpp
@@ -0,0 +1,82 @@
+/* Copyright (C) 2003 MySQL 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.
+
+   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 */
+
+#include <NdbOut.hpp>
+#include <stdio.h>
+#include <sqlext.h>
+
+using namespace std;
+
+#define NAME_LEN 50
+#define PHONE_LEN 10
+#define SALES_PERSON_LEN 10
+#define STATUS_LEN 6
+#define SQL_MAXIMUM_MESSAGE_LENGTH 200
+
+SQLHSTMT    hstmt;
+SQLSMALLINT RecNumber;
+SQLCHAR     szSalesPerson[SALES_PERSON_LEN];
+
+SQLCHAR     Sqlstate[5], Msg[SQL_MAXIMUM_MESSAGE_LENGTH];
+SQLINTEGER  NativeError;
+SQLRETURN retcode, SQLSTATEs;
+
+SQLINTEGER   ValuePtr1;
+SQLCHAR      ValuePtr2;
+SQLSMALLINT  ValuePtr3;
+SQLSMALLINT i, MsgLen;
+
+void SFCT_DisplayError(SQLSMALLINT HandleType, SQLHDESC InputHandle);
+
+int SQLFetchScrollTest ()
+{
+
+  // FetchScroll a statement to retrieve rows from the Customers table. We can 
+  // create the table and insert rows in NDB by program TestDirectSQL 
+
+  /* There is no executed statement associated with the allocated SQL-statement identified by StatementHandle */
+retcode = SQLFetchScroll(hstmt, SQL_FETCH_NEXT, 1);
+if  (retcode == SQL_ERROR || retcode == SQL_SUCCESS_WITH_INFO)
+   SFCT_DisplayError(SQL_HANDLE_DESC, hstmt);
+
+  /* FetchOrientation is not one of the code values in Table24 */
+retcode = SQLFetchScroll(hstmt, SQL_FETCH_NEXT, 8);
+if  (retcode == SQL_ERROR || retcode == SQL_SUCCESS_WITH_INFO)
+   SFCT_DisplayError(SQL_HANDLE_DESC, hstmt);
+
+  return 0;
+
+ }
+
+
+void SFCT_DisplayError(SQLSMALLINT HandleType, SQLHSTMT InputHandle)
+{
+     i = 1;
+     while ((SQLSTATEs = SQLGetDiagRec(HandleType, InputHandle, i, 
+             Sqlstate, &NativeError, Msg, sizeof(Msg), 
+             &MsgLen)) != SQL_NO_DATA)                   {
+
+     ndbout << "the HandleType is:" << HandleType << endl;
+     ndbout << "the InputHandle is :" << InputHandle << endl;
+     ndbout << "the output state is:" << (char *)Sqlstate << endl; 
+
+     i ++;
+                                                         }
+
+}
+
+
+