Connector/ODBC 3.51 commit: r30 - myodbc3

[svlasenko]

Modified:
   myodbc3/catalog.c
   myodbc3/results.c
Log:
Fixes bug #10130. code for nullable & isNullable is changed to not treat such fields
as a special case.

Modified: myodbc3/catalog.c
===================================================================
--- myodbc3/catalog.c	2005-12-08 18:18:47 UTC (rev 29)
+++ myodbc3/catalog.c	2006-01-25 16:57:12 UTC (rev 30)
@@ -802,7 +802,7 @@
             row[15]= strdup_root(alloc,buff);
         }
 
-        if ( (curField->flags & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) ==
NOT_NULL_FLAG )
+        if ( (curField->flags & NOT_NULL_FLAG) == NOT_NULL_FLAG )
         {
             sprintf(buff,"%d",SQL_NO_NULLS);
             row[10]= strdup_root(alloc,buff);

Modified: myodbc3/results.c
===================================================================
--- myodbc3/results.c	2005-12-08 18:18:47 UTC (rev 29)
+++ myodbc3/results.c	2006-01-25 16:57:12 UTC (rev 30)
@@ -247,7 +247,7 @@
     if ( pibScale )
         *pibScale= field->decimals;
     if ( pfNullable )
-        *pfNullable= (((field->flags & (NOT_NULL_FLAG | AUTO_INCREMENT_FLAG)) ==
+        *pfNullable= (((field->flags & (NOT_NULL_FLAG)) ==
                        NOT_NULL_FLAG) ?
                       SQL_NO_NULLS :
                       SQL_NULLABLE);
@@ -436,8 +436,7 @@
         case SQL_DESC_NULLABLE:
         case SQL_COLUMN_NULLABLE:
             *(SQLINTEGER *)NumericAttributePtr= (((field->flags &
-                                                   (NOT_NULL_FLAG |
-                                                    AUTO_INCREMENT_FLAG)) ==
+                                                   (NOT_NULL_FLAG)) ==
                                                   NOT_NULL_FLAG) ?
                                                  SQL_NO_NULLS :
                                                  SQL_NULLABLE);