Connector/ODBC 3.51 commit: r543 - in trunk: driver test

[jbalint]

Modified:
   trunk/driver/results.c
   trunk/test/my_unixodbc.c
Log:
fix missing initialization in driver/results.c
account for differences on Windows in test/my_unixodbc.c

Modified: trunk/driver/results.c
===================================================================
--- trunk/driver/results.c	2007-07-02 17:15:27 UTC (rev 542)
+++ trunk/driver/results.c	2007-07-03 17:08:43 UTC (rev 543)
@@ -1276,6 +1276,8 @@
     MYODBCDbgInfo( "current top-row: %ld", stmt->current_row );
     MYODBCDbgInfo( "rows_found: %ld", stmt->rows_found_in_set );
 
+    cur_row = stmt->current_row;
+
     if ( stmt->stmt_options.cursor_type == SQL_CURSOR_FORWARD_ONLY )
     {
         if ( fFetchType != SQL_FETCH_NEXT && !(stmt->dbc->flag &
FLAG_SAFE) )

Modified: trunk/test/my_unixodbc.c
===================================================================
--- trunk/test/my_unixodbc.c	2007-07-02 17:15:27 UTC (rev 542)
+++ trunk/test/my_unixodbc.c	2007-07-03 17:08:43 UTC (rev 543)
@@ -35,10 +35,14 @@
     rc = SQLGetEnvAttr(henv1,SQL_ATTR_ODBC_VERSION,(SQLPOINTER)&ov_version,0,0);
     myenv(henv1,rc);
     printMessage("default odbc version:%d\n",ov_version);
+#ifdef _WIN32
+    my_assert(ov_version == SQL_OV_ODBC3);
+#else
+    my_assert(ov_version == SQL_OV_ODBC2);
+#endif
 
     rc = SQLSetEnvAttr(henv1,SQL_ATTR_ODBC_VERSION,(SQLPOINTER)SQL_OV_ODBC3,0);
     myenv(henv1,rc);
-    my_assert(ov_version == SQL_OV_ODBC2);
 
     rc = SQLAllocConnect(henv1,&hdbc1);
     myenv(henv1,rc);