From: jbalint
Date: September 3 2007 11:03pm
Subject: Connector/ODBC 3.51 commit: r736 - in trunk: driver test
List-Archive: http://lists.mysql.com/commits/33604
Message-Id: <200709032303.l83N3ncN011388@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   trunk/driver/cursor.c
   trunk/test/my_result.c
Log:
fix build failure from gptr removal
fix test assertion that changed due to bug#30520 fix

Modified: trunk/driver/cursor.c
===================================================================
--- trunk/driver/cursor.c	2007-09-03 16:56:00 UTC (rev 735)
+++ trunk/driver/cursor.c	2007-09-03 23:03:49 UTC (rev 736)
@@ -838,7 +838,7 @@
         param.used= 1;
         param.SqlType= get_sql_data_type(stmt, field, NULL);
         param.CType= bind->fCType;
-        param.buffer= bind->rgbValue+irow*bind->cbValueMax;
+        param.buffer= ((char *)bind->rgbValue)+irow*bind->cbValueMax;
         param.ValueMax= bind->cbValueMax;
         /*
             Check when SQL_LEN_DATA_AT_EXEC() macro was used instead of data length

Modified: trunk/test/my_result.c
===================================================================
--- trunk/test/my_result.c	2007-09-03 16:56:00 UTC (rev 735)
+++ trunk/test/my_result.c	2007-09-03 23:03:49 UTC (rev 736)
@@ -594,9 +594,9 @@
     pcbValue= 99;
     szData[0]='A';
     expect_stmt(hstmt, SQLGetData(hstmt, 2, SQL_C_CHAR, szData, 0, &pcbValue),
-                SQL_SUCCESS_WITH_INFO);
+                SQL_NO_DATA_FOUND);
     fprintf(stdout,"data  : %s (%ld)\n",szData,pcbValue);
-    myassert(pcbValue == 0);
+    myassert(pcbValue == 99);
     myassert(szData[0] == 'A');