Connector/ODBC 3.51 commit: r946 - branches/guffert/test

[jwinstead]

Modified:
   branches/guffert/test/my_error.c
Log:
Add alternative result caused by bug in iODBC.


Modified: branches/guffert/test/my_error.c
===================================================================
--- branches/guffert/test/my_error.c	2007-12-07 21:08:41 UTC (rev 945)
+++ branches/guffert/test/my_error.c	2007-12-07 22:35:35 UTC (rev 946)
@@ -293,7 +293,9 @@
   /* SQLDescribeCol() */
   expect_stmt(hstmt, SQLDescribeCol(hstmt, 0, dummy, sizeof(dummy), NULL, NULL,
                                     NULL, NULL, NULL), SQL_ERROR);
-  is(check_sqlstate(hstmt, "07009") == OK);
+  /* Older versions of iODBC return the wrong result (S1002) here. */
+  is(check_sqlstate(hstmt, "07009") == OK ||
+     check_sqlstate(hstmt, "S1002") == OK);
 
   expect_stmt(hstmt, SQLDescribeCol(hstmt, 5, NULL, 0, NULL, NULL, NULL,
                                     NULL, NULL), SQL_ERROR);