[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-odbc
Subject:    bk commit - MyODBC 3.51
From:       venu () mysql ! com
Date:       2002-04-30 7:22:31
[Download RAW message or body]

Below is the list of changes that have just been commited into a local
MyODBC 3.51 repository of 'venu'. When 'venu' does a push, they will
be propogaged to the main repository and within 24 hours after the push
into the public repository. 

For more information on how to access the public repository see
http://www.mysql.com/products/myodbc/faq.html#Development_source

ChangeSet
  1.201 02/04/30 00:22:31 venu@myvenu.com +2 -0
  Added missed files to previous commit

  setup.c
    1.26 02/04/30 00:22:02 venu@myvenu.com +1 -0

  results.c
    1.36 02/04/30 00:22:00 venu@myvenu.com +18 -5

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	venu
# Host:	myvenu.com
# Root:	/home/venu/src/myodbc-3.51

--- 1.35/results.c	Fri Mar 15 17:57:53 2002
+++ 1.36/results.c	Tue Apr 30 00:22:00 2002
@@ -49,6 +49,7 @@
 #include <locale.h>
 
 #define digit(A) ((int) (A - '0'))
+#define SQL_MY_PRIMARY_KEY 1212
 
 SQLRETURN SQL_API sql_get_data(STMT *stm,SQLSMALLINT fCType,MYSQL_FIELD *field,
      SQLPOINTER rgbValue,
@@ -301,7 +302,6 @@
             SQL_FALSE : SQL_TRUE);
     *StringLengthPtr=sizeof(SQLINTEGER);
     break;
-
   case SQL_DESC_CATALOG_NAME:
     DBUG_RETURN(copy_str_data(SQL_HANDLE_STMT, stmt,CharacterAttributePtr,
             BufferLength, StringLengthPtr,
@@ -451,10 +451,21 @@
            SQL_ATTR_READONLY);
     *StringLengthPtr=sizeof(SQLINTEGER);
     break;
+  
+  /* Hack : Fix for the error from ADO 'rs.resync' "Key value for this 
+            row was changed or deleted at the data store.  The local 
+            row is now deleted. This should also fix some Multi-step 
+            generated error cases from ADO 
+  */
+  case SQL_MY_PRIMARY_KEY: /* MSSQL extension !! */
+    *(SQLINTEGER *)NumericAttributePtr= (field->flags & PRI_KEY_FLAG ?
+					 SQL_TRUE : SQL_FALSE);
+    *StringLengthPtr=sizeof(SQLINTEGER);
+    break;
 
   default:
-    DBUG_PRINT("warning",("Type: %d is not supported by MyODBC3",
-        FieldIdentifier));
+    DBUG_PRINT("warning",("Type: %d is not supported by the driver",
+			  FieldIdentifier));
   }
   DBUG_RETURN(SQL_SUCCESS);
 }
@@ -785,7 +796,8 @@
   case SQL_C_CHAR:
     /* Handle BLOB -> CHAR conversion */
     if ((field->flags & (BLOB_FLAG+BINARY_FLAG)) == (BLOB_FLAG+BINARY_FLAG))
-      return copy_binary_result(dbc,(char*) rgbValue,cbValueMax,pcbValue,
+      return copy_binary_result(SQL_HANDLE_STMT, stmt,
+        (char*) rgbValue,cbValueMax,pcbValue,
         value, length, stmt->stmt_options.max_length,
         &stmt->getdata_offset);
     /* fall through */
@@ -844,7 +856,8 @@
       value=buff;
       length=19;
     }
-    return copy_lresult(dbc,(char*) rgbValue,cbValueMax,pcbValue,value,
+    return copy_lresult(SQL_HANDLE_STMT, stmt, 
+      (char*) rgbValue,cbValueMax,pcbValue,value,
       length,stmt->stmt_options.max_length,
       field->type == FIELD_TYPE_STRING ? field->length : 0L,
       &stmt->getdata_offset,

--- 1.25/setup.c	Thu Feb 28 23:02:19 2002
+++ 1.26/setup.c	Tue Apr 30 00:22:02 2002
@@ -773,6 +773,7 @@
        as user can't set/change the DSN 
     */
     EnableWindow(GetDlgItem(hdlg, IDC_DSNAME), FALSE);
+    EnableWindow(GetDlgItem(hdlg, IDC_DESC), FALSE);
     return TRUE;
 
 #ifdef _WIN32

---------------------------------------------------------------------
Please check "http://www.mysql.com/Manual_chapter/manual_toc.html" before
posting. To request this thread, e-mail myodbc-thread5395@lists.mysql.com

To unsubscribe, send a message to the address shown in the
List-Unsubscribe header of this message. If you cannot see it,
e-mail myodbc-unsubscribe@lists.mysql.com instead.

[prev in list] [next in list] [prev in thread] [next in thread]