Connector/ODBC 3.51 commit: r97 - in trunk: myodbc3 test/basics test/blob test/col_length test/cursor test/keys test/param test/position test/relative...

[jwinstead]

Modified:
   trunk/myodbc3/cursor.c
   trunk/myodbc3/options.c
   trunk/test/basics/my_basics.c
   trunk/test/blob/my_blob.c
   trunk/test/col_length/my_col_length.c
   trunk/test/cursor/my_cursor.c
   trunk/test/keys/my_keys.c
   trunk/test/param/my_param.c
   trunk/test/position/my_position.c
   trunk/test/relative/my_relative.c
   trunk/test/scroll/my_scroll.c
Log:
Clean up data types in a number of the tests that cause them to fail (lots
of confusion between SQLINTEGER and other types, such as the native 'long'
type). Also cleans up some additional warnings in the driver itself.


Modified: trunk/myodbc3/cursor.c
===================================================================
--- trunk/myodbc3/cursor.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/myodbc3/cursor.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -408,25 +408,26 @@
   @purpose : copy row buffers to statement
 */
 
-static SQLRETURN copy_field_data(STMT FAR *stmt, PARAM_BIND  param,
+static SQLRETURN copy_field_data(STMT FAR *stmt, PARAM_BIND *param,
                                  NET **net, SQLCHAR **to)
 {
+    PARAM_BIND dummy;
     MYSQL mysql= stmt->dbc->mysql;
-    SQLUINTEGER length= *(param.actual_len)+5;
+    SQLUINTEGER length= *(param->actual_len)+5;
 
     if ( !(*to= (SQLCHAR*) extend_buffer(*net, (char*) *to,length)) )
         return set_error(stmt,MYERR_S1001,NULL,4001);
 
-    if ( !(*to= (SQLCHAR*) insert_param(&mysql, (char*) *to, &param)) )
+    if ( !(*to= (SQLCHAR*) insert_param(&mysql, (char*) *to, param)) )
         return set_error(stmt,MYERR_S1001,NULL,4001);
 
     /* Insert " AND ", where clause with multiple search */
-    param.SqlType= SQL_INTEGER;
-    param.CType= SQL_C_CHAR;
-    param.buffer= (gptr) " AND ";
-    *param.actual_len= 5;
+    dummy.SqlType= SQL_INTEGER;
+    dummy.CType= SQL_C_CHAR;
+    dummy.buffer= (gptr) " AND ";
+    *dummy.actual_len= 5;
 
-    if ( !(*to= (SQLCHAR*) insert_param(&mysql, (char*) *to, &param)) )
+    if ( !(*to= (SQLCHAR*) insert_param(&mysql, (char*) *to, &dummy)) )
         return set_error(stmt,MYERR_S1001,NULL,4001);
 
     return SQL_SUCCESS;
@@ -467,7 +468,7 @@
 
         param.actual_len= &length;
 
-        if ( copy_field_data(stmt,param,&net,&to) != SQL_SUCCESS )
+        if ( copy_field_data(stmt,&param,&net,&to) != SQL_SUCCESS )
             return 1;
 
         length= (uint) ((char *)to - (char*) net->buff);

Modified: trunk/myodbc3/options.c
===================================================================
--- trunk/myodbc3/options.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/myodbc3/options.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -65,13 +65,13 @@
     {
         
         case SQL_ATTR_ASYNC_ENABLE:
-            if ((SQLUINTEGER)ValuePtr == SQL_ASYNC_ENABLE_ON)
+            if (ValuePtr == (SQLPOINTER) SQL_ASYNC_ENABLE_ON)
                 MYODBCDbgReturn(set_handle_error(HandleType,Handle,MYERR_01S02,
                                                  "Doesn't support asynchronous, changed
to default",0));
             break;
 
         case SQL_ATTR_CURSOR_SENSITIVITY:
-            if ((SQLUINTEGER)ValuePtr != SQL_UNSPECIFIED)
+            if (ValuePtr != (SQLPOINTER) SQL_UNSPECIFIED)
             {
                 MYODBCDbgReturn(set_handle_error(HandleType,Handle,MYERR_01S02,
                                                  "Option value changed to default cursor
sensitivity(unspecified)",0));
@@ -82,13 +82,13 @@
             if (((STMT FAR*)Handle)->dbc->flag & FLAG_FORWARD_CURSOR)
             {
                 options->cursor_type= SQL_CURSOR_FORWARD_ONLY;
-                if ((SQLUINTEGER) ValuePtr != SQL_CURSOR_FORWARD_ONLY)
+                if (ValuePtr != (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY)
                     MYODBCDbgReturn(set_handle_error(HandleType,Handle,MYERR_01S02,
                                                      "Forcing the use of forward-only
cursor)",0));
             }
             else if (((STMT FAR*)Handle)->dbc->flag & FLAG_DYNAMIC_CURSOR)
             {
-                if ((SQLUINTEGER) ValuePtr != SQL_CURSOR_KEYSET_DRIVEN)
+                if (ValuePtr != (SQLPOINTER)SQL_CURSOR_KEYSET_DRIVEN)
                     options->cursor_type= (SQLUINTEGER)ValuePtr;
 
                 else
@@ -100,8 +100,8 @@
             }
             else
             {
-                if ((SQLUINTEGER) ValuePtr == SQL_CURSOR_FORWARD_ONLY ||
-                    (SQLUINTEGER) ValuePtr == SQL_CURSOR_STATIC)
+                if (ValuePtr == (SQLPOINTER)SQL_CURSOR_FORWARD_ONLY ||
+                    ValuePtr == (SQLPOINTER)SQL_CURSOR_STATIC)
                     options->cursor_type= (SQLUINTEGER)ValuePtr;
 
                 else
@@ -122,7 +122,7 @@
             break;
 
         case SQL_ATTR_METADATA_ID:
-            if ((SQLUINTEGER)ValuePtr == SQL_TRUE)
+            if (ValuePtr == (SQLPOINTER) SQL_TRUE)
                 MYODBCDbgReturn(set_handle_error(HandleType,Handle,MYERR_01S02,
                                                  "Doesn't support SQL_ATTR_METADATA_ID to
true, changed to default",0));
             break;
@@ -136,7 +136,7 @@
             break;
 
         case SQL_ATTR_SIMULATE_CURSOR:
-            if ((SQLUINTEGER)ValuePtr != SQL_SC_TRY_UNIQUE)
+            if (ValuePtr != (SQLPOINTER) SQL_SC_TRY_UNIQUE)
                 MYODBCDbgReturn(set_handle_error(HandleType,Handle,MYERR_01S02,
                                                  "Option value changed to default cursor
simulation",0));
             break;
@@ -295,7 +295,7 @@
             break;
 
         case SQL_ATTR_AUTOCOMMIT:
-            if ((SQLUINTEGER)ValuePtr != SQL_AUTOCOMMIT_ON)
+            if (ValuePtr != (SQLPOINTER) SQL_AUTOCOMMIT_ON)
             {
                 if (!dbc->server) /* no connection yet */
                 {
@@ -361,7 +361,7 @@
 
         case SQL_ATTR_ODBC_CURSORS:
             if ((dbc->flag & FLAG_FORWARD_CURSOR) &&
-                (SQLUINTEGER)ValuePtr != SQL_CUR_USE_ODBC)
+                ValuePtr != (SQLPOINTER) SQL_CUR_USE_ODBC)
                 MYODBCDbgReturn(set_conn_error(hdbc,MYERR_01S02,
                                                "Forcing the Driver Manager to use ODBC
cursor library",0));
             break;
@@ -565,17 +565,17 @@
     {
         
         case SQL_ATTR_CURSOR_SCROLLABLE:
-            if ((SQLUINTEGER)ValuePtr == SQL_NONSCROLLABLE &&
+            if (ValuePtr == (SQLPOINTER)SQL_NONSCROLLABLE &&
                 options->cursor_type != SQL_CURSOR_FORWARD_ONLY)
                 options->cursor_type= SQL_CURSOR_FORWARD_ONLY;
 
-            else if ((SQLUINTEGER)ValuePtr == SQL_SCROLLABLE &&
+            else if (ValuePtr == (SQLPOINTER)SQL_SCROLLABLE &&
                      options->cursor_type == SQL_CURSOR_FORWARD_ONLY)
                 options->cursor_type= SQL_CURSOR_STATIC;
             break;
 
         case SQL_ATTR_AUTO_IPD:
-            if ((SQLUINTEGER) ValuePtr != SQL_FALSE)
+            if (ValuePtr != (SQLPOINTER)SQL_FALSE)
                 MYODBCDbgReturn(set_error(hstmt,MYERR_01S02,
                                           "Option value changed to default auto ipd",0));
             break;
@@ -589,7 +589,7 @@
             break;
 
         case SQL_ATTR_PARAMSET_SIZE:
-            if ((SQLUINTEGER)ValuePtr != 1)
+            if (ValuePtr != (SQLPOINTER)1)
                 MYODBCDbgReturn(set_error(hstmt,MYERR_01S02,
                                           "Option value changed to default parameter
size",
                                           0));
@@ -843,7 +843,7 @@
             break;
 
         case SQL_ATTR_OUTPUT_NTS:
-            if ((SQLINTEGER)ValuePtr == SQL_TRUE)
+            if (ValuePtr == (SQLPOINTER)SQL_TRUE)
                 break;
 
         default:

Modified: trunk/test/basics/my_basics.c
===================================================================
--- trunk/test/basics/my_basics.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/basics/my_basics.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -30,7 +30,7 @@
 void my_basics(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN  rc;
-    SQLINTEGER nRowCount;
+    SQLLEN nRowCount;
 
     /* drop table 'myodbc3_demo_basic' if it already exists */
     rc = SQLExecDirect(hstmt,"DROP TABLE if exists myodbc3_demo_basic",SQL_NTS);

Modified: trunk/test/blob/my_blob.c
===================================================================
--- trunk/test/blob/my_blob.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/blob/my_blob.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -21,11 +21,11 @@
 */
 void t_blob(SQLHDBC hdbc, SQLHSTMT hstmt, SQLUINTEGER blob_size)
 {
-    SQLRETURN rc;  
-    SQLUINTEGER cbValue;
+    SQLRETURN rc;
+    SQLULEN cbValue;
     SQLUINTEGER j= 0;
-    SQLINTEGER l;
-    SQLCHAR* blobbuf;
+    long l;
+    char *blobbuf;
     SQLUINTEGER blobbuf_size = 1024 * 1 * 6L;
     SQLUINTEGER blob_read;
     SQLPOINTER token;
@@ -88,7 +88,7 @@
     finish = clock();
 
     duration = (finish-start)/CLOCKS_PER_SEC;
-    printMessage("\n j: %d", j);
+    printMessage("\n j: %d\n", j);
     myassert(j == blob_size);
     printMessage("Wrote %ld bytes in %3.3lf seconds (%lg bytes/s)\n",
                  j, duration, duration == 0.0 ? 9.99e99 : j / duration);
@@ -134,7 +134,8 @@
 void t_1piecewrite2(HDBC hdbc, HSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER cbValue,cbValue2,l;
+    SQLLEN cbValue,cbValue2;
+    long l;
     SQLCHAR* blobbuf;
     size_t i;
 

Modified: trunk/test/col_length/my_col_length.c
===================================================================
--- trunk/test/col_length/my_col_length.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/col_length/my_col_length.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -24,14 +24,14 @@
     SQLRETURN rc;
     SQLHDBC hdbc;
     SQLHSTMT hstmt;
-    SQLCHAR data1[25],data2[25];
+    char     conn[100];
+    char     data1[25],data2[25];
     SQLINTEGER len1,len2,desc_len;
-    SQLCHAR  conn[100];
 
     rc = SQLAllocConnect(henv,&hdbc);
     myenv(henv,rc);
 
-    sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd); 
+    sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd); 
     rc = SQLDriverConnect(hdbc,NULL,conn,sizeof(conn),NULL,0,NULL,SQL_DRIVER_COMPLETE);
     mycon(hdbc,rc);
 
@@ -102,19 +102,20 @@
     SQLHDBC hdbc;
     SQLHSTMT hstmt;
     SQLCHAR data1[25],data2[25];
-    SQLINTEGER len1,len2,desc_len;
+    SQLULEN desc_len;
+    SQLINTEGER len1,len2;
     SQLCHAR  conn[100];
 
     rc = SQLAllocConnect(henv,&hdbc);
     myenv(henv,rc);
 
-    sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=1",mydsn,myuid,mypwd); 
+    sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=1",mydsn,myuid,mypwd); 
     rc = SQLDriverConnect(hdbc,NULL,conn,sizeof(conn),NULL,0,NULL,SQL_DRIVER_COMPLETE);
     mycon(hdbc,rc);
 
     rc = SQLAllocStmt(hdbc,&hstmt);
     mycon(hdbc,rc);
-    sprintf(conn,"DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd); 
+    sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PWD=%s;OPTION=0",mydsn,myuid,mypwd); 
 
     rc = SQLExecDirect(hstmt,"CREATE DATABASE IF NOT EXISTS client_odbc_test",SQL_NTS);
     mystmt(hstmt,rc);

Modified: trunk/test/cursor/my_cursor.c
===================================================================
--- trunk/test/cursor/my_cursor.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/cursor/my_cursor.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -30,8 +30,8 @@
 void my_init_table(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN   rc;
-    SQLINTEGER  id;
-    SQLCHAR     name[50];
+    long        id;
+    char        name[50];
 
     /* drop table 'my_demo_param' if it already exists */
     printMessage(" creating table 'my_demo_cursor'\n");
@@ -101,7 +101,7 @@
 void my_positioned_cursor(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN   rc;
-    SQLINTEGER  nRowCount;
+    SQLLEN      nRowCount;
     SQLHSTMT    hstmt_pos;
 
     /* create new statement handle */
@@ -184,8 +184,9 @@
 void my_setpos_cursor(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN   rc;
-    SQLINTEGER  id, nRowCount;
-    SQLCHAR     name[50];
+    SQLLEN      nRowCount;
+    long        id;
+    char        name[50];
 
     printMessage("\nmy_setpos_cursor:\n");
 

Modified: trunk/test/keys/my_keys.c
===================================================================
--- trunk/test/keys/my_keys.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/keys/my_keys.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -23,7 +23,8 @@
 void my_primary_keys(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER nData,rowcount;
+    SQLLEN rowcount;
+    long nData;
 
     SQLExecDirect(hstmt,"drop table my_primary_keys",SQL_NTS);
     rc = SQLExecDirect(hstmt,"create table my_primary_keys(col1 int not null,\
@@ -123,7 +124,8 @@
 void my_unique_notnull_keys(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER nData,rowcount;
+    SQLLEN rowcount;
+    long nData;
 
     SQLExecDirect(hstmt,"drop table my_unique_notnull_keys",SQL_NTS);
     rc = SQLExecDirect(hstmt,"create table my_unique_notnull_keys(col1 int not null,\
@@ -223,7 +225,8 @@
 void my_unique_keys(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER nData,rowcount;
+    SQLLEN rowcount;
+    long nData;
 
     SQLExecDirect(hstmt,"drop table my_unique_keys",SQL_NTS);
     rc = SQLExecDirect(hstmt,"create table my_unique_keys(col1 int not null,\
@@ -322,7 +325,8 @@
 void my_notnull_keys(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER nData,rowcount;
+    SQLLEN rowcount;
+    long nData;
 
     SQLExecDirect(hstmt,"drop table my_unique_keys",SQL_NTS);
     rc = SQLExecDirect(hstmt,"create table my_notnull_keys(col1 int,\
@@ -421,7 +425,8 @@
 void my_no_keys(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER nData,rowcount;
+    long nData;
+    SQLLEN rowcount;
 
     /* INIT */
     SQLExecDirect(hstmt,"drop table my_no_keys",SQL_NTS);
@@ -521,7 +526,8 @@
 void my_no_keys_all_dups(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER nData,rowcount;
+    SQLLEN rowcount;
+    long nData;
 
     SQLExecDirect(hstmt,"drop table my_no_keys_all_dups",SQL_NTS);
     rc = SQLExecDirect(hstmt,"create table my_no_keys_all_dups (col1 int,\
@@ -786,7 +792,7 @@
 void my_foreign_keys(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN   rc=0;
-    SQLCHAR   dbc[255];
+    char        dbc[255];
 
     server_is_mysql(hdbc) ? my_init_mysql_fkey(hdbc,hstmt) : my_init_fkey(hdbc,hstmt);
 
@@ -1006,9 +1012,9 @@
 
 void t_strstr()
 {
-    SQLCHAR *string = "'TABLE','VIEW','SYSTEM TABLE'";
-    SQLCHAR *str=",";
-    SQLCHAR *type;
+    char    *string = "'TABLE','VIEW','SYSTEM TABLE'";
+    char    *str=",";
+    char    *type;
 
     type = strstr((const char *)string,(const char *)str);
     while (type++)
@@ -1026,14 +1032,14 @@
 {
     SQLHDBC   hdbc1;
     SQLHSTMT  hstmt1;
-    SQLRETURN rc; 
-    SQLCHAR   conn[155];
+    SQLRETURN rc;
+    char      conn[155];
 
     SQLExecDirect(hstmt,"DROP DATABASE my_tables_test_db",SQL_NTS);
     rc = SQLExecDirect(hstmt,"CREATE DATABASE my_tables_test_db",SQL_NTS);
     mystmt(hstmt,rc);
 
-    sprintf(conn,"DSN=%s;UID=%s;PASSWORD=%s;DATABASE=%s",
+    sprintf(conn,"DRIVER=MyODBC;DSN=%s;UID=%s;PASSWORD=%s;DATABASE=%s",
             mydsn,myuid,mypwd,"my_tables_test_db");
 
     rc = SQLAllocConnect(henv,&hdbc1);
@@ -1192,7 +1198,6 @@
     my_foreign_keys(hdbc,hstmt);   
     if (driver_supports_setpos(hdbc))
     {
-        my_no_keys(hdbc,hstmt);
         my_primary_keys(hdbc,hstmt);
         my_unique_notnull_keys(hdbc,hstmt);
         my_unique_keys(hdbc,hstmt);

Modified: trunk/test/param/my_param.c
===================================================================
--- trunk/test/param/my_param.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/param/my_param.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -112,8 +112,9 @@
 void my_param_update(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN   rc;
-    SQLINTEGER  id=9, nRowCount;
-    SQLCHAR     name[]="update";
+    SQLLEN nRowCount;
+    long id=9;
+    char name[]="update";
 
     /* prepare the insert statement with parameters */
     rc = SQLPrepare(hstmt,"UPDATE my_demo_param set name = ? WHERE id = ?",SQL_NTS);
@@ -165,7 +166,8 @@
 void my_param_delete(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN   rc;
-    SQLINTEGER  id, nRowCount;
+    SQLLEN nRowCount;
+    long id;
 
     /* supply data to parameter 1 */    
     rc = SQLBindParameter(hstmt, 1, SQL_PARAM_INPUT, 

Modified: trunk/test/position/my_position.c
===================================================================
--- trunk/test/position/my_position.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/position/my_position.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -22,8 +22,8 @@
 void t_chunk(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLCHAR   txt[100];
-    SQLINTEGER len;
+    char      txt[100];
+    SQLLEN    len;
 
     if (!driver_supports_setpos(hdbc))
         return;

Modified: trunk/test/relative/my_relative.c
===================================================================
--- trunk/test/relative/my_relative.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/relative/my_relative.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -22,7 +22,7 @@
 void t_scroll(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i;
+    long      i;
 
     SQLExecDirect(hstmt,"drop table t_scroll",SQL_NTS);
 
@@ -145,8 +145,9 @@
 void t_relative(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i,index,nrows,iarray[15];
-    SQLCHAR name[21];
+    SQLINTEGER nrows;
+    long      i,index,iarray[15];
+    char      name[21];
 
     SQLExecDirect(hstmt,"drop table t_relative",SQL_NTS);
 
@@ -192,7 +193,7 @@
     rc = SQLFetchScroll(hstmt,SQL_FETCH_NEXT,0);/* 1-10 */
     mystmt(hstmt,rc);
 
-    printMessage("1-10, total rows:%d\n",nrows);
+    printMessage("1-10, total rows:%ld\n",nrows);
     myassert(nrows == 10);
 
     for (index=1; index<=nrows; index++)
@@ -282,7 +283,8 @@
 void t_relative1(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i,nrows;
+    SQLINTEGER nrows;
+    long i;
     const int max_rows=10;
 
     SQLExecDirect(hstmt,"drop table t_relative1",SQL_NTS);
@@ -485,7 +487,8 @@
 void t_relative2(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i,nrows,iarray[15];
+    SQLINTEGER nrows;
+    long i,iarray[15];
     const int max_rows=10;
 
     SQLExecDirect(hstmt,"drop table t_relative2",SQL_NTS);

Modified: trunk/test/scroll/my_scroll.c
===================================================================
--- trunk/test/scroll/my_scroll.c	2006-09-11 23:36:48 UTC (rev 96)
+++ trunk/test/scroll/my_scroll.c	2006-09-12 00:56:09 UTC (rev 97)
@@ -22,7 +22,7 @@
 void t_scroll(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i;
+    long i;
 
     SQLExecDirect(hstmt,"drop table t_scroll",SQL_NTS);
 
@@ -145,8 +145,9 @@
 void t_array_relative_10(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i,index,nrows,iarray[15];
-    SQLCHAR name[21];
+    SQLINTEGER nrows;
+    long i,index,iarray[15];
+    char name[21];
 
     SQLExecDirect(hstmt,"drop table t_array_relative_10",SQL_NTS);
 
@@ -281,7 +282,8 @@
 void t_relative_1(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i,nrows;
+    SQLINTEGER nrows;
+    long i;
     const int max_rows=10;
 
     SQLExecDirect(hstmt,"drop table t_relative_1",SQL_NTS);
@@ -484,7 +486,8 @@
 void t_array_relative_2(SQLHDBC hdbc,SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i,nrows,iarray[15];
+    SQLINTEGER nrows;
+    long i,iarray[15];
     const int max_rows=10;
 
     SQLExecDirect(hstmt,"drop table t_array_relative_2",SQL_NTS);
@@ -789,7 +792,8 @@
 void t_absolute_1(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
     SQLRETURN rc;
-    SQLINTEGER i,nrows;
+    SQLINTEGER nrows;
+    long i;
     const int max_rows=10;
 
     SQLExecDirect(hstmt,"drop table t_absolute_1",SQL_NTS);
@@ -966,9 +970,10 @@
 */
 void t_absolute_2(SQLHDBC hdbc, SQLHSTMT hstmt)
 {
-    SQLRETURN rc;  
+    SQLRETURN rc;
+    SQLINTEGER nrows;
     const int max_rows=10;
-    SQLINTEGER i,nrows,iarray[15];
+    long i,iarray[15];
 
     SQLExecDirect(hstmt,"drop table t_absolute_2",SQL_NTS);